diff options
Diffstat (limited to 'examples/v3arch/twisted')
17 files changed, 75 insertions, 55 deletions
diff --git a/examples/v3arch/twisted/agent/ntforg/inform-v2c.py b/examples/v3arch/twisted/agent/ntforg/inform-v2c.py index 2bd91d2..95ba561 100644 --- a/examples/v3arch/twisted/agent/ntforg/inform-v2c.py +++ b/examples/v3arch/twisted/agent/ntforg/inform-v2c.py @@ -91,6 +91,8 @@ df = ntfOrg.sendVarBinds( '', # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), + # notification objects instance index + None, # additional var-binds: [ (oid, value), ... ] [ ((1,3,6,1,2,1,1,1,0), rfc1902.OctetString('Example Notificator')), ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('Notificator Example')) ] diff --git a/examples/v3arch/twisted/agent/ntforg/inform-v3.py b/examples/v3arch/twisted/agent/ntforg/inform-v3.py index def2ad6..376da6e 100644 --- a/examples/v3arch/twisted/agent/ntforg/inform-v3.py +++ b/examples/v3arch/twisted/agent/ntforg/inform-v3.py @@ -89,6 +89,8 @@ df = ntfOrg.sendVarBinds( '', # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), + # notification objects instance index + None, # additional var-binds: ( (oid, value), ... ) [ ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('system name')) ] ) diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v1.py b/examples/v3arch/twisted/agent/ntforg/trap-v1.py index 557b352..6863e0d 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v1.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v1.py @@ -84,6 +84,8 @@ ntfOrg.sendVarBinds( # notification name: Generic Trap #6 (enterpriseSpecific) # and Specific Trap 432 '1.3.6.1.4.1.20408.4.1.1.2.0.432', + # notification objects instance index + None, # additional var-binds holding SNMPv1 TRAP details [ # Uptime value with 12345 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 0717c7f..c63dc37 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py @@ -97,9 +97,10 @@ ntfOrg.sendVarBinds( snmpContext, # contextName '', - # notification name - # Trap OID (SNMPv2-MIB::coldStart) + # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), + # notification objects instance index + None, # additional var-binds: ( (oid, value), ... ) [ ((1,3,6,1,2,1,1,1,0), rfc1902.OctetString('Example Notificator')), ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('Notificator Example')) ] diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v3.py b/examples/v3arch/twisted/agent/ntforg/trap-v3.py index 6c14fc5..c38e474 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v3.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v3.py @@ -81,6 +81,8 @@ ntfOrg.sendVarBinds( '', # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), + # notification objects instance index + None, # additional var-binds: ( (oid, value), ... ) [ ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('system name')) ] ) diff --git a/examples/v3arch/twisted/manager/cmdgen/get-v1.py b/examples/v3arch/twisted/manager/cmdgen/get-v1.py index 1ccf1ab..38428c6 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v1.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v1.py @@ -48,8 +48,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) # SNMPv1 response may contain noSuchName error *and* SNMPv2c exception, @@ -67,10 +67,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.GetCommandGenerator().sendReq( +df = cmdgen.GetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ('1.3.6.1.2.1.1.1.0', None), ('1.3.6.1.2.1.1.2.0', None) ), + None, '', # contextEngineId, contextName + [ ('1.3.6.1.2.1.1.1.0', None), ('1.3.6.1.2.1.1.2.0', None) ] ) # Register error/response receiver function at deferred 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 5e36d99..246a1b9 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py @@ -51,8 +51,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) elif errorStatus: @@ -68,10 +68,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.GetCommandGenerator().sendReq( +df = cmdgen.GetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ('1.3.6.1.2.1.1.1.0', None), ), + None, '', # contextEngineId, contextName + [ ('1.3.6.1.2.1.1.1.0', None) ], ) # Register error/response receiver function at deferred 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 516bbba..e85babe 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py @@ -4,7 +4,7 @@ # Send a SNMP GET request # with SNMPv3 with user 'usr-md5-none', SHA auth and no privacy protocols # for MIB instance identified by -# contextEngineId: 80004fb805636c6f75644dab22cc +# contextEngineId: 0x80004fb805636c6f75644dab22cc # contextName: da761cfc8c94d3aceef4f60f049105ba # using Twisted framework for network transport # over IPv4/UDP @@ -53,8 +53,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) elif errorStatus: @@ -70,12 +70,12 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.GetCommandGenerator().sendReq( +df = cmdgen.GetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ('1.3.6.1.2.1.1.1.0', None), ), - contextEngineId=rfc1902.OctetString(hexValue='80004fb805636c6f75644dab22cc'), - contextName=rfc1902.OctetString('da761cfc8c94d3aceef4f60f049105ba') + rfc1902.OctetString(hexValue='80004fb805636c6f75644dab22cc'), + rfc1902.OctetString('da761cfc8c94d3aceef4f60f049105ba'), + [ ('1.3.6.1.2.1.1.1.0', None) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/get-v3.py b/examples/v3arch/twisted/manager/cmdgen/get-v3.py index 967e024..0e3ab3e 100644 --- a/examples/v3arch/twisted/manager/cmdgen/get-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/get-v3.py @@ -50,8 +50,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) elif errorStatus: @@ -67,10 +67,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.GetCommandGenerator().sendReq( +df = cmdgen.GetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ('1.3.6.1.2.1.1.1.0', None), ), + None, '', # contextEngineId, contextName + [ ('1.3.6.1.2.1.1.1.0', None) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py b/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py index 7a67f74..fd761c9 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py +++ b/examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py @@ -51,8 +51,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBindTable) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBindTable = response if errorIndication: print(errorIndication) elif errorStatus: @@ -84,11 +84,12 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.BulkCommandGenerator().sendReq( +df = cmdgen.BulkCommandGenerator().sendVarBinds( snmpEngine, 'my-router', 0, 25, # non-repeaters, max-repetitions - ( ('1.3.6.1.2.1.1', None), ('1.3.6.1.4.1.1', None) ) + None, '', # contextEngineId, contextName + [ ('1.3.6.1.2.1.1', None), ('1.3.6.1.4.1.1', None) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py b/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py index e93927d..49017dc 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py @@ -53,8 +53,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBindTable) = cbCtx +def cbFun(response): + snmpEngine, errorIndication, errorStatus, errorIndex, varBindTable = response if errorIndication: print(errorIndication) elif errorStatus: @@ -85,11 +85,12 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.BulkCommandGenerator().sendReq( +df = cmdgen.BulkCommandGenerator().sendVarBinds( snmpEngine, - 'my-router', + 'my-router', 0, 25, # non-repeaters, max-repetitions - ( ((1,3,6,1,2,1,1), None), ((1,3,6,1,4,1,1), None) ) + None, '', # contextEngineId, contextName + [ ((1,3,6,1,2,1,1), None), ((1,3,6,1,4,1,1), None) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py b/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py index d47b552..dede0ab 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py +++ b/examples/v3arch/twisted/manager/cmdgen/getnext-v1.py @@ -50,8 +50,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBindTable) = cbCtx +def cbFun(response): + snmpEngine, errorIndication, errorStatus, errorIndex, varBindTable = response if errorIndication: print(errorIndication) # SNMPv1 response may contain noSuchName error *and* SNMPv2c exception, @@ -84,10 +84,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.NextCommandGenerator().sendReq( +df = cmdgen.NextCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ('1.3.6.1.2.1.1', None), ('1.3.6.1.4.1.1', None) ), + None, '', # contextEngineId, contextName + [ ('1.3.6.1.2.1.1', None), ('1.3.6.1.4.1.1', None) ] ) # Register error/response receiver function at deferred 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 0b7f88a..c27b643 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 @@ -51,8 +51,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBindTable) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBindTable = response if errorIndication: print(errorIndication) elif errorStatus: @@ -84,10 +84,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.NextCommandGenerator().sendReq( +df = cmdgen.NextCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ('1.3.6.1.2.1.1', None), ('1.3.6.1.2.1.11', None) ) + None, '', # contextEngineId, contextName + [ ('1.3.6.1.2.1.1', None), ('1.3.6.1.2.1.11', None) ] ) # Register error/response receiver function at deferred 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 77499d8..bff697e 100644 --- a/examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py +++ b/examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py @@ -53,8 +53,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBindTable) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBindTable = response if errorIndication: print(errorIndication) elif errorStatus: @@ -89,10 +89,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.NextCommandGenerator().sendReq( +df = cmdgen.NextCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( (initialOID, None), ) + None, '', # contextEngineId, contextName + [ (initialOID, None) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/set-v1.py b/examples/v3arch/twisted/manager/cmdgen/set-v1.py index a58a67e..c372104 100644 --- a/examples/v3arch/twisted/manager/cmdgen/set-v1.py +++ b/examples/v3arch/twisted/manager/cmdgen/set-v1.py @@ -49,8 +49,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) # SNMPv1 response may contain noSuchName error *and* SNMPv2c exception, @@ -68,11 +68,12 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.SetCommandGenerator().sendReq( +df = cmdgen.SetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ((1,3,6,1,2,1,1,9,1,3,1), rfc1902.OctetString('my value')), - ((1,3,6,1,2,1,1,9,1,4,1), rfc1902.Integer(123)) ) + None, '', # contextEngineId, contextName + [ ((1,3,6,1,2,1,1,9,1,3,1), rfc1902.OctetString('my value')), + ((1,3,6,1,2,1,1,9,1,4,1), rfc1902.Integer(123)) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/set-v2c.py b/examples/v3arch/twisted/manager/cmdgen/set-v2c.py index 981842d..5fd91f1 100644 --- a/examples/v3arch/twisted/manager/cmdgen/set-v2c.py +++ b/examples/v3arch/twisted/manager/cmdgen/set-v2c.py @@ -49,8 +49,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) elif errorStatus: @@ -66,10 +66,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.SetCommandGenerator().sendReq( +df = cmdgen.SetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ((1,3,6,1,2,1,1,9,1,3,1), rfc1902.Integer(123)), ) + None, '', # contextEngineId, contextName + [ ((1,3,6,1,2,1,1,9,1,3,1), rfc1902.Integer(123)) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/manager/cmdgen/set-v3.py b/examples/v3arch/twisted/manager/cmdgen/set-v3.py index 5d32570..1fb7ce8 100644 --- a/examples/v3arch/twisted/manager/cmdgen/set-v3.py +++ b/examples/v3arch/twisted/manager/cmdgen/set-v3.py @@ -50,8 +50,8 @@ config.addTargetAddr( ) # Error/response receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response if errorIndication: print(errorIndication) elif errorStatus: @@ -67,10 +67,11 @@ def cbFun(cbCtx): reactor.stop() # Prepare request to be sent yielding Twisted deferred object -df = cmdgen.SetCommandGenerator().sendReq( +df = cmdgen.SetCommandGenerator().sendVarBinds( snmpEngine, 'my-router', - ( ((1,3,6,1,2,1,1,9,1,3,1), rfc1902.OctetString('my new value')), ) + None, '', # contextEngineId, contextName + [ ((1,3,6,1,2,1,1,9,1,3,1), rfc1902.OctetString('my new value')) ] ) # Register error/response receiver function at deferred |