From 43dbc9e5b8c99150c8eb7f4f8a821c425420495d Mon Sep 17 00:00:00 2001 From: elie Date: Mon, 16 Jun 2014 17:33:00 +0000 Subject: converted to the latest API --- examples/v3arch/twisted/agent/ntforg/inform-v2c.py | 26 +++++++++++++--------- examples/v3arch/twisted/agent/ntforg/inform-v3.py | 24 +++++++++++--------- examples/v3arch/twisted/agent/ntforg/trap-v1.py | 21 ++++++++++------- .../agent/ntforg/trap-v2c-multiple-targets.py | 19 ++++++++++------ examples/v3arch/twisted/agent/ntforg/trap-v3.py | 20 ++++++++++------- 5 files changed, 66 insertions(+), 44 deletions(-) diff --git a/examples/v3arch/twisted/agent/ntforg/inform-v2c.py b/examples/v3arch/twisted/agent/ntforg/inform-v2c.py index 960fcc4..2bd91d2 100644 --- a/examples/v3arch/twisted/agent/ntforg/inform-v2c.py +++ b/examples/v3arch/twisted/agent/ntforg/inform-v2c.py @@ -64,15 +64,12 @@ config.addNotificationTarget( config.addContext(snmpEngine, '') config.addVacmUser(snmpEngine, 2, 'my-area', 'noAuthNoPriv', (), (), (1,3,6)) -# Create default SNMP context where contextEngineId == SnmpEngineId -snmpContext = context.SnmpContext(snmpEngine) - # Create Notification Originator App instance. -ntfOrg = ntforg.NotificationOriginator(snmpContext) +ntfOrg = ntforg.NotificationOriginator() # Error/confirmation receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response print('Notification status - %s' % ( errorIndication and errorIndication or 'delivered' ) @@ -80,16 +77,23 @@ def cbFun(cbCtx): # Optionally stop Twisted reactor reactor.stop() +# Create default SNMP context where contextEngineId == SnmpEngineId +snmpContext = context.SnmpContext(snmpEngine) + # Prepare request to be sent yielding Twisted deferred object -df = ntfOrg.sendNotification( +df = ntfOrg.sendVarBinds( snmpEngine, # Notification targets 'my-notification', - # Trap OID (SNMPv2-MIB::coldStart) + # SNMP Context + snmpContext, + # contextName + '', + # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), - # ( (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')) ) + # 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')) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/agent/ntforg/inform-v3.py b/examples/v3arch/twisted/agent/ntforg/inform-v3.py index bb54673..def2ad6 100644 --- a/examples/v3arch/twisted/agent/ntforg/inform-v3.py +++ b/examples/v3arch/twisted/agent/ntforg/inform-v3.py @@ -62,15 +62,15 @@ config.addNotificationTarget( config.addContext(snmpEngine, '') config.addVacmUser(snmpEngine, 3, 'usr-md5-none', 'authNoPriv', (), (), (1,3,6)) -# Create default SNMP context where contextEngineId == SnmpEngineId +# Create Notification Originator App instance. +ntfOrg = ntforg.NotificationOriginator() + + # Create default SNMP context where contextEngineId == SnmpEngineId snmpContext = context.SnmpContext(snmpEngine) -# Create Notification Originator App instance. -ntfOrg = ntforg.NotificationOriginator(snmpContext) - # Error/confirmation receiver -def cbFun(cbCtx): - (errorIndication, errorStatus, errorIndex, varBinds) = cbCtx +def cbFun(response, *args): + snmpEngine, errorIndication, errorStatus, errorIndex, varBinds = response print('Notification status - %s' % ( errorIndication and errorIndication or 'delivered' ) @@ -79,14 +79,18 @@ def cbFun(cbCtx): reactor.stop() # Build and submit notification message to dispatcher -df = ntfOrg.sendNotification( +df = ntfOrg.sendVarBinds( snmpEngine, # Notification targets 'my-notification', - # Trap OID (SNMPv2-MIB::coldStart) + # SNMP Context + snmpContext, + # contextName + '', + # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), - # ( (oid, value), ... ) - ( ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('system name')), ) + # additional var-binds: ( (oid, value), ... ) + [ ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('system name')) ] ) # Register error/response receiver function at deferred diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v1.py b/examples/v3arch/twisted/agent/ntforg/trap-v1.py index 4f52640..557b352 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v1.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v1.py @@ -66,21 +66,26 @@ config.addNotificationTarget( config.addContext(snmpEngine, '') config.addVacmUser(snmpEngine, 1, 'my-area', 'noAuthNoPriv', (), (), (1,3,6)) -# Create default SNMP context where contextEngineId == SnmpEngineId +# Create Notification Originator App instance. +ntfOrg = ntforg.NotificationOriginator() + + # Create default SNMP context where contextEngineId == SnmpEngineId snmpContext = context.SnmpContext(snmpEngine) -# Create Notification Originator App instance. -ntfOrg = ntforg.NotificationOriginator(snmpContext) - # Prepare notification to be sent yielding Twisted deferred object -ntforg.NotificationOriginator(snmpContext).sendNotification( +ntfOrg.sendVarBinds( snmpEngine, # Notification targets 'my-notification', - # TRAP OID: Generic Trap #6 (enterpriseSpecific) and Specific Trap 432 + # SNMP Context + snmpContext, + # contextName + '', + # notification name: Generic Trap #6 (enterpriseSpecific) + # and Specific Trap 432 '1.3.6.1.4.1.20408.4.1.1.2.0.432', # additional var-binds holding SNMPv1 TRAP details - ( + [ # Uptime value with 12345 (rfc1902.ObjectName('1.3.6.1.2.1.1.3.0'), rfc1902.TimeTicks(12345)), @@ -93,7 +98,7 @@ ntforg.NotificationOriginator(snmpContext).sendNotification( # managed object '1.3.6.1.2.1.1.1.0' = 'my system' (rfc1902.ObjectName('1.3.6.1.2.1.1.1.0'), rfc1902.OctetString('my system')) - ) + ] ) print('Notification is scheduled to be sent') 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 e3e65b8..0717c7f 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py @@ -82,22 +82,27 @@ config.addNotificationTarget( config.addContext(snmpEngine, '') config.addVacmUser(snmpEngine, 2, 'my-area', 'noAuthNoPriv', (), (), (1,3,6)) +# Create Notification Originator App instance. +ntfOrg = ntforg.NotificationOriginator() + # Create default SNMP context where contextEngineId == SnmpEngineId snmpContext = context.SnmpContext(snmpEngine) - -# Create Notification Originator App instance. -ntfOrg = ntforg.NotificationOriginator(snmpContext) # Build and submit notification message to dispatcher -ntfOrg.sendNotification( +ntfOrg.sendVarBinds( snmpEngine, # Notification targets 'my-notification', + # SNMP Context + snmpContext, + # contextName + '', + # notification name # Trap OID (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), - # ( (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')) ) + # 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')) ] ) print('Notification is scheduled to be sent') diff --git a/examples/v3arch/twisted/agent/ntforg/trap-v3.py b/examples/v3arch/twisted/agent/ntforg/trap-v3.py index c88e64c..6c14fc5 100644 --- a/examples/v3arch/twisted/agent/ntforg/trap-v3.py +++ b/examples/v3arch/twisted/agent/ntforg/trap-v3.py @@ -64,21 +64,25 @@ config.addNotificationTarget( config.addContext(snmpEngine, '') config.addVacmUser(snmpEngine, 3, 'usr-md5-des', 'authPriv', (), (), (1,3,6)) -# Create default SNMP context where contextEngineId == SnmpEngineId +# Create Notification Originator App instance. +ntfOrg = ntforg.NotificationOriginator() + + # Create default SNMP context where contextEngineId == SnmpEngineId snmpContext = context.SnmpContext(snmpEngine) -# Create Notification Originator App instance. -ntfOrg = ntforg.NotificationOriginator(snmpContext) - # Build and submit notification message to dispatcher -ntfOrg.sendNotification( +ntfOrg.sendVarBinds( snmpEngine, # Notification targets 'my-notification', - # Trap OID (SNMPv2-MIB::coldStart) + # SNMP Context + snmpContext, + # contextName + '', + # notification name (SNMPv2-MIB::coldStart) (1,3,6,1,6,3,1,1,5,1), - # ( (oid, value), ... ) - ( ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('system name')), ) + # additional var-binds: ( (oid, value), ... ) + [ ((1,3,6,1,2,1,1,5,0), rfc1902.OctetString('system name')) ] ) print('Notification is scheduled to be sent') -- cgit v1.2.1