converted to the latest API that supports more data to be used

14 files changed, 78 insertions, 75 deletions

diff --git a/examples/v3arch/manager/cmdgen/get-v1.py b/examples/v3arch/manager/cmdgen/get-v1.py
index f1fb907..4fbfb8b 100644
--- a/examples/v3arch/manager/cmdgen/get-v1.py
+++ b/examples/v3arch/manager/cmdgen/get-v1.py
@@ -46,9 +46,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     # SNMPv1 response may contain noSuchName error *and* SNMPv2c exception,
@@ -64,10 +63,11 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.GetCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py b/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py
index 15f4abf..5ea17a4 100644
--- a/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py
+++ b/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py
@@ -49,9 +49,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     elif errorStatus:
@@ -65,10 +64,11 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.GetCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/get-v3-custom-context.py b/examples/v3arch/manager/cmdgen/get-v3-custom-context.py
index 7a863d6..0be8da9 100644
--- a/examples/v3arch/manager/cmdgen/get-v3-custom-context.py
+++ b/examples/v3arch/manager/cmdgen/get-v3-custom-context.py
@@ -51,9 +51,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     elif errorStatus:
@@ -67,13 +66,15 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message, pass custom ContextEngineId & ContextName
-cmdgen.GetCommandGenerator().sendReq(
+cmdgen.GetCommandGenerator().sendVarBinds(
     snmpEngine,
     'my-router',
-    ( ((1,3,6,1,2,1,1,1,0), None), ),
-    cbFun,
-    contextEngineId=rfc1902.OctetString(hexValue='80004fb805636c6f75644dab22cc'),
-    contextName=rfc1902.OctetString('da761cfc8c94d3aceef4f60f049105ba')
+    # contextEngineId
+    rfc1902.OctetString(hexValue='80004fb805636c6f75644dab22cc'),
+    # contextName
+    rfc1902.OctetString('da761cfc8c94d3aceef4f60f049105ba'),
+    [ ((1,3,6,1,2,1,1,1,0), None) ],
+    cbFun
 )
 
 # Run I/O dispatcher which would send pending queries and process responses
diff --git a/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py b/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py
index 0916b87..09c543b 100644
--- a/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py
+++ b/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py
@@ -73,9 +73,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     elif errorStatus:
@@ -89,10 +88,11 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.GetCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/get-v3.py b/examples/v3arch/manager/cmdgen/get-v3.py
index 95eba5d..e898904 100644
--- a/examples/v3arch/manager/cmdgen/get-v3.py
+++ b/examples/v3arch/manager/cmdgen/get-v3.py
@@ -48,9 +48,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     elif errorStatus:
@@ -64,10 +63,11 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.GetCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/getbulk-v2c.py b/examples/v3arch/manager/cmdgen/getbulk-v2c.py
index 62b4dd9..697c4cd 100644
--- a/examples/v3arch/manager/cmdgen/getbulk-v2c.py
+++ b/examples/v3arch/manager/cmdgen/getbulk-v2c.py
@@ -48,8 +48,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequesthandle, errorIndication, errorStatus, errorIndex,
-          varBindTable, cbCtx):
+def cbFun(snmpEngine, sendRequesthandle, errorIndication,
+          errorStatus, errorIndex, varBindTable, cbCtx):
     if errorIndication:
         print(errorIndication)
         return  # stop on error
