pysnmp.proto.api.alpha -> pysnmp.proto.omni

3 files changed, 32 insertions, 32 deletions

diff --git a/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py b/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py
index a8284457..dc1c743b 100644
--- a/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py
+++ b/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py
@@ -3,19 +3,19 @@ from pysnmp import setApiVersion
 setApiVersion('v4')
 from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher
 from pysnmp.carrier.asynsock.dgram.udp import UdpSocketTransport
-from pysnmp.proto.api import alpha
+from pysnmp.proto import omni
 from time import time
 
 # Protocol version to use
-ver = alpha.protoVersions[alpha.protoVersionId1]
+ver = omni.protoVersions[omni.protoVersionId1]
 
 # Build message
 req = ver.Message()
-req.apiAlphaSetCommunity('public')
+req.omniSetCommunity('public')
 
 # Build PDU
-req.apiAlphaSetPdu(ver.GetRequestPdu())
-req.apiAlphaGetPdu().apiAlphaSetVarBindList(
+req.omniSetPdu(ver.GetRequestPdu())
+req.omniGetPdu().omniSetVarBindList(
     ((1,3,6,1,2,1,1,1,0), ver.Null()), ((1,3,6,1,2,1,1,2,0), ver.Null())
     )
 
@@ -28,13 +28,13 @@ def cbRecvFun(tspDsp, transportDomain, transportAddress, wholeMsg, req=req):
     while wholeMsg:
         wholeMsg = rsp.berDecode(wholeMsg)
         # Make sure this is a response to this request
-        if req.apiAlphaMatch(rsp):
-            errorStatus = rsp.apiAlphaGetPdu().apiAlphaGetErrorStatus()
+        if req.omniMatch(rsp):
+            errorStatus = rsp.omniGetPdu().omniGetErrorStatus()
             if errorStatus:
                 print 'Error: ', errorStatus
             else:
-                for varBind in rsp.apiAlphaGetPdu().apiAlphaGetVarBindList():
-                    print varBind.apiAlphaGetOidVal()
+                for varBind in rsp.omniGetPdu().omniGetVarBindList():
+                    print varBind.omniGetOidVal()
     tspDsp.doDispatchFlag = 0
     return wholeMsg
 
diff --git a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py
index 2627b32e..f00b73da 100644
--- a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py
+++ b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py
@@ -3,22 +3,22 @@ from pysnmp import setApiVersion
 setApiVersion('v4')
 from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher
 from pysnmp.carrier.asynsock.dgram.udp import UdpSocketTransport
-from pysnmp.proto.api import alpha
+from pysnmp.proto import omni
 from time import time
 
 # Protocol version to use
-ver = alpha.protoVersions[alpha.protoVersionId1]
+ver = omni.protoVersions[omni.protoVersionId1]
 
 # SNMP table header
 headVars = [ ver.ObjectName((1,3,6)) ]
 
 # Create request & response message objects
 req = ver.Message(); rsp = ver.Message()
-req.apiAlphaSetCommunity('public')
+req.omniSetCommunity('public')
 
 # Create PDU, load var-binds, attach PDU to SNMP message
-req.apiAlphaSetPdu(ver.GetNextRequestPdu())
-apply(req.apiAlphaGetPdu().apiAlphaSetVarBindList,
+req.omniSetPdu(ver.GetNextRequestPdu())
+apply(req.omniGetPdu().omniSetVarBindList,
       map(lambda x, ver=ver: (x.get(), ver.Null()), headVars))
 
 def cbTimerFun(timeNow, startedAt=time()):
@@ -30,22 +30,22 @@ def cbRecvFun(tspDsp, transportDomain, transportAddress, wholeMsg,
     rsp = ver.Message()
     while wholeMsg:
         wholeMsg = rsp.berDecode(wholeMsg)
-        if req.apiAlphaMatch(rsp):
+        if req.omniMatch(rsp):
             # Check for SNMP errors reported
-            errorStatus = rsp.apiAlphaGetPdu().apiAlphaGetErrorStatus()
+            errorStatus = rsp.omniGetPdu().omniGetErrorStatus()
             if errorStatus and errorStatus != 2:
                 raise errorStatus
        
             # Build SNMP table from response
-            tableIndices = apply(req.apiAlphaGetPdu().apiAlphaGetTableIndices,
-                                 [rsp.apiAlphaGetPdu()] + headVars)
+            tableIndices = apply(req.omniGetPdu().omniGetTableIndices,
+                                 [rsp.omniGetPdu()] + headVars)
 
             # Report SNMP table
-            varBindList = rsp.apiAlphaGetPdu().apiAlphaGetVarBindList()
+            varBindList = rsp.omniGetPdu().omniGetVarBindList()
             for rowIndices in tableIndices:
                 for cellIdx in filter(lambda x: x!=-1, rowIndices):
                     print transportAddress, \
-                          varBindList[cellIdx].apiAlphaGetOidVal()
+                          varBindList[cellIdx].omniGetOidVal()
 
             # Remove completed SNMP table columns
             map(lambda idx, headVars=headVars: headVars.__delitem__(idx), \
@@ -55,12 +55,12 @@ def cbRecvFun(tspDsp, transportDomain, transportAddress, wholeMsg,
 
             # Generate request for next row
             lastRow = map(lambda cellIdx, varBindList=varBindList:
-                          varBindList[cellIdx].apiAlphaGetOidVal(),
+                          varBindList[cellIdx].omniGetOidVal(),
                           filter(lambda x: x!=-1, tableIndices[-1]))
-            apply(req.apiAlphaGetPdu().apiAlphaSetVarBindList,
+            apply(req.omniGetPdu().omniSetVarBindList,
                   map(lambda (x, y): (x.get(), None), lastRow))
         
-            req.apiAlphaGetPdu().apiAlphaGetRequestId().inc(1)
+            req.omniGetPdu().omniGetRequestId().inc(1)
             tspDsp.sendMessage(
                 req.berEncode(), transportDomain, transportAddress
                 ) 
diff --git a/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py b/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py
index 308429e1..c5af36fa 100644
--- a/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py
+++ b/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py
@@ -4,18 +4,18 @@ from pysnmp import setApiVersion
 setApiVersion('v4')
 from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher
 from pysnmp.carrier.asynsock.dgram.udp import UdpSocketTransport
-from pysnmp.proto.api import alpha
+from pysnmp.proto import omni
 
 # Protocol version to use
-ver = alpha.protoVersions[alpha.protoVersionId1]
+ver = omni.protoVersions[omni.protoVersionId1]
 
 # Build message
 req = ver.Message()
-req.apiAlphaSetCommunity('public')
+req.omniSetCommunity('public')
 
 # Build PDU
-req.apiAlphaSetPdu(ver.SetRequestPdu())
-req.apiAlphaGetPdu().apiAlphaSetVarBindList(
+req.omniSetPdu(ver.SetRequestPdu())
+req.omniGetPdu().omniSetVarBindList(
     # A list of Var-Binds to SET
     ((1,3,6,1,2,1,1,1,0), ver.Integer(123456)),
     ((1,3,6,1,2,1,1,1,0), ver.IpAddress('127.0.0.1'))
@@ -31,13 +31,13 @@ def cbRecvFun(tspDsp, transportDomain, transportAddress, wholeMsg, req=req):
         wholeMsg = rsp.berDecode(wholeMsg)
 
         # Make sure this is a response to this request
-        if req.apiAlphaMatch(rsp):
-            errorStatus = rsp.apiAlphaGetPdu().apiAlphaGetErrorStatus()
+        if req.omniMatch(rsp):
+            errorStatus = rsp.omniGetPdu().omniGetErrorStatus()
             if errorStatus:
                 print 'Error: ', errorStatus
             else:
-                for varBind in rsp.apiAlphaGetPdu().apiAlphaGetVarBindList():
-                    print varBind.apiAlphaGetOidVal()
+                for varBind in rsp.omniGetPdu().omniGetVarBindList():
+                    print varBind.omniGetOidVal()
     tspDsp.doDispatchFlag = 0
     return wholeMsg