summaryrefslogtreecommitdiff
path: root/examples/v1arch/asyncore/agent
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-02-10 16:38:35 +0100
committerGitHub <noreply@github.com>2019-02-10 16:38:35 +0100
commit588b9b902d191d8010cb6b247fcb07887d59542c (patch)
tree419b01d2598e91331db784ac3a6675324aba8c24 /examples/v1arch/asyncore/agent
parent9664858b145140a4fbb2a22b633c1ab41c2555bd (diff)
downloadpysnmp-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/v1arch/asyncore/agent')
-rw-r--r--examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py12
-rw-r--r--examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py4
-rw-r--r--examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py12
3 files changed, 14 insertions, 14 deletions
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