@@ -66,12 +66,13 @@ def cbFun(sendRequesthandle, errorIndication, errorStatus, errorIndex,
     return True # signal dispatcher to continue walking
 
 # Prepare initial request to be sent
-cmdgen.BulkCommandGenerator().sendReq(
+cmdgen.BulkCommandGenerator().sendVarBinds(
     snmpEngine,
     'my-router',
+    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) ),
+    [ ((1,3,6,1,2,1,1), None),
+      ((1,3,6,1,4,1,1), None) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/getbulk-v3.py b/examples/v3arch/manager/cmdgen/getbulk-v3.py
index 5cdb598..660dcb2 100644
--- a/examples/v3arch/manager/cmdgen/getbulk-v3.py
+++ b/examples/v3arch/manager/cmdgen/getbulk-v3.py
@@ -50,8 +50,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequesthandle, errorIndication, errorStatus, errorIndex,
-          varBindTable, cbCtx):
+def cbFun(snmpEngine, sendRequesthandle, errorIndication,
+          errorStatus, errorIndex, varBindTable, cbCtx):
     if errorIndication:
         print(errorIndication)
         return  # stop on error
@@ -68,9 +68,10 @@ def cbFun(sendRequesthandle, errorIndication, errorStatus, errorIndex,
     return True # signal dispatcher to continue walking
 
 # Prepare initial request to be sent
-cmdgen.BulkCommandGenerator().sendReq(
+cmdgen.BulkCommandGenerator().sendVarBinds(
     snmpEngine,
     'my-router',
+    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/manager/cmdgen/getnext-v1.py b/examples/v3arch/manager/cmdgen/getnext-v1.py
index 967186e..a5a17b4 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v1.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v1.py
@@ -47,9 +47,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBindTable, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBindTable, cbCtx):
     if errorIndication:
         print(errorIndication)
         return
@@ -68,11 +67,12 @@ def cbFun(sendRequestHandle,
     return 1 # signal dispatcher to continue
 
 # Prepare initial request to be sent
-cmdgen.NextCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py b/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py
index fb167ba..dd8e4fd 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py
@@ -48,9 +48,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBindTable, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBindTable, cbCtx):
     if errorIndication:
         print(errorIndication)
         return
@@ -67,11 +66,12 @@ def cbFun(sendRequestHandle,
     return 1 # signal dispatcher to continue
 
 # Prepare initial request to be sent
-cmdgen.NextCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py b/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py
index 3377328..2a9e93a 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py
@@ -48,9 +48,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBindTable, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBindTable, cbCtx):
     if errorIndication:
         print(errorIndication)
         return
@@ -67,11 +66,12 @@ def cbFun(sendRequestHandle,
     return True # signal dispatcher to continue
 
 # Prepare initial request to be sent
-cmdgen.NextCommandGenerator().sendReq(
+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) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py b/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py
index 0ecdbad..0c870a7 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py
@@ -51,9 +51,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBindTable, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBindTable, cbCtx):
     if errorIndication:
         print(errorIndication)
         return
@@ -73,10 +72,11 @@ def cbFun(sendRequestHandle,
     return True # signal dispatcher to continue
 
 # Prepare initial request to be sent
-cmdgen.NextCommandGenerator().sendReq(
+cmdgen.NextCommandGenerator().sendVarBinds(
     snmpEngine,
     'my-router',
-    ( (initialOID, None), ),
+    None, '',  # contextEngineId, contextName
+    [ (initialOID, None) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/set-v1.py b/examples/v3arch/manager/cmdgen/set-v1.py
index c64b0fe..ba94a3b 100644
--- a/examples/v3arch/manager/cmdgen/set-v1.py
+++ b/examples/v3arch/manager/cmdgen/set-v1.py
@@ -47,9 +47,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     # SNMPv1 response may contain noSuchName error *and* SNMPv2c exception,
@@ -65,11 +64,12 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.SetCommandGenerator().sendReq(
+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.TimeTicks(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.TimeTicks(123)) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/set-v2c.py b/examples/v3arch/manager/cmdgen/set-v2c.py
index d004433..00db8a0 100644
--- a/examples/v3arch/manager/cmdgen/set-v2c.py
+++ b/examples/v3arch/manager/cmdgen/set-v2c.py
@@ -47,9 +47,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     elif errorStatus:
@@ -63,10 +62,11 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.SetCommandGenerator().sendReq(
+cmdgen.SetCommandGenerator().sendVarBinds(
     snmpEngine,
     'my-router',
-    ( ((1,3,6,1,2,1,1,9,1,4,1), rfc1902.TimeTicks(123)), ),
+    None, '',  # contextEngineId, contextName
+    [ ((1,3,6,1,2,1,1,9,1,4,1), rfc1902.TimeTicks(123)) ],
     cbFun
 )
 
diff --git a/examples/v3arch/manager/cmdgen/set-v3.py b/examples/v3arch/manager/cmdgen/set-v3.py
index 7764d7d..fd48438 100644
--- a/examples/v3arch/manager/cmdgen/set-v3.py
+++ b/examples/v3arch/manager/cmdgen/set-v3.py
@@ -48,9 +48,8 @@ config.addTargetAddr(
 )
 
 # Error/response receiver
-def cbFun(sendRequestHandle,
-          errorIndication, errorStatus, errorIndex,
-          varBinds, cbCtx):
+def cbFun(snmpEngine, sendRequestHandle, errorIndication,
+          errorStatus, errorIndex, varBinds, cbCtx):
     if errorIndication:
         print(errorIndication)
     elif errorStatus:
@@ -64,10 +63,11 @@ def cbFun(sendRequestHandle,
             print('%s = %s' % (oid.prettyPrint(), val.prettyPrint()))
 
 # Prepare and send a request message
-cmdgen.SetCommandGenerator().sendReq(
+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')) ],
     cbFun
 )