From 374652248999709006e9deb62fe2d8f3cdb6323d Mon Sep 17 00:00:00 2001 From: elie Date: Sat, 1 Jun 2013 12:15:58 +0000 Subject: config.addSocketTransport() helper renamed into config.addTransport() and improved by automatically instantiating compatible TransportDispatcher making it dispatcher-agnostic. As an additional bonus, application may not call registerTransportDispatcher() as it would be called by addTransport(). --- examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py | 2 +- examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py | 2 +- examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py | 2 +- examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py | 4 ++-- examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py | 4 ++-- examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py | 2 +- examples/v3arch/agent/cmdrsp/v3-alternative-mib.py | 2 +- examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py | 2 +- examples/v3arch/agent/cmdrsp/v3-multiple-users.py | 2 +- examples/v3arch/agent/ntforg/inform-multiple-protocols.py | 2 +- examples/v3arch/agent/ntforg/inform-v2c.py | 2 +- examples/v3arch/agent/ntforg/inform-v3.py | 2 +- examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py | 2 +- examples/v3arch/agent/ntforg/trap-v1.py | 2 +- examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py | 2 +- examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py | 2 +- examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py | 4 ++-- examples/v3arch/agent/ntforg/trap-v2c-with-objects.py | 2 +- examples/v3arch/agent/ntforg/trap-v2c.py | 2 +- examples/v3arch/agent/ntforg/trap-v3.py | 2 +- examples/v3arch/manager/cmdgen/get-v1.py | 2 +- examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py | 2 +- examples/v3arch/manager/cmdgen/get-v3-custom-context.py | 2 +- examples/v3arch/manager/cmdgen/get-v3.py | 2 +- examples/v3arch/manager/cmdgen/getbulk-v2c.py | 2 +- examples/v3arch/manager/cmdgen/getbulk-v3.py | 2 +- examples/v3arch/manager/cmdgen/getnext-v1.py | 2 +- .../v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py | 2 +- examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py | 2 +- examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py | 2 +- examples/v3arch/manager/cmdgen/set-v1.py | 2 +- examples/v3arch/manager/cmdgen/set-v2c.py | 2 +- examples/v3arch/manager/cmdgen/set-v3.py | 2 +- examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py | 4 ++-- examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py | 4 ++-- examples/v3arch/manager/ntfrcv/v3-multiple-users.py | 2 +- examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py | 4 ++-- examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py | 4 ++-- examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py | 4 ++-- examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py | 4 ++-- .../v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py | 6 +----- .../v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py | 6 +----- examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py | 8 ++------ examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py | 6 +----- examples/v3arch/twisted/agent/ntforg/inform-v2c.py | 6 +----- examples/v3arch/twisted/agent/ntforg/inform-v3.py | 6 +----- examples/v3arch/twisted/agent/ntforg/trap-v1.py | 6 +----- examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py | 6 +----- examples/v3arch/twisted/agent/ntforg/trap-v3.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/get-v1.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/get-v3.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/getnext-v1.py | 6 +----- .../twisted/manager/cmdgen/getnext-v2c-from-specific-address.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/set-v1.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/set-v2c.py | 6 +----- examples/v3arch/twisted/manager/cmdgen/set-v3.py | 6 +----- examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py | 8 ++------ examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py | 6 +----- 63 files changed, 74 insertions(+), 166 deletions(-) (limited to 'examples') diff --git a/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py b/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py index eb22974..c8ff23c 100644 --- a/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py +++ b/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py @@ -25,7 +25,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py b/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py index 7e6c3c6..db14628 100644 --- a/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py +++ b/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py @@ -26,7 +26,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py b/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py index d9cbe32..8ca73a5 100644 --- a/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py +++ b/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py @@ -32,7 +32,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py b/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py index 72ef318..91af55e 100644 --- a/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py +++ b/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py @@ -25,13 +25,13 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 at 127.0.0.1:161 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) # UDP over IPv4 at 127.0.0.2:161 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTransport().openServerMode(('127.0.0.2', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py b/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py index d32e3d7..a17c490 100644 --- a/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py +++ b/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py @@ -26,13 +26,13 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 at 127.0.0.1:161 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) # UDP over IPv6 at [::1]:161 -config.addSocketTransport( +config.addTransport( snmpEngine, udp6.domainName, udp6.Udp6Transport().openServerMode(('::1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py b/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py index 0b2f604..e78b05d 100644 --- a/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py +++ b/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py @@ -27,7 +27,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py b/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py index bfed14b..4a13aef 100644 --- a/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py +++ b/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py @@ -27,7 +27,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py b/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py index 3cf2e2f..af1605e 100644 --- a/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py +++ b/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py @@ -25,7 +25,7 @@ snmpEngine = engine.SnmpEngine(rfc1902.OctetString(hexValue='8000000004030201')) # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/cmdrsp/v3-multiple-users.py b/examples/v3arch/agent/cmdrsp/v3-multiple-users.py index d4dafe3..b89567e 100644 --- a/examples/v3arch/agent/cmdrsp/v3-multiple-users.py +++ b/examples/v3arch/agent/cmdrsp/v3-multiple-users.py @@ -27,7 +27,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/agent/ntforg/inform-multiple-protocols.py b/examples/v3arch/agent/ntforg/inform-multiple-protocols.py index 7b1be81..2c4e9bd 100644 --- a/examples/v3arch/agent/ntforg/inform-multiple-protocols.py +++ b/examples/v3arch/agent/ntforg/inform-multiple-protocols.py @@ -42,7 +42,7 @@ config.addTargetParams(snmpEngine, 'my-creds-2', 'usr-md5-none', 'authNoPriv') # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/inform-v2c.py b/examples/v3arch/agent/ntforg/inform-v2c.py index 7a27e3d..0d46c12 100644 --- a/examples/v3arch/agent/ntforg/inform-v2c.py +++ b/examples/v3arch/agent/ntforg/inform-v2c.py @@ -30,7 +30,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/inform-v3.py b/examples/v3arch/agent/ntforg/inform-v3.py index f8b2b80..8d1ca46 100644 --- a/examples/v3arch/agent/ntforg/inform-v3.py +++ b/examples/v3arch/agent/ntforg/inform-v3.py @@ -28,7 +28,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py b/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py index c4773dd..5b6c309 100644 --- a/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py +++ b/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py @@ -28,7 +28,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # Setup transport endpoint and bind it with security settings yielding # a target name. Pay attention to the openClientMode() parameter -- it's # used to originate packets from particular local IP:port -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode(iface=('127.0.0.1', 1024)) diff --git a/examples/v3arch/agent/ntforg/trap-v1.py b/examples/v3arch/agent/ntforg/trap-v1.py index d9e0269..6fa8e5b 100644 --- a/examples/v3arch/agent/ntforg/trap-v1.py +++ b/examples/v3arch/agent/ntforg/trap-v1.py @@ -35,7 +35,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py b/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py index e118bf1..51cd7e1 100644 --- a/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py +++ b/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py @@ -30,7 +30,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py b/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py index 34aaac1..0ca3d70 100644 --- a/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py +++ b/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py @@ -30,7 +30,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py b/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py index 1572597..6215d5a 100644 --- a/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py +++ b/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py @@ -31,7 +31,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name: # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() @@ -44,7 +44,7 @@ config.addTargetAddr( ) # UDP/IPv6 -config.addSocketTransport( +config.addTransport( snmpEngine, udp6.domainName, udp6.Udp6SocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py b/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py index b86569a..5a9da88 100644 --- a/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py +++ b/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py @@ -75,7 +75,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name: # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v2c.py b/examples/v3arch/agent/ntforg/trap-v2c.py index 337c376..612074b 100644 --- a/examples/v3arch/agent/ntforg/trap-v2c.py +++ b/examples/v3arch/agent/ntforg/trap-v2c.py @@ -29,7 +29,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/agent/ntforg/trap-v3.py b/examples/v3arch/agent/ntforg/trap-v3.py index d3c07c5..d53ac59 100644 --- a/examples/v3arch/agent/ntforg/trap-v3.py +++ b/examples/v3arch/agent/ntforg/trap-v3.py @@ -33,7 +33,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/get-v1.py b/examples/v3arch/manager/cmdgen/get-v1.py index ed6f716..f1fb907 100644 --- a/examples/v3arch/manager/cmdgen/get-v1.py +++ b/examples/v3arch/manager/cmdgen/get-v1.py @@ -34,7 +34,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py b/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py index 4b740ac..15f4abf 100644 --- a/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py +++ b/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py @@ -35,7 +35,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/get-v3-custom-context.py b/examples/v3arch/manager/cmdgen/get-v3-custom-context.py index 7bbf316..b0ce65c 100644 --- a/examples/v3arch/manager/cmdgen/get-v3-custom-context.py +++ b/examples/v3arch/manager/cmdgen/get-v3-custom-context.py @@ -38,7 +38,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/get-v3.py b/examples/v3arch/manager/cmdgen/get-v3.py index 70b1326..95eba5d 100644 --- a/examples/v3arch/manager/cmdgen/get-v3.py +++ b/examples/v3arch/manager/cmdgen/get-v3.py @@ -36,7 +36,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-aes', 'authPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/getbulk-v2c.py b/examples/v3arch/manager/cmdgen/getbulk-v2c.py index 6d86234..62b4dd9 100644 --- a/examples/v3arch/manager/cmdgen/getbulk-v2c.py +++ b/examples/v3arch/manager/cmdgen/getbulk-v2c.py @@ -36,7 +36,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/getbulk-v3.py b/examples/v3arch/manager/cmdgen/getbulk-v3.py index 3a625d3..5cdb598 100644 --- a/examples/v3arch/manager/cmdgen/getbulk-v3.py +++ b/examples/v3arch/manager/cmdgen/getbulk-v3.py @@ -38,7 +38,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/getnext-v1.py b/examples/v3arch/manager/cmdgen/getnext-v1.py index ca76746..967186e 100644 --- a/examples/v3arch/manager/cmdgen/getnext-v1.py +++ b/examples/v3arch/manager/cmdgen/getnext-v1.py @@ -35,7 +35,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py b/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py index 0668a06..1c611a5 100644 --- a/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py +++ b/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py @@ -36,7 +36,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode(('0.0.0.0', 1024)) diff --git a/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py b/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py index 88fa584..3377328 100644 --- a/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py +++ b/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py @@ -36,7 +36,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # # UDP/IPv6 -config.addSocketTransport( +config.addTransport( snmpEngine, udp6.domainName, udp6.Udp6SocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py b/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py index 5d647b1..0ecdbad 100644 --- a/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py +++ b/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py @@ -39,7 +39,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-none-none', 'noAuthNoPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/set-v1.py b/examples/v3arch/manager/cmdgen/set-v1.py index c663b60..2036540 100644 --- a/examples/v3arch/manager/cmdgen/set-v1.py +++ b/examples/v3arch/manager/cmdgen/set-v1.py @@ -35,7 +35,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/set-v2c.py b/examples/v3arch/manager/cmdgen/set-v2c.py index 2f3268f..5e6cbfc 100644 --- a/examples/v3arch/manager/cmdgen/set-v2c.py +++ b/examples/v3arch/manager/cmdgen/set-v2c.py @@ -35,7 +35,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/cmdgen/set-v3.py b/examples/v3arch/manager/cmdgen/set-v3.py index d9e970c..7764d7d 100644 --- a/examples/v3arch/manager/cmdgen/set-v3.py +++ b/examples/v3arch/manager/cmdgen/set-v3.py @@ -36,7 +36,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-none', 'authNoPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpSocketTransport().openClientMode() diff --git a/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py b/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py index cc652f9..2a923e0 100644 --- a/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py +++ b/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py @@ -26,14 +26,14 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4, first listening interface/port -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv4, second listening interface/port -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTransport().openServerMode(('127.0.0.1', 2162)) diff --git a/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py b/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py index 0390abd..7abf53f 100644 --- a/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py +++ b/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py @@ -27,14 +27,14 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv6 -config.addSocketTransport( +config.addTransport( snmpEngine, udp6.domainName, udp6.Udp6Transport().openServerMode(('::1', 162)) diff --git a/examples/v3arch/manager/ntfrcv/v3-multiple-users.py b/examples/v3arch/manager/ntfrcv/v3-multiple-users.py index f92be85..c2a08b8 100644 --- a/examples/v3arch/manager/ntfrcv/v3-multiple-users.py +++ b/examples/v3arch/manager/ntfrcv/v3-multiple-users.py @@ -30,7 +30,7 @@ snmpEngine = engine.SnmpEngine() # Transport setup # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openServerMode(('127.0.0.1', 162)) diff --git a/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py b/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py index dd776db..60b3f57 100644 --- a/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py +++ b/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py @@ -33,7 +33,7 @@ snmpEngine = engine.SnmpEngine() # Agent section # UDP over IPv6 -config.addSocketTransport( +config.addTransport( snmpEngine, udp6.domainName, udp6.Udp6Transport().openServerMode(('::1', 161)) @@ -42,7 +42,7 @@ config.addSocketTransport( # Manager section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTransport().openClientMode() diff --git a/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py b/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py index 6e456b7..382b337 100644 --- a/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py +++ b/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py @@ -33,7 +33,7 @@ snmpEngine = engine.SnmpEngine() # Agent section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) @@ -42,7 +42,7 @@ config.addSocketTransport( # Manager section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTransport().openClientMode() diff --git a/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py b/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py index c79075d..8663340 100644 --- a/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py +++ b/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py @@ -33,7 +33,7 @@ snmpEngine = engine.SnmpEngine() # Agent section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) @@ -42,7 +42,7 @@ config.addSocketTransport( # Manager section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTransport().openClientMode() diff --git a/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py b/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py index 4ecc50a..015f691 100644 --- a/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py +++ b/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py @@ -33,7 +33,7 @@ snmpEngine = engine.SnmpEngine() # Agent section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) @@ -42,7 +42,7 @@ config.addSocketTransport( # Manager section # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTransport().openClientMode() diff --git a/examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py b/examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py index 075ba71..d346244 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py +++ b/examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py @@ -19,7 +19,6 @@ from twisted.internet import reactor from pysnmp.entity import engine, config from pysnmp.entity.rfc3413 import cmdrsp, context from pysnmp.carrier.twisted.dgram import udp -from pysnmp.carrier.twisted import dispatch # Create SNMP engine with autogenernated engineID and pre-bound # to socket transport dispatcher @@ -27,11 +26,8 @@ snmpEngine = engine.SnmpEngine() # Transport setup -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py b/examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py index e1e6ff8..091bb75 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py +++ b/examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py @@ -21,7 +21,6 @@ from pysnmp.entity import engine, config from pysnmp.entity.rfc3413 import cmdrsp, context from pysnmp.proto import rfc1902 from pysnmp.carrier.twisted.dgram import udp -from pysnmp.carrier.twisted import dispatch # Create SNMP engine with autogenernated engineID and pre-bound # to socket transport dispatcher @@ -29,11 +28,8 @@ snmpEngine = engine.SnmpEngine() # Transport setup -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py b/examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py index 4c2aaf7..4f8b29d 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py +++ b/examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py @@ -19,7 +19,6 @@ from twisted.internet import reactor from pysnmp.entity import engine, config from pysnmp.entity.rfc3413 import cmdrsp, context from pysnmp.carrier.twisted.dgram import udp -from pysnmp.carrier.twisted import dispatch # Create SNMP engine with autogenernated engineID and pre-bound # to socket transport dispatcher @@ -27,18 +26,15 @@ snmpEngine = engine.SnmpEngine() # Transport setup -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # UDP over IPv4 at 127.0.0.1:161 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) ) # UDP over IPv4 at 127.0.0.2:161 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTwistedTransport().openServerMode(('127.0.0.2', 161)) diff --git a/examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py b/examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py index c2c99e1..36d9d36 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py +++ b/examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py @@ -22,7 +22,6 @@ from twisted.internet import reactor from pysnmp.entity import engine, config from pysnmp.entity.rfc3413 import cmdrsp, context from pysnmp.carrier.twisted.dgram import udp -from pysnmp.carrier.twisted import dispatch # Create SNMP engine with autogenernated engineID and pre-bound # to socket transport dispatcher @@ -30,11 +29,8 @@ snmpEngine = engine.SnmpEngine() # Transport setup -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) diff --git a/examples/v3arch/twisted/agent/ntforg/inform-v2c.py b/examples/v3arch/twisted/agent/ntforg/inform-v2c.py index 848a62c..8a0c14d 100644 --- a/examples/v3arch/twisted/agent/ntforg/inform-v2c.py +++ b/examples/v3arch/twisted/agent/ntforg/inform-v2c.py @@ -16,7 +16,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import context from pysnmp.entity.rfc3413.twisted import ntforg @@ -25,9 +24,6 @@ from pysnmp.proto import rfc1902 # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Set Twisted dispatcher -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # SNMPv2c setup # SecurityName <-> CommunityName mapping @@ -45,7 +41,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/agent/ntforg/inform-v3.py b/examples/v3arch/twisted/agent/ntforg/inform-v3.py index fa279c3..bb54673 100644 --- a/examples/v3arch/twisted/agent/ntforg/inform-v3.py +++ b/examples/v3arch/twisted/agent/ntforg/inform-v3.py @@ -14,7 +14,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import context from pysnmp.entity.rfc3413.twisted import ntforg @@ -23,9 +22,6 @@ from pysnmp.proto import rfc1902 # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Set Twisted dispatcher -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # SNMPv3/USM setup # Add USM user @@ -42,7 +38,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # a target name. Since Notifications could be sent to multiple Managers # at once, more than one target entry may be configured (and tagged). # -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v1.py b/examples/v3arch/twisted/agent/ntforg/trap-v1.py index 106cb52..4f52640 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v1.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v1.py @@ -18,7 +18,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import context from pysnmp.entity.rfc3413.twisted import ntforg @@ -27,9 +26,6 @@ from pysnmp.proto import rfc1902 # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Set Twisted dispatcher -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # SNMPv1 setup # SecurityName <-> CommunityName mapping @@ -46,7 +42,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py b/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py index 8cf83ac..e3e65b8 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py @@ -17,7 +17,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import context from pysnmp.entity.rfc3413.twisted import ntforg @@ -26,9 +25,6 @@ from pysnmp.proto import rfc1902 # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Set Twisted dispatcher -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # SNMPv2c setup # SecurityName <-> CommunityName mapping @@ -46,7 +42,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v3.py b/examples/v3arch/twisted/agent/ntforg/trap-v3.py index a4aee37..c88e64c 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v3.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v3.py @@ -14,7 +14,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import context from pysnmp.entity.rfc3413.twisted import ntforg @@ -27,9 +26,6 @@ snmpEngine = engine.SnmpEngine( snmpEngineID=rfc1902.OctetString(hexValue='8000000001020304') ) -# Set Twisted dispatcher -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # SNMPv3/USM setup # Add USM user @@ -44,7 +40,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') # Setup transport endpoint and bind it with security settings yielding # a target name -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/get-v1.py b/examples/v3arch/twisted/manager/cmdgen/get-v1.py index 8a96358..1ccf1ab 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v1.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v1.py @@ -15,15 +15,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv1 setup # @@ -40,7 +36,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py b/examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py index 5622e46..5e36d99 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py @@ -16,15 +16,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv2c setup # @@ -41,7 +37,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py b/examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py index 47c9ca9..64fe2a3 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py @@ -18,15 +18,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1902 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv3/USM setup # @@ -44,7 +40,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/get-v3.py b/examples/v3arch/twisted/manager/cmdgen/get-v3.py index f7a22bc..967e024 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v3.py @@ -15,15 +15,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv3/USM setup # @@ -42,7 +38,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-aes', 'authPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py b/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py index 1b6ca44..7a67f74 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py +++ b/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py @@ -18,15 +18,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1905 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv2c setup # @@ -43,7 +39,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py b/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py index d91566a..e93927d 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py @@ -18,15 +18,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1905 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv3/USM setup # @@ -45,7 +41,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py b/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py index 67f2ced..d47b552 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py +++ b/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py @@ -17,15 +17,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1905 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv1 setup # @@ -42,7 +38,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py b/examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py index 7e0f987..0ca40c7 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py +++ b/examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py @@ -18,15 +18,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1905 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv2c setup # @@ -43,7 +39,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode(('127.0.0.1', 1024)) diff --git a/examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py b/examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py index e9fed1e..77499d8 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py +++ b/examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py @@ -17,7 +17,6 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1902, rfc1905 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Initial OID prefix @@ -26,9 +25,6 @@ initialOID = rfc1902.ObjectName('1.3.6.1.2.1.1') # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv3/USM setup # @@ -45,7 +41,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-none-none', 'noAuthNoPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/set-v1.py b/examples/v3arch/twisted/manager/cmdgen/set-v1.py index a1d334a..a58a67e 100644 --- a/examples/v3arch/twisted/manager/cmdgen/set-v1.py +++ b/examples/v3arch/twisted/manager/cmdgen/set-v1.py @@ -16,15 +16,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1902 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv1 setup # @@ -41,7 +37,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/set-v2c.py b/examples/v3arch/twisted/manager/cmdgen/set-v2c.py index 00c9ec8..981842d 100644 --- a/examples/v3arch/twisted/manager/cmdgen/set-v2c.py +++ b/examples/v3arch/twisted/manager/cmdgen/set-v2c.py @@ -16,15 +16,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1902 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv2c setup # @@ -41,7 +37,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/cmdgen/set-v3.py b/examples/v3arch/twisted/manager/cmdgen/set-v3.py index 5265701..5d32570 100644 --- a/examples/v3arch/twisted/manager/cmdgen/set-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/set-v3.py @@ -16,15 +16,11 @@ from twisted.internet import reactor, defer from pysnmp.entity import engine, config from pysnmp.entity.rfc3413.twisted import cmdgen from pysnmp.proto import rfc1902 -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp # Create SNMP engine instance snmpEngine = engine.SnmpEngine() -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # # SNMPv3/USM setup # @@ -42,7 +38,7 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-none', 'authNoPriv') # # UDP/IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openClientMode() diff --git a/examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py b/examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py index 576ee1f..f0edca7 100644 --- a/examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py +++ b/examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py @@ -18,7 +18,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import ntfrcv @@ -28,18 +27,15 @@ snmpEngine = engine.SnmpEngine() # Transport setup -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # UDP over IPv4, first listening interface/port -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (1,), udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv4, second listening interface/port -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName + (2,), udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 2162)) diff --git a/examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py b/examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py index 544eb89..6421672 100644 --- a/examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py +++ b/examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py @@ -21,7 +21,6 @@ # from twisted.internet import reactor from pysnmp.entity import engine, config -from pysnmp.carrier.twisted import dispatch from pysnmp.carrier.twisted.dgram import udp from pysnmp.entity.rfc3413 import ntfrcv from pysnmp.proto import rfc1902 @@ -32,11 +31,8 @@ snmpEngine = engine.SnmpEngine() # Transport setup -# Instantiate and register Twisted dispatcher at SNMP engine -snmpEngine.registerTransportDispatcher(dispatch.TwistedDispatcher()) - # UDP over IPv4 -config.addSocketTransport( +config.addTransport( snmpEngine, udp.domainName, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 162)) -- cgit v1.2.1