diff options
Diffstat (limited to 'pysnmp/hlapi/v3arch/asyncore')
-rw-r--r-- | pysnmp/hlapi/v3arch/asyncore/cmdgen.py | 28 | ||||
-rw-r--r-- | pysnmp/hlapi/v3arch/asyncore/ntforg.py | 10 | ||||
-rw-r--r-- | pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py | 1 | ||||
-rw-r--r-- | pysnmp/hlapi/v3arch/asyncore/transport.py | 8 |
4 files changed, 24 insertions, 23 deletions
diff --git a/pysnmp/hlapi/v3arch/asyncore/cmdgen.py b/pysnmp/hlapi/v3arch/asyncore/cmdgen.py index 475a2ea7..53b4cd1b 100644 --- a/pysnmp/hlapi/v3arch/asyncore/cmdgen.py +++ b/pysnmp/hlapi/v3arch/asyncore/cmdgen.py @@ -15,8 +15,8 @@ from pysnmp.proto.api import v2c __all__ = ['getCmd', 'nextCmd', 'setCmd', 'bulkCmd', 'isEndOfMib'] -vbProcessor = CommandGeneratorVarBinds() -lcd = CommandGeneratorLcdConfigurator() +VB_PROCESSOR = CommandGeneratorVarBinds() +LCD = CommandGeneratorLcdConfigurator() isEndOfMib = lambda varBinds: not v2c.apiPDU.getNextVarBinds(varBinds) @@ -117,17 +117,17 @@ def getCmd(snmpEngine, authData, transportTarget, contextData, if cbFun: return cbFun(snmpEngine, sendRequestHandle, errorIndication, errorStatus, errorIndex, - vbProcessor.unmakeVarBinds( + VB_PROCESSOR.unmakeVarBinds( snmpEngine.cache, varBinds, lookupMib ), cbCtx) - addrName, paramsName = lcd.configure( + addrName, paramsName = LCD.configure( snmpEngine, authData, transportTarget, contextData.contextName) return cmdgen.GetCommandGenerator().sendVarBinds( snmpEngine, addrName, contextData.contextEngineId, contextData.contextName, - vbProcessor.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, + VB_PROCESSOR.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, (options.get('lookupMib', True), options.get('cbFun'), options.get('cbCtx')) ) @@ -229,16 +229,16 @@ def setCmd(snmpEngine, authData, transportTarget, contextData, lookupMib, cbFun, cbCtx = cbCtx return cbFun(snmpEngine, sendRequestHandle, errorIndication, errorStatus, errorIndex, - vbProcessor.unmakeVarBinds( + VB_PROCESSOR.unmakeVarBinds( snmpEngine.cache, varBinds, lookupMib ), cbCtx) - addrName, paramsName = lcd.configure( + addrName, paramsName = LCD.configure( snmpEngine, authData, transportTarget, contextData.contextName) return cmdgen.SetCommandGenerator().sendVarBinds( snmpEngine, addrName, contextData.contextEngineId, - contextData.contextName, vbProcessor.makeVarBinds(snmpEngine.cache, varBinds), + contextData.contextName, VB_PROCESSOR.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, (options.get('lookupMib', True), options.get('cbFun'), options.get('cbCtx')) ) @@ -341,17 +341,17 @@ def nextCmd(snmpEngine, authData, transportTarget, contextData, lookupMib, cbFun, cbCtx = cbCtx return cbFun(snmpEngine, sendRequestHandle, errorIndication, errorStatus, errorIndex, - [vbProcessor.unmakeVarBinds(snmpEngine.cache, varBindTableRow, lookupMib) for varBindTableRow in + [VB_PROCESSOR.unmakeVarBinds(snmpEngine.cache, varBindTableRow, lookupMib) for varBindTableRow in varBindTable], cbCtx) - addrName, paramsName = lcd.configure( + addrName, paramsName = LCD.configure( snmpEngine, authData, transportTarget, contextData.contextName) return cmdgen.NextCommandGenerator().sendVarBinds( snmpEngine, addrName, contextData.contextEngineId, contextData.contextName, - vbProcessor.makeVarBinds(snmpEngine.cache, varBinds), + VB_PROCESSOR.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, (options.get('lookupMib', True), options.get('cbFun'), options.get('cbCtx')) ) @@ -484,16 +484,16 @@ def bulkCmd(snmpEngine, authData, transportTarget, contextData, lookupMib, cbFun, cbCtx = cbCtx return cbFun(snmpEngine.cache, sendRequestHandle, errorIndication, errorStatus, errorIndex, - [vbProcessor.unmakeVarBinds(snmpEngine.cache, varBindTableRow, lookupMib) for varBindTableRow in + [VB_PROCESSOR.unmakeVarBinds(snmpEngine.cache, varBindTableRow, lookupMib) for varBindTableRow in varBindTable], cbCtx) - addrName, paramsName = lcd.configure( + addrName, paramsName = LCD.configure( snmpEngine, authData, transportTarget, contextData.contextName) return cmdgen.BulkCommandGenerator().sendVarBinds( snmpEngine, addrName, contextData.contextEngineId, contextData.contextName, nonRepeaters, maxRepetitions, - vbProcessor.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, + VB_PROCESSOR.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, (options.get('lookupMib', True), options.get('cbFun'), options.get('cbCtx')) ) diff --git a/pysnmp/hlapi/v3arch/asyncore/ntforg.py b/pysnmp/hlapi/v3arch/asyncore/ntforg.py index c6669d35..e69eccbf 100644 --- a/pysnmp/hlapi/v3arch/asyncore/ntforg.py +++ b/pysnmp/hlapi/v3arch/asyncore/ntforg.py @@ -14,8 +14,8 @@ from pysnmp.hlapi.v3arch.asyncore.transport import * __all__ = ['sendNotification'] -vbProcessor = NotificationOriginatorVarBinds() -lcd = NotificationOriginatorLcdConfigurator() +VB_PROCESSOR = NotificationOriginatorVarBinds() +LCD = NotificationOriginatorLcdConfigurator() def sendNotification(snmpEngine, authData, transportTarget, contextData, @@ -156,18 +156,18 @@ def sendNotification(snmpEngine, authData, transportTarget, contextData, return cbFun and cbFun( snmpEngine, sendRequestHandle, errorIndication, errorStatus, errorIndex, - vbProcessor.unmakeVarBinds( + VB_PROCESSOR.unmakeVarBinds( snmpEngine.cache, varBinds, lookupMib ), cbCtx ) - notifyName = lcd.configure(snmpEngine, authData, transportTarget, + notifyName = LCD.configure(snmpEngine, authData, transportTarget, notifyType, contextData.contextName) return ntforg.NotificationOriginator().sendVarBinds( snmpEngine, notifyName, contextData.contextEngineId, contextData.contextName, - vbProcessor.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, + VB_PROCESSOR.makeVarBinds(snmpEngine.cache, varBinds), __cbFun, (options.get('lookupMib', True), options.get('cbFun'), options.get('cbCtx')) ) diff --git a/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py b/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py index f2230826..bb9703f4 100644 --- a/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py +++ b/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py @@ -19,6 +19,7 @@ __all__ = ['getCmd', 'nextCmd', 'setCmd', 'bulkCmd', 'next'] def next(iter): return iter.next() + def getCmd(snmpEngine, authData, transportTarget, contextData, *varBinds, **options): # noinspection PyShadowingNames diff --git a/pysnmp/hlapi/v3arch/asyncore/transport.py b/pysnmp/hlapi/v3arch/asyncore/transport.py index 77a37c65..61d32aaa 100644 --- a/pysnmp/hlapi/v3arch/asyncore/transport.py +++ b/pysnmp/hlapi/v3arch/asyncore/transport.py @@ -49,8 +49,8 @@ class UdpTransportTarget(AbstractTransportTarget): >>> """ - transportDomain = udp.domainName - protoTransport = udp.UdpSocketTransport + TRANSPORT_DOMAIN = udp.DOMAIN_NAME + PROTO_TRANSPORT = udp.UdpSocketTransport def _resolveAddr(self, transportAddr): try: @@ -107,8 +107,8 @@ class Udp6TransportTarget(AbstractTransportTarget): >>> """ - transportDomain = udp6.domainName - protoTransport = udp6.Udp6SocketTransport + TRANSPORT_DOMAIN = udp6.DOMAIN_NAME + PROTO_TRANSPORT = udp6.Udp6SocketTransport def _resolveAddr(self, transportAddr): try: |