diff options
| author | elie <elie> | 2014-11-04 17:13:13 +0000 |
|---|---|---|
| committer | elie <elie> | 2014-11-04 17:13:13 +0000 |
| commit | 7e3f7b5987df8eebe20d5e46f893e29be448adef (patch) | |
| tree | dd6638460ce9ef84d1602f336fb26e268c457978 | |
| parent | c19ed98c46696d37108cf6cbedcbcb601b34540b (diff) | |
| download | pysnmp-7e3f7b5987df8eebe20d5e46f893e29be448adef.tar.gz | |
nonRepeaters & maxRepetitions position fix
| -rw-r--r-- | examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py | 2 | ||||
| -rw-r--r-- | examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py | 2 | ||||
| -rw-r--r-- | pysnmp/entity/rfc3413/twisted/cmdgen.py | 18 |
3 files changed, 11 insertions, 11 deletions
diff --git a/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py b/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py index fd761c9..d5733aa 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py +++ b/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py @@ -87,8 +87,8 @@ def cbFun(response, *args): df = cmdgen.BulkCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - 0, 25, # non-repeaters, max-repetitions None, '', # contextEngineId, contextName + 0, 25, # non-repeaters, max-repetitions [ ('1.3.6.1.2.1.1', None), ('1.3.6.1.4.1.1', None) ] ) diff --git a/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py b/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py index 49017dc..2b734a1 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py @@ -88,8 +88,8 @@ def cbFun(response): df = cmdgen.BulkCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - 0, 25, # non-repeaters, max-repetitions None, '', # contextEngineId, contextName + 0, 25, # non-repeaters, max-repetitions [ ((1,3,6,1,2,1,1), None), ((1,3,6,1,4,1,1), None) ] ) diff --git a/pysnmp/entity/rfc3413/twisted/cmdgen.py b/pysnmp/entity/rfc3413/twisted/cmdgen.py index 71f6c50..40f5464 100644 --- a/pysnmp/entity/rfc3413/twisted/cmdgen.py +++ b/pysnmp/entity/rfc3413/twisted/cmdgen.py @@ -1,7 +1,7 @@ from twisted.internet import defer from pysnmp.entity.rfc3413 import cmdgen -def __cbFun(snmpEngine, sendRequestHandle, errorIndication, +def _cbFun(snmpEngine, sendRequestHandle, errorIndication, errorStatus, errorIndex, varBinds, cbCtx): df = cbCtx['df'] df.callback( @@ -25,7 +25,7 @@ class AbstractCommandGenerator: contextEngineId, contextName, varBinds, - __cbFun, + _cbFun, { 'df': df } # anonymous dictionary used for cbCtx ) return df @@ -49,22 +49,22 @@ class AbstractBulkCommandGenerator: self, snmpEngine, targetName, - nonRepeaters, - maxRepetitions, contextEngineId, contextName, + nonRepeaters, + maxRepetitions, varBinds ): df = defer.Deferred() self.commandGenerator.sendVarBinds( snmpEngine, targetName, - nonRepeaters, - maxRepetitions, contextEngineId, contextName, + nonRepeaters, + maxRepetitions, varBinds, - __cbFun, + _cbFun, { 'df': df } # anonymous dictionary used for cbCtx ) return df @@ -118,10 +118,10 @@ def _sendBulkReq(self, contextName=''): innerDf = self.sendVarBinds(snmpEngine, targetName, - nonRepeaters, - maxRepetitions, contextEngineId, contextName, + nonRepeaters, + maxRepetitions, varBinds) outerDf = defer.Deferred() innerDf.addCallback(__sendReqCbFun, outerDf) |