diff options
| author | Ilya Etingof <etingof@gmail.com> | 2019-02-10 16:38:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-10 16:38:35 +0100 |
| commit | 588b9b902d191d8010cb6b247fcb07887d59542c (patch) | |
| tree | 419b01d2598e91331db784ac3a6675324aba8c24 /examples | |
| parent | 9664858b145140a4fbb2a22b633c1ab41c2555bd (diff) | |
| download | pysnmp-git-588b9b902d191d8010cb6b247fcb07887d59542c.tar.gz | |
Uppercase global constants (#238)
This is a massive patch essentially upper-casing global/class attributes
that mean to be constants.
Some previously exposed constants have been preserved for compatibility
reasons (notably, in `hlapi`), though the rest might break user code relying
on pysnmp 4.
Diffstat (limited to 'examples')
71 files changed, 220 insertions, 220 deletions
diff --git a/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/v3-trap.py b/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/v3-trap.py index 836e8d50..14501fb9 100644 --- a/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/v3-trap.py +++ b/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/v3-trap.py @@ -28,8 +28,8 @@ errorIndication, errorStatus, errorIndex, varBinds = next( sendNotification( SnmpEngine(OctetString(hexValue='8000000001020304')), UsmUserData('usr-sha-aes128', 'authkey1', 'privkey1', - authProtocol=usmHMACSHAAuthProtocol, - privProtocol=usmAesCfb128Protocol), + authProtocol=USM_AUTH_HMAC96_SHA, + privProtocol=USM_PRIV_CFB128_AES), UdpTransportTarget(('demo.snmplabs.com', 162)), ContextData(), 'trap', diff --git a/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/get-table-object-by-multiple-indices.py b/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/get-table-object-by-multiple-indices.py index 672aea93..06302525 100644 --- a/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/get-table-object-by-multiple-indices.py +++ b/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/get-table-object-by-multiple-indices.py @@ -19,8 +19,8 @@ from pysnmp.hlapi import * errorIndication, errorStatus, errorIndex, varBinds = next( getCmd(SnmpEngine(), UsmUserData('usr-sha-aes128', 'authkey1', 'privkey1', - authProtocol=usmHMACSHAAuthProtocol, - privProtocol=usmAesCfb128Protocol), + authProtocol=USM_AUTH_HMAC96_SHA, + privProtocol=USM_PRIV_CFB128_AES), UdpTransportTarget(('demo.snmplabs.com', 161)), ContextData(), ObjectType(ObjectIdentity('TCP-MIB', diff --git a/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/getnext-limit-number-of-variables.py b/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/getnext-limit-number-of-variables.py index f9fd70c1..d8a2b935 100644 --- a/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/getnext-limit-number-of-variables.py +++ b/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/getnext-limit-number-of-variables.py @@ -23,8 +23,8 @@ for (errorIndication, errorIndex, varBinds) in nextCmd(SnmpEngine(), UsmUserData('usr-sha-aes128', 'authkey1', 'privkey1', - authProtocol=usmHMACSHAAuthProtocol, - privProtocol=usmAesCfb128Protocol), + authProtocol=USM_AUTH_HMAC96_SHA, + privProtocol=USM_PRIV_CFB128_AES), UdpTransportTarget(('demo.snmplabs.com', 161)), ContextData(), ObjectType(ObjectIdentity('SNMPv2-MIB')), diff --git a/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/usm-sha-aes128.py b/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/usm-sha-aes128.py index 53d4f800..69262086 100644 --- a/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/usm-sha-aes128.py +++ b/examples/hlapi/v3arch/asyncore/sync/manager/cmdgen/usm-sha-aes128.py @@ -11,22 +11,22 @@ Send SNMP GET request using the following options: Available authentication protocols: -#. usmHMACMD5AuthProtocol -#. usmHMACSHAAuthProtocol -#. usmHMAC128SHA224AuthProtocol -#. usmHMAC192SHA256AuthProtocol -#. usmHMAC256SHA384AuthProtocol -#. usmHMAC384SHA512AuthProtocol -#. usmNoAuthProtocol +#. USM_AUTH_HMAC96_MD5 +#. USM_AUTH_HMAC96_SHA +#. USM_AUTH_HMAC128_SHA224 +#. USM_AUTH_HMAC192_SHA256 +#. USM_AUTH_HMAC256_SHA384 +#. USM_AUTH_HMAC384_SHA512 +#. USM_AUTH_NONE Available privacy protocols: -#. usmDESPrivProtocol -#. usm3DESEDEPrivProtocol -#. usmAesCfb128Protocol -#. usmAesCfb192Protocol -#. usmAesCfb256Protocol -#. usmNoPrivProtocol +#. USM_PRIV_CBC56_DES +#. USM_PRIV_CBC168_3DES +#. USM_PRIV_CFB128_AES +#. USM_PRIV_CFB192_AES +#. USM_PRIV_CFB256_AES +#. USM_PRIV_NONE Functionally similar to: @@ -38,8 +38,8 @@ from pysnmp.hlapi import * errorIndication, errorStatus, errorIndex, varBinds = next( getCmd(SnmpEngine(), UsmUserData('usr-sha-aes', 'authkey1', 'privkey1', - authProtocol=usmHMACSHAAuthProtocol, - privProtocol=usmAesCfb128Protocol), + authProtocol=USM_AUTH_HMAC96_SHA, + privProtocol=USM_PRIV_CFB128_AES), UdpTransportTarget(('demo.snmplabs.com', 161)), ContextData(), ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0))) diff --git a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py index 03affa96..b6a20e86 100644 --- a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py +++ b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py @@ -42,7 +42,7 @@ class SysDescr(object): def __ge__(self, other): return self.name >= other def __call__(self, protoVer): - return api.protoModules[protoVer].OctetString( + return api.PROTOCOL_MODULES[protoVer].OctetString( 'PySNMP example command responder' ) @@ -64,7 +64,7 @@ class Uptime(object): def __ge__(self, other): return self.name >= other def __call__(self, protoVer): - return api.protoModules[protoVer].TimeTicks( + return api.PROTOCOL_MODULES[protoVer].TimeTicks( (time.time() - self.birthday) * 100 ) @@ -81,8 +81,8 @@ for mibVar in mibInstr: def cbFun(transportDispatcher, transportDomain, transportAddress, wholeMsg): while wholeMsg: msgVer = api.decodeMessageVersion(wholeMsg) - if msgVer in api.protoModules: - pMod = api.protoModules[msgVer] + if msgVer in api.PROTOCOL_MODULES: + pMod = api.PROTOCOL_MODULES[msgVer] else: print('Unsupported SNMP version %s' % msgVer) return @@ -142,12 +142,12 @@ transportDispatcher.registerRecvCbFun(cbFun) # UDP/IPv4 transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openServerMode(('localhost', 161)) + udp.DOMAIN_NAME, udp.UdpSocketTransport().openServerMode(('localhost', 161)) ) # UDP/IPv6 transportDispatcher.registerTransport( - udp6.domainName, udp6.Udp6SocketTransport().openServerMode(('::1', 161)) + udp6.DOMAIN_NAME, udp6.Udp6SocketTransport().openServerMode(('::1', 161)) ) transportDispatcher.jobStarted(1) diff --git a/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py b/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py index 43d37e5f..bbf40fa0 100644 --- a/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py +++ b/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py @@ -67,10 +67,10 @@ transportDispatcher.registerTimerCbFun(cbTimerFun) # UDP/IPv4 transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openClientMode() + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) transportDispatcher.sendMessage( - encoder.encode(trapMsg), udp.domainName, ('demo.snmplabs.com', 162) + encoder.encode(trapMsg), udp.DOMAIN_NAME, ('demo.snmplabs.com', 162) ) transportDispatcher.jobStarted(1) diff --git a/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py b/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py index 032a9e5b..110c6701 100644 --- a/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py +++ b/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py @@ -28,7 +28,7 @@ from pyasn1.codec.ber import encoder from pysnmp.proto import api # Protocol version to use -pMod = api.protoModules[api.protoVersion1] +pMod = api.PROTOCOL_MODULES[api.SNMP_VERSION_1] # pMod = api.protoModules[api.protoVersion2c] # Build PDU @@ -36,7 +36,7 @@ trapPDU = pMod.TrapPDU() pMod.apiTrapPDU.setDefaults(trapPDU) # Traps have quite different semantics across proto versions -if pMod == api.protoModules[api.protoVersion1]: +if pMod == api.PROTOCOL_MODULES[api.SNMP_VERSION_1]: pMod.apiTrapPDU.setEnterprise(trapPDU, (1, 3, 6, 1, 1, 2, 3, 4, 1)) pMod.apiTrapPDU.setGenericTrap(trapPDU, 'coldStart') @@ -50,18 +50,18 @@ transportDispatcher = AsyncoreDispatcher() # UDP/IPv4 transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openClientMode() + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) transportDispatcher.sendMessage( - encoder.encode(trapMsg), udp.domainName, ('demo.snmplabs.com', 162) + encoder.encode(trapMsg), udp.DOMAIN_NAME, ('demo.snmplabs.com', 162) ) # UDP/IPv6 transportDispatcher.registerTransport( - udp6.domainName, udp6.Udp6SocketTransport().openClientMode() + udp6.DOMAIN_NAME, udp6.Udp6SocketTransport().openClientMode() ) transportDispatcher.sendMessage( - encoder.encode(trapMsg), udp6.domainName, ('::1', 162) + encoder.encode(trapMsg), udp6.DOMAIN_NAME, ('::1', 162) ) # Dispatcher will finish as all scheduled messages are sent diff --git a/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py b/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py index b7f67da2..40eb0698 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py +++ b/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py @@ -32,7 +32,7 @@ maxNumberResponses = 10 # Protocol version to use # pMod = api.protoModules[api.protoVersion1] -pMod = api.protoModules[api.protoVersion2c] +pMod = api.PROTOCOL_MODULES[api.SNMP_VERSION_2C] # Build PDU reqPDU = pMod.GetRequestPDU() @@ -85,11 +85,11 @@ transportDispatcher.registerTimerCbFun(cbTimerFun) # UDP/IPv4 udpSocketTransport = udp.UdpSocketTransport().openClientMode().enableBroadcast() -transportDispatcher.registerTransport(udp.domainName, udpSocketTransport) +transportDispatcher.registerTransport(udp.DOMAIN_NAME, udpSocketTransport) # Pass message to dispatcher transportDispatcher.sendMessage( - encoder.encode(reqMsg), udp.domainName, ('255.255.255.255', 161) + encoder.encode(reqMsg), udp.DOMAIN_NAME, ('255.255.255.255', 161) ) # wait for a maximum of 10 responses or time out diff --git a/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py b/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py index fd93e343..014ca7d2 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py +++ b/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py @@ -21,7 +21,7 @@ from pysnmp.proto import api from time import time # Protocol version to use -pMod = api.protoModules[api.protoVersion1] +pMod = api.PROTOCOL_MODULES[api.SNMP_VERSION_1] # pMod = api.protoModules[api.protoVersion2c] # Build PDU @@ -72,12 +72,12 @@ transportDispatcher.registerTimerCbFun(cbTimerFun) # UDP/IPv4 transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openClientMode() + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) # Pass message to dispatcher transportDispatcher.sendMessage( - encoder.encode(reqMsg), udp.domainName, ('demo.snmplabs.com', 161) + encoder.encode(reqMsg), udp.DOMAIN_NAME, ('demo.snmplabs.com', 161) ) transportDispatcher.jobStarted(1) diff --git a/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py index 4ea51dac..0c45a18f 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py +++ b/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py @@ -106,10 +106,10 @@ transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openClientMode() + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) transportDispatcher.sendMessage( - encoder.encode(reqMsg), udp.domainName, ('demo.snmplabs.com', 161) + encoder.encode(reqMsg), udp.DOMAIN_NAME, ('demo.snmplabs.com', 161) ) transportDispatcher.jobStarted(1) diff --git a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py index b6216207..a81dd9b0 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py +++ b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py @@ -21,7 +21,7 @@ from pysnmp.proto import api from time import time # Protocol version to use -pMod = api.protoModules[api.protoVersion1] +pMod = api.PROTOCOL_MODULES[api.SNMP_VERSION_1] # pMod = api.protoModules[api.protoVersion2c] # SNMP table header @@ -98,10 +98,10 @@ transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openClientMode() + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) transportDispatcher.sendMessage( - encoder.encode(reqMsg), udp.domainName, ('demo.snmplabs.com', 161) + encoder.encode(reqMsg), udp.DOMAIN_NAME, ('demo.snmplabs.com', 161) ) transportDispatcher.jobStarted(1) diff --git a/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py b/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py index 1eb0ad3d..72e87736 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py +++ b/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py @@ -42,7 +42,7 @@ transportAddress.setLocalAddress(('1.2.3.4', 0)) # Protocol version to use # pMod = api.protoModules[api.protoVersion1] -pMod = api.protoModules[api.protoVersion2c] +pMod = api.PROTOCOL_MODULES[api.SNMP_VERSION_2C] # Build PDU reqPDU = pMod.GetRequestPDU() @@ -103,11 +103,11 @@ udpSocketTransport.enablePktInfo() # Enable IP source spoofing (requires root privileges) udpSocketTransport.enableTransparent() -transportDispatcher.registerTransport(udp.domainName, udpSocketTransport) +transportDispatcher.registerTransport(udp.DOMAIN_NAME, udpSocketTransport) # Pass message to dispatcher transportDispatcher.sendMessage( - encoder.encode(reqMsg), udp.domainName, transportAddress + encoder.encode(reqMsg), udp.DOMAIN_NAME, transportAddress ) # We might never receive any response as we sent request with fake source IP diff --git a/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py b/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py index 4122a3c7..88be5508 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py +++ b/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py @@ -22,7 +22,7 @@ from time import time # Protocol version to use # pMod = api.protoModules[api.protoVersion1] -pMod = api.protoModules[api.protoVersion2c] +pMod = api.PROTOCOL_MODULES[api.SNMP_VERSION_2C] # Build PDU reqPDU = pMod.SetRequestPDU() @@ -74,12 +74,12 @@ transportDispatcher.registerTimerCbFun(cbTimerFun) # UDP/IPv4 transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openClientMode() + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) # Pass message to dispatcher transportDispatcher.sendMessage( - encoder.encode(reqMsg), udp.domainName, ('demo.snmplabs.com', 161) + encoder.encode(reqMsg), udp.DOMAIN_NAME, ('demo.snmplabs.com', 161) ) transportDispatcher.jobStarted(1) diff --git a/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py b/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py index 7043b22d..36812977 100644 --- a/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py +++ b/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py @@ -30,8 +30,8 @@ from pysnmp.proto import api def cbFun(transportDispatcher, transportDomain, transportAddress, wholeMsg): while wholeMsg: msgVer = int(api.decodeMessageVersion(wholeMsg)) - if msgVer in api.protoModules: - pMod = api.protoModules[msgVer] + if msgVer in api.PROTOCOL_MODULES: + pMod = api.PROTOCOL_MODULES[msgVer] else: print('Unsupported SNMP version %s' % msgVer) return @@ -44,7 +44,7 @@ def cbFun(transportDispatcher, transportDomain, transportAddress, wholeMsg): ) reqPDU = pMod.apiMessage.getPDU(reqMsg) if reqPDU.isSameTypeWith(pMod.TrapPDU()): - if msgVer == api.protoVersion1: + if msgVer == api.SNMP_VERSION_1: print('Enterprise: %s' % (pMod.apiTrapPDU.getEnterprise(reqPDU).prettyPrint())) print('Agent Address: %s' % (pMod.apiTrapPDU.getAgentAddr(reqPDU).prettyPrint())) print('Generic Trap: %s' % (pMod.apiTrapPDU.getGenericTrap(reqPDU).prettyPrint())) @@ -65,12 +65,12 @@ transportDispatcher.registerRecvCbFun(cbFun) # UDP/IPv4 transportDispatcher.registerTransport( - udp.domainName, udp.UdpSocketTransport().openServerMode(('localhost', 162)) + udp.DOMAIN_NAME, udp.UdpSocketTransport().openServerMode(('localhost', 162)) ) # UDP/IPv6 transportDispatcher.registerTransport( - udp6.domainName, udp6.Udp6SocketTransport().openServerMode(('::1', 162)) + udp6.DOMAIN_NAME, udp6.Udp6SocketTransport().openServerMode(('::1', 162)) ) transportDispatcher.jobStarted(1) diff --git a/examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py b/examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py index e3ee3aa4..2b420185 100644 --- a/examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py +++ b/examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py @@ -49,19 +49,19 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # user: usr-sha-none, auth: SHA, priv NONE config.addV3User( snmpEngine, 'usr-sha-none', - config.usmHMACSHAAuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1' ) # user: usr-sha-none, auth: SHA, priv AES config.addV3User( snmpEngine, 'usr-sha-aes128', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py b/examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py index 2f0947f4..257f9676 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py @@ -32,7 +32,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 1161)) ) @@ -41,7 +41,7 @@ config.addTransport( # user: usr-md5-none, auth: MD5, priv NONE config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py b/examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py index 21f86f1d..65637f3e 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py @@ -31,7 +31,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) diff --git a/examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py b/examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py index 5e9a535a..bd54caed 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py @@ -29,7 +29,7 @@ snmpEngine = engine.SnmpEngine(rfc1902.OctetString(hexValue='8000000004030201')) # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) @@ -38,8 +38,8 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py b/examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py index 783c1e6c..74e8c5db 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py @@ -30,7 +30,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) diff --git a/examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py b/examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py index 333ebad4..bf15aedf 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py @@ -37,7 +37,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) diff --git a/examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py b/examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py index ef5c6239..1334fd8d 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py @@ -30,13 +30,13 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 at 127.0.0.1:161 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) # UDP over IPv6 at [::1]:161 config.addTransport( snmpEngine, - udp6.domainName, + udp6.DOMAIN_NAME, udp6.Udp6Transport().openServerMode(('::1', 161)) ) diff --git a/examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py b/examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py index 7a7eadbc..c8088ed0 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py @@ -29,13 +29,13 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 at 127.0.0.1:161 config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) # UDP over IPv4 at 127.0.0.2:161 config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTransport().openServerMode(('127.0.0.2', 161)) ) diff --git a/examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py b/examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py index dd270b6e..a501aec3 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py @@ -54,7 +54,7 @@ udpSocketTransport.enablePktInfo() # Register this transport at SNMP Engine config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udpSocketTransport ) @@ -63,8 +63,8 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py b/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py index 005069ad..c2180ade 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py @@ -30,7 +30,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) diff --git a/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py b/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py index 6e818247..b65cd63f 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py @@ -33,8 +33,8 @@ from pysnmp.carrier.asyncore.dgram import udp # Configuration parameters for each of SNMP Engines snmpEngineInfo = ( - ('0102030405060708', udp.domainName + (0,), ('127.0.0.1', 161)), - ('0807060504030201', udp.domainName + (1,), ('127.0.0.2', 161)) + ('0102030405060708', udp.DOMAIN_NAME + (0,), ('127.0.0.1', 161)), + ('0807060504030201', udp.DOMAIN_NAME + (1,), ('127.0.0.2', 161)) ) # Instantiate the single transport dispatcher object @@ -66,8 +66,8 @@ for snmpEngineId, transportDomain, transportAddress in snmpEngineInfo: # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # Allow full MIB access for this user / securityModels at VACM diff --git a/examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py b/examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py index 3b1119dd..4a9f5162 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py @@ -31,7 +31,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) @@ -40,19 +40,19 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # user: usr-sha-none, auth: SHA, priv NONE config.addV3User( snmpEngine, 'usr-sha-none', - config.usmHMACSHAAuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1' ) # user: usr-sha-none, auth: SHA, priv AES config.addV3User( snmpEngine, 'usr-sha-aes128', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py b/examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py index bffedd40..a7c1acae 100644 --- a/examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py +++ b/examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py @@ -56,7 +56,7 @@ snmpEngine.observer.registerObserver( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) @@ -65,8 +65,8 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py b/examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py index 597778b0..e1781416 100644 --- a/examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py +++ b/examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py @@ -43,7 +43,7 @@ config.addTargetParams(snmpEngine, 'my-creds-1', 'my-area', 'noAuthNoPriv', 1) config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1' ) config.addTargetParams(snmpEngine, 'my-creds-2', 'usr-md5-none', 'authNoPriv') @@ -51,20 +51,20 @@ config.addTargetParams(snmpEngine, 'my-creds-2', 'usr-md5-none', 'authNoPriv') # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) # First target config.addTargetAddr( snmpEngine, 'my-nms-1', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds-1', tagList='all-my-managers' ) # Second target config.addTargetAddr( snmpEngine, 'my-nms-2', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds-2', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py b/examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py index e031d95f..f66b781a 100644 --- a/examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py +++ b/examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py @@ -36,14 +36,14 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) # Create named target config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py b/examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py index d43bc4a1..ee1692cb 100644 --- a/examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py +++ b/examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py @@ -40,27 +40,27 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) # First target config.addTargetAddr( snmpEngine, 'my-nms-1', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) # Second target config.addTargetAddr( snmpEngine, 'my-nms-2', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) # Third target config.addTargetAddr( snmpEngine, 'my-nms-3', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py b/examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py index 65f557cd..7985d848 100644 --- a/examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py +++ b/examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py @@ -41,12 +41,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms-1', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) @@ -54,12 +54,12 @@ config.addTargetAddr( # UDP/IPv6 config.addTransport( snmpEngine, - udp6.domainName, + udp6.DOMAIN_NAME, udp6.Udp6SocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms-2', - udp6.domainName, ('::1', 162), + udp6.DOMAIN_NAME, ('::1', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py b/examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py index 5b0f9f69..5ce65da5 100644 --- a/examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py +++ b/examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py @@ -37,12 +37,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # used to originate packets from particular local IP:port config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode(iface=('0.0.0.0', 61024)) ) config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py b/examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py index c98d9329..59065c17 100644 --- a/examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py +++ b/examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py @@ -40,27 +40,27 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) # First target config.addTargetAddr( snmpEngine, 'my-nms-1', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) # Second target config.addTargetAddr( snmpEngine, 'my-nms-2', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) # Third target config.addTargetAddr( snmpEngine, 'my-nms-3', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py b/examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py index 782ef96a..4e95455b 100644 --- a/examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py +++ b/examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py @@ -28,7 +28,7 @@ snmpEngine = engine.SnmpEngine() # Add USM user config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') @@ -36,12 +36,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/v1-trap.py b/examples/v3arch/asyncore/agent/ntforg/v1-trap.py index 905993cc..9c0ba17e 100644 --- a/examples/v3arch/asyncore/agent/ntforg/v1-trap.py +++ b/examples/v3arch/asyncore/agent/ntforg/v1-trap.py @@ -39,12 +39,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/v2c-inform.py b/examples/v3arch/asyncore/agent/ntforg/v2c-inform.py index 5d4465d3..240f1426 100644 --- a/examples/v3arch/asyncore/agent/ntforg/v2c-inform.py +++ b/examples/v3arch/asyncore/agent/ntforg/v2c-inform.py @@ -38,12 +38,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/v2c-trap-with-notification-objects.py b/examples/v3arch/asyncore/agent/ntforg/v2c-trap-with-notification-objects.py index 7ca6b0ee..f985786e 100644 --- a/examples/v3arch/asyncore/agent/ntforg/v2c-trap-with-notification-objects.py +++ b/examples/v3arch/asyncore/agent/ntforg/v2c-trap-with-notification-objects.py @@ -63,12 +63,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms-1', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/v2c-trap.py b/examples/v3arch/asyncore/agent/ntforg/v2c-trap.py index ab11bfe1..8850e7d0 100644 --- a/examples/v3arch/asyncore/agent/ntforg/v2c-trap.py +++ b/examples/v3arch/asyncore/agent/ntforg/v2c-trap.py @@ -37,12 +37,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/agent/ntforg/v3-trap.py b/examples/v3arch/asyncore/agent/ntforg/v3-trap.py index 40b6e04d..0502a153 100644 --- a/examples/v3arch/asyncore/agent/ntforg/v3-trap.py +++ b/examples/v3arch/asyncore/agent/ntforg/v3-trap.py @@ -32,8 +32,8 @@ snmpEngine = engine.SnmpEngine( # Add USM user config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') @@ -41,12 +41,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') # a target name config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-nms', - udp.domainName, ('104.236.166.95', 162), + udp.DOMAIN_NAME, ('104.236.166.95', 162), 'my-creds', tagList='all-my-managers' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py b/examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py index d6e869a1..2dc2ee8b 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py +++ b/examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py @@ -32,7 +32,7 @@ snmpEngine = engine.SnmpEngine() # user: usr-md5-none, auth: MD5, priv: NONE config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') @@ -44,12 +44,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py b/examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py index 34ae4991..45b8c7a6 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py +++ b/examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py @@ -40,12 +40,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds', timeout=300, # in 1/100 sec retryCount=5 diff --git a/examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py b/examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py index 45460c92..0a156d0f 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py +++ b/examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py @@ -29,7 +29,7 @@ snmpEngine = engine.SnmpEngine() # user: usr-md5-des, auth: MD5, priv NONE config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') @@ -41,12 +41,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-none', 'authNoPriv') # UDP/IPv6 config.addTransport( snmpEngine, - udp6.domainName, + udp6.DOMAIN_NAME, udp6.Udp6SocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp6.domainName, ('::1', 161), + udp6.DOMAIN_NAME, ('::1', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py b/examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py index 4f2b1244..82e42879 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py +++ b/examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py @@ -30,8 +30,8 @@ snmpEngine = engine.SnmpEngine() # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') @@ -43,12 +43,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-md5-des', 'authPriv') # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py b/examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py index 242dfb72..125e3a72 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py +++ b/examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py @@ -40,12 +40,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py b/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py index 061444d1..f01efec7 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py +++ b/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py @@ -51,12 +51,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py b/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py index 96ed40d2..c984a899 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py +++ b/examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py @@ -40,12 +40,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py b/examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py index 55ae6f8e..fccb1483 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py +++ b/examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py @@ -56,8 +56,8 @@ snmpEngine.observer.registerObserver( # user: usr-sha-aes, auth: SHA, priv AES config.addV3User( snmpEngine, 'usr-sha-aes', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-aes', 'authPriv') @@ -69,12 +69,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-aes', 'authPriv') # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py b/examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py index 083b3c34..b1eb9ace 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py +++ b/examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py @@ -43,12 +43,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-none-none', 'noAuthNoPriv') # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py b/examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py index e55df0f7..ed5ec19f 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py +++ b/examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py @@ -41,12 +41,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode(('0.0.0.0', 61024)) ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py b/examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py index b72d435b..173bdd91 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py +++ b/examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py @@ -40,12 +40,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py b/examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py index 98033e73..10050e3f 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py +++ b/examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py @@ -58,14 +58,14 @@ udpSocketTransport.enableTransparent() # Register this transport at SNMP Engine config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udpSocketTransport ) # Configure destination IPv4 address as well as source IPv4 address config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds', sourceAddress=('1.2.3.4', 0) ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py b/examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py index 45ec3c5e..d65a018f 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py +++ b/examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py @@ -27,8 +27,8 @@ snmpEngine = engine.SnmpEngine() # user: usr-sha-aes, auth: SHA, priv AES config.addV3User( snmpEngine, 'usr-sha-aes', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-aes', 'authPriv') @@ -40,12 +40,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-aes', 'authPriv') # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) @@ -78,5 +78,5 @@ snmpEngine.transportDispatcher.runDispatcher() config.delTransport( snmpEngine, - udp.domainName + udp.DOMAIN_NAME ).closeTransport() diff --git a/examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py b/examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py index 1071647e..43c5dade 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py +++ b/examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py @@ -29,7 +29,7 @@ snmpEngine = engine.SnmpEngine() # user: usr-sha-none, auth: SHA, priv none config.addV3User( snmpEngine, 'usr-sha-none', - config.usmHMACSHAAuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1' ) config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-none', 'authNoPriv') @@ -41,12 +41,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'usr-sha-none', 'authNoPriv') # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/v1-get.py b/examples/v3arch/asyncore/manager/cmdgen/v1-get.py index d0343e41..60d25f5e 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/v1-get.py +++ b/examples/v3arch/asyncore/manager/cmdgen/v1-get.py @@ -37,12 +37,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 0) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/cmdgen/v2c-set.py b/examples/v3arch/asyncore/manager/cmdgen/v2c-set.py index 0afe122e..61657677 100644 --- a/examples/v3arch/asyncore/manager/cmdgen/v2c-set.py +++ b/examples/v3arch/asyncore/manager/cmdgen/v2c-set.py @@ -39,12 +39,12 @@ config.addTargetParams(snmpEngine, 'my-creds', 'my-area', 'noAuthNoPriv', 1) # UDP/IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpSocketTransport().openClientMode() ) config.addTargetAddr( snmpEngine, 'my-router', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'my-creds' ) diff --git a/examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py b/examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py index d7d9b6d3..3d3052a7 100644 --- a/examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py +++ b/examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py @@ -29,7 +29,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4, first listening interface/port config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) diff --git a/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py b/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py index 30b41706..4aae9b66 100644 --- a/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py +++ b/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py @@ -30,14 +30,14 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4, first listening interface/port config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv4, second listening interface/port config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTransport().openServerMode(('127.0.0.1', 2162)) ) diff --git a/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py b/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py index 994c73dd..98f8ebd4 100644 --- a/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py +++ b/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py @@ -31,14 +31,14 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv6 config.addTransport( snmpEngine, - udp6.domainName, + udp6.DOMAIN_NAME, udp6.Udp6Transport().openServerMode(('::1', 162)) ) diff --git a/examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py b/examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py index 9b79a668..fd40aaf3 100644 --- a/examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py +++ b/examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py @@ -36,7 +36,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) @@ -46,8 +46,8 @@ config.addTransport( # this USM entry is configured for TRAP receiving purposes config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1', + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1', securityEngineId=v2c.OctetString(hexValue='8000000001020304') ) @@ -55,7 +55,7 @@ config.addV3User( # this USM entry is configured for TRAP receiving purposes config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1', + config.USM_AUTH_HMAC96_MD5, 'authkey1', securityEngineId=v2c.OctetString(hexValue='8000000001020304') ) @@ -63,8 +63,8 @@ config.addV3User( # this USM entry is configured for TRAP receiving purposes config.addV3User( snmpEngine, 'usr-sha-aes128', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1', + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1', securityEngineId=v2c.OctetString(hexValue='8000000001020304') ) diff --git a/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py b/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py index 9f3a2c40..a8d84813 100644 --- a/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py +++ b/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py @@ -56,14 +56,14 @@ snmpEngine.observer.registerObserver( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv6 config.addTransport( snmpEngine, - udp6.domainName, + udp6.DOMAIN_NAME, udp6.Udp6Transport().openServerMode(('::1', 162)) ) diff --git a/examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py b/examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py index 448c682b..b4a6fa0c 100644 --- a/examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py +++ b/examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py @@ -57,7 +57,7 @@ snmpEngine.observer.registerObserver( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openServerMode(('127.0.0.1', 162)) ) diff --git a/examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py b/examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py index df712179..2d7e0b3b 100644 --- a/examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py +++ b/examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py @@ -43,7 +43,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv6 config.addTransport( snmpEngine, - udp6.domainName, + udp6.DOMAIN_NAME, udp6.Udp6Transport().openServerMode(('::1', 161)) ) @@ -52,7 +52,7 @@ config.addTransport( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTransport().openClientMode() ) @@ -81,7 +81,7 @@ config.addTargetParams( ) config.addTargetAddr( snmpEngine, 'distant-agent', - udp.domainName, ('104.236.166.95', 161), + udp.DOMAIN_NAME, ('104.236.166.95', 161), 'distant-agent-auth', retryCount=0, tagList='remote' ) diff --git a/examples/v3arch/asyncore/proxy/command/v2c-to-v1-conversion.py b/examples/v3arch/asyncore/proxy/command/v2c-to-v1-conversion.py index c676e9b5..69916cb0 100644 --- a/examples/v3arch/asyncore/proxy/command/v2c-to-v1-conversion.py +++ b/examples/v3arch/asyncore/proxy/command/v2c-to-v1-conversion.py @@ -43,7 +43,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) @@ -52,7 +52,7 @@ config.addTransport( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTransport().openClientMode() ) @@ -80,7 +80,7 @@ config.addTargetParams(snmpEngine, 'distant-agent-auth', 'distant-area', config.addTargetAddr( snmpEngine, 'distant-agent', - udp.domainName + (2,), ('104.236.166.95', 161), + udp.DOMAIN_NAME + (2,), ('104.236.166.95', 161), 'distant-agent-auth', retryCount=0, tagList='distant' ) diff --git a/examples/v3arch/asyncore/proxy/command/v2c-to-v3-conversion.py b/examples/v3arch/asyncore/proxy/command/v2c-to-v3-conversion.py index 83d4c453..3e370e3c 100644 --- a/examples/v3arch/asyncore/proxy/command/v2c-to-v3-conversion.py +++ b/examples/v3arch/asyncore/proxy/command/v2c-to-v3-conversion.py @@ -42,7 +42,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) @@ -51,7 +51,7 @@ config.addTransport( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTransport().openClientMode() ) @@ -68,7 +68,7 @@ config.addV1System(snmpEngine, 'my-area', 'public') # user: usr-md5-none, auth: MD5, priv NONE config.addV3User( - snmpEngine, 'usr-md5-none', config.usmHMACMD5AuthProtocol, 'authkey1' + snmpEngine, 'usr-md5-none', config.USM_AUTH_HMAC96_MD5, 'authkey1' ) # @@ -80,7 +80,7 @@ config.addTargetParams( ) config.addTargetAddr( snmpEngine, 'distant-agent', - udp.domainName + (2,), ('104.236.166.95', 161), + udp.DOMAIN_NAME + (2,), ('104.236.166.95', 161), 'distant-agent-auth', retryCount=0 ) diff --git a/examples/v3arch/asyncore/proxy/command/v3-to-v2c-conversion.py b/examples/v3arch/asyncore/proxy/command/v3-to-v2c-conversion.py index e0c1c4d6..4794f49c 100644 --- a/examples/v3arch/asyncore/proxy/command/v3-to-v2c-conversion.py +++ b/examples/v3arch/asyncore/proxy/command/v3-to-v2c-conversion.py @@ -42,7 +42,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTransport().openServerMode(('127.0.0.1', 161)) ) @@ -51,7 +51,7 @@ config.addTransport( # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTransport().openClientMode() ) @@ -62,8 +62,8 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # @@ -83,7 +83,7 @@ config.addTargetParams(snmpEngine, 'distant-agent-auth', 'my-area', config.addTargetAddr( snmpEngine, 'distant-agent', - udp.domainName + (2,), ('104.236.166.95', 161), + udp.DOMAIN_NAME + (2,), ('104.236.166.95', 161), 'distant-agent-auth', retryCount=0 ) diff --git a/examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py b/examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py index 2a145c73..d10a0815 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py +++ b/examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py @@ -33,7 +33,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) ) diff --git a/examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py b/examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py index dc4729f6..408da95b 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py +++ b/examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py @@ -31,14 +31,14 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 at 127.0.0.1:161 config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) ) # UDP over IPv4 at 127.0.0.2:161 config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTwistedTransport().openServerMode(('127.0.0.2', 161)) ) diff --git a/examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py b/examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py index ec6799ad..62cf41e7 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py +++ b/examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py @@ -31,7 +31,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) ) diff --git a/examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py b/examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py index 372fc886..9b9eff55 100644 --- a/examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py +++ b/examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py @@ -35,7 +35,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 161)) ) @@ -44,19 +44,19 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # user: usr-sha-none, auth: SHA, priv NONE config.addV3User( snmpEngine, 'usr-sha-none', - config.usmHMACSHAAuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1' ) # user: usr-sha-none, auth: SHA, priv AES config.addV3User( snmpEngine, 'usr-sha-aes128', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1' ) # Allow full MIB access for each user at VACM diff --git a/examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py b/examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py index 842b454c..f5839302 100644 --- a/examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py +++ b/examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py @@ -33,14 +33,14 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4, first listening interface/port config.addTransport( snmpEngine, - udp.domainName + (1,), + udp.DOMAIN_NAME + (1,), udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 162)) ) # UDP over IPv4, second listening interface/port config.addTransport( snmpEngine, - udp.domainName + (2,), + udp.DOMAIN_NAME + (2,), udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 2162)) ) diff --git a/examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py b/examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py index 7d058c88..eef2f014 100644 --- a/examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py +++ b/examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py @@ -36,7 +36,7 @@ snmpEngine = engine.SnmpEngine() # UDP over IPv4 config.addTransport( snmpEngine, - udp.domainName, + udp.DOMAIN_NAME, udp.UdpTwistedTransport().openServerMode(('127.0.0.1', 162)) ) @@ -45,46 +45,46 @@ config.addTransport( # user: usr-md5-des, auth: MD5, priv DES config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1' ) # user: usr-md5-des, auth: MD5, priv DES, securityEngineId: 8000000001020304 # this USM entry is used for TRAP receiving purposes config.addV3User( snmpEngine, 'usr-md5-des', - config.usmHMACMD5AuthProtocol, 'authkey1', - config.usmDESPrivProtocol, 'privkey1', + config.USM_AUTH_HMAC96_MD5, 'authkey1', + config.USM_PRIV_CBC56_DES, 'privkey1', securityEngineId=rfc1902.OctetString(hexValue='8000000001020304') ) # user: usr-md5-none, auth: MD5, priv NONE config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1' + config.USM_AUTH_HMAC96_MD5, 'authkey1' ) # user: usr-md5-none, auth: MD5, priv NONE, securityEngineId: 8000000001020304 # this USM entry is used for TRAP receiving purposes config.addV3User( snmpEngine, 'usr-md5-none', - config.usmHMACMD5AuthProtocol, 'authkey1', + config.USM_AUTH_HMAC96_MD5, 'authkey1', securityEngineId=rfc1902.OctetString(hexValue='8000000001020304') ) # user: usr-sha-aes128, auth: SHA, priv AES config.addV3User( snmpEngine, 'usr-sha-aes128', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1' + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1' ) # user: usr-sha-aes128, auth: SHA, priv AES, securityEngineId: 8000000001020304 # this USM entry is used for TRAP receiving purposes config.addV3User( snmpEngine, 'usr-sha-aes128', - config.usmHMACSHAAuthProtocol, 'authkey1', - config.usmAesCfb128Protocol, 'privkey1', + config.USM_AUTH_HMAC96_SHA, 'authkey1', + config.USM_PRIV_CFB128_AES, 'privkey1', securityEngineId=rfc1902.OctetString(hexValue='8000000001020304') ) |