contextEngineID -> contextEngineId

6 files changed, 77 insertions, 77 deletions

diff --git a/pysnmp/entity/rfc3413/cmdgen.py b/pysnmp/entity/rfc3413/cmdgen.py
index 7a842bb..6ca0385 100644
--- a/pysnmp/entity/rfc3413/cmdgen.py
+++ b/pysnmp/entity/rfc3413/cmdgen.py
@@ -77,7 +77,7 @@ class CommandGeneratorBase:
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -92,7 +92,7 @@ class CommandGeneratorBase:
           origSecurityModel,
           origSecurityName,
           origSecurityLevel,
-          origContextEngineID,
+          origContextEngineId,
           origContextName,
           origPduVersion,
           origPdu,
@@ -120,7 +120,7 @@ class CommandGeneratorBase:
                 origSecurityModel,
                 origSecurityName,
                 origSecurityLevel,
-                origContextEngineID,
+                origContextEngineId,
                 origContextName,
                 origPduVersion,
                 origPdu,
@@ -135,7 +135,7 @@ class CommandGeneratorBase:
         if origMessageProcessingModel != messageProcessingModel or \
            origSecurityModel != securityModel or \
            origSecurityName != origSecurityName or \
-           origContextEngineID and origContextEngineID != contextEngineID or \
+           origContextEngineId and origContextEngineId != contextEngineId or \
            origContextName and origContextName != contextName or \
            origPduVersion != pduVersion:
             return
@@ -158,7 +158,7 @@ class CommandGeneratorBase:
             origSecurityModel,
             origSecurityName,
             origSecurityLevel,
-            origContextEngineID,
+            origContextEngineId,
             origContextName,
             origPduVersion,
             origPdu,
@@ -177,7 +177,7 @@ class CommandGeneratorBase:
         varBinds,
         cbFun,
         cbCtx=None,
-        contextEngineID=None,
+        contextEngineId=None,
         contextName=''
         ):
         raise error.ProtocolError('Method not implemented')
@@ -191,7 +191,7 @@ class CommandGeneratorBase:
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         reqPDU,
@@ -210,7 +210,7 @@ class CommandGeneratorBase:
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             reqPDU,
@@ -226,7 +226,7 @@ class CommandGeneratorBase:
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             reqPDU,
@@ -244,7 +244,7 @@ class GetCommandGenerator(CommandGeneratorBase):
         varBinds,
         cbFun,
         cbCtx=None,
-        contextEngineID=None,
+        contextEngineId=None,
         contextName=''
         ):
         ( transportDomain,
@@ -273,7 +273,7 @@ class GetCommandGenerator(CommandGeneratorBase):
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             reqPDU,
@@ -295,7 +295,7 @@ class GetCommandGenerator(CommandGeneratorBase):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -321,7 +321,7 @@ class SetCommandGenerator(CommandGeneratorBase):
         varBinds,
         cbFun,
         cbCtx=None,
-        contextEngineID=None,
+        contextEngineId=None,
         contextName=''
         ):
         ( transportDomain,
@@ -354,7 +354,7 @@ class SetCommandGenerator(CommandGeneratorBase):
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             reqPDU,
@@ -376,7 +376,7 @@ class SetCommandGenerator(CommandGeneratorBase):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -402,7 +402,7 @@ class NextCommandGenerator(CommandGeneratorBase):
         varBinds,
         cbFun,
         cbCtx=None,
-        contextEngineID=None,
+        contextEngineId=None,
         contextName=''
         ):
         ( transportDomain,
@@ -431,7 +431,7 @@ class NextCommandGenerator(CommandGeneratorBase):
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             reqPDU,
@@ -453,7 +453,7 @@ class NextCommandGenerator(CommandGeneratorBase):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -487,7 +487,7 @@ class NextCommandGenerator(CommandGeneratorBase):
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             PDU,
@@ -508,7 +508,7 @@ class BulkCommandGenerator(CommandGeneratorBase):
         varBinds,
         cbFun,
         cbCtx=None,
-        contextEngineID=None,
+        contextEngineId=None,
         contextName=''
         ):
         ( transportDomain,
@@ -541,7 +541,7 @@ class BulkCommandGenerator(CommandGeneratorBase):
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             reqPDU,
@@ -563,7 +563,7 @@ class BulkCommandGenerator(CommandGeneratorBase):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -597,7 +597,7 @@ class BulkCommandGenerator(CommandGeneratorBase):
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             PDU,
diff --git a/pysnmp/entity/rfc3413/cmdrsp.py b/pysnmp/entity/rfc3413/cmdrsp.py
index ec9e08e..3e54e9a 100644
--- a/pysnmp/entity/rfc3413/cmdrsp.py
+++ b/pysnmp/entity/rfc3413/cmdrsp.py
@@ -31,7 +31,7 @@ class CommandResponderBase:
           securityModel,
           securityName,
           securityLevel,
-          contextEngineID,
+          contextEngineId,
           contextName,
           pduVersion,
           PDU,
@@ -56,7 +56,7 @@ class CommandResponderBase:
                 securityModel,
                 securityName,
                 securityLevel,
-                contextEngineID,
+                contextEngineId,
                 contextName,
                 pduVersion,
                 PDU,
@@ -79,7 +79,7 @@ class CommandResponderBase:
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -111,7 +111,7 @@ class CommandResponderBase:
             securityModel,
             securityName,
             securityLevel,
-            contextEngineID,
+            contextEngineId,
             contextName,
             pduVersion,
             rspPDU,
diff --git a/pysnmp/entity/rfc3413/ntfrcv.py b/pysnmp/entity/rfc3413/ntfrcv.py
index f8b256b..cf6ef00 100644
--- a/pysnmp/entity/rfc3413/ntfrcv.py
+++ b/pysnmp/entity/rfc3413/ntfrcv.py
@@ -29,7 +29,7 @@ class NotificationReceiver:
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         PDU,
@@ -65,7 +65,7 @@ class NotificationReceiver:
                     securityModel,
                     securityName,
                     securityLevel,
-                    contextEngineID,
+                    contextEngineId,
                     contextName,
                     pduVersion,
                     rspPDU,
@@ -83,5 +83,5 @@ class NotificationReceiver:
             raise error.ProtocolError('Unexpected PDU class %s' % PDU.tagSet)
 
         self.__cbFun(
-            self.snmpEngine, contextEngineID, contextName, varBinds, cbCtx
+            snmpEngine, contextEngineId, contextName, varBinds, self.__cbCtx
             )
diff --git a/pysnmp/proto/mpmod/base.py b/pysnmp/proto/mpmod/base.py
index 30923b3..d8d5fd7 100644
--- a/pysnmp/proto/mpmod/base.py
+++ b/pysnmp/proto/mpmod/base.py
@@ -21,7 +21,7 @@ class AbstractMessageProcessingModel:
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         pdu,
@@ -36,7 +36,7 @@ class AbstractMessageProcessingModel:
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         pdu,
diff --git a/pysnmp/proto/mpmod/rfc2576.py b/pysnmp/proto/mpmod/rfc2576.py
index b9d1b6e..cc8db55 100644
--- a/pysnmp/proto/mpmod/rfc2576.py
+++ b/pysnmp/proto/mpmod/rfc2576.py
@@ -24,7 +24,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         pdu,
@@ -43,16 +43,16 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
             
         # rfc3412: 7.1.4
         # Since there's no SNMP engine identification in v1/2c,
-        # set destination contextEngineID to ours
-        if not contextEngineID:
-            contextEngineID = snmpEngineID
+        # set destination contextEngineId to ours
+        if not contextEngineId:
+            contextEngineId = snmpEngineID
 
         # rfc3412: 7.1.5
         if not contextName:
             contextName = ''
 
         # rfc3412: 7.1.6
-        scopedPDU = ( contextEngineID, contextName, pdu )
+        scopedPDU = ( contextEngineId, contextName, pdu )
 
         msg = self._snmpMsgSpec.clone()
         msg.setComponentByPosition(0, self.messageProcessingModelID)
@@ -97,7 +97,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
                 securityModel=securityModel,
                 securityName=securityName,
                 securityLevel=securityLevel,
-                contextEngineID=contextEngineID,
+                contextEngineId=contextEngineId,
                 contextName=contextName,
                 transportDomain=transportDomain,
                 transportAddress=transportAddress
@@ -113,7 +113,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         pdu,
@@ -127,7 +127,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
         # rfc3412: 7.1.2.b
         cachedParams = self._cachePopByStateRef(stateReference)
         msgID = cachedParams['msgID']
-        contextEngineID = cachedParams['contextEngineID']
+        contextEngineId = cachedParams['contextEngineId']
         contextName = cachedParams['contextName']
         securityModel = cachedParams['securityModel']
         securityName = cachedParams['securityName']
@@ -148,16 +148,16 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
 
         # rfc3412: 7.1.4
         # Since there's no SNMP engine identification in v1/2c,
-        # set destination contextEngineID to ours
-        if not contextEngineID:
-            contextEngineID = snmpEngineID
+        # set destination contextEngineId to ours
+        if not contextEngineId:
+            contextEngineId = snmpEngineID
 
         # rfc3412: 7.1.5
         if not contextName:
             contextName = ''
 
         # rfc3412: 7.1.6
-        scopedPDU = ( contextEngineID, contextName, pdu )
+        scopedPDU = ( contextEngineId, contextName, pdu )
 
         msg = self._snmpMsgSpec.clone()
         msg.setComponentByPosition(0, messageProcessingModel)
@@ -259,7 +259,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
         # rfc3412: 7.2.6a --> noop
 
         # rfc3412: 7.2.7
-        contextEngineID, contextName, pdu = scopedPDU
+        contextEngineId, contextName, pdu = scopedPDU
 
         # rfc2576: 5.2.1
         pduVersion = msgVersion
@@ -297,7 +297,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
             if securityModel != cachedReqParams['securityModel'] or \
                securityName != cachedReqParams['securityName'] or \
                securityLevel != cachedReqParams['securityLevel'] or \
-               contextEngineID != cachedReqParams['contextEngineID'] or \
+               contextEngineId != cachedReqParams['contextEngineId'] or \
                contextName != cachedReqParams['contextName']:
                 raise error.StatusInformation(
                     errorIndication = 'dataMismatch'
@@ -310,7 +310,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
                      securityModel,
                      securityName,
                      securityLevel,
-                     contextEngineID,
+                     contextEngineId,
                      contextName,
                      pduVersion,
                      pdu,
@@ -335,7 +335,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
                 stateReference,
                 msgVersion=messageProcessingModel,
                 msgID=msgID,
-                contextEngineID=contextEngineID,
+                contextEngineId=contextEngineId,
                 contextName=contextName,
                 securityModel=securityModel,
                 securityName=securityName,
@@ -352,7 +352,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
                      securityModel,
                      securityName,
                      securityLevel,
-                     contextEngineID,
+                     contextEngineId,
                      contextName,
                      pduVersion,
                      pdu,
@@ -368,7 +368,7 @@ class SnmpV1MessageProcessingModel(AbstractMessageProcessingModel):
                      securityModel,
                      securityName,
                      securityLevel,
-                     contextEngineID,
+                     contextEngineId,
                      contextName,
                      pduVersion,
                      pdu,
diff --git a/pysnmp/proto/mpmod/rfc3412.py b/pysnmp/proto/mpmod/rfc3412.py
index 5137428..ea9ae4d 100644
--- a/pysnmp/proto/mpmod/rfc3412.py
+++ b/pysnmp/proto/mpmod/rfc3412.py
@@ -13,7 +13,7 @@ pMod = api.protoModules[api.protoVersion2c]
 
 class ScopedPDU(univ.Sequence):
     componentType = namedtype.NamedTypes(
-        namedtype.NamedType('contextEngineID', univ.OctetString()),
+        namedtype.NamedType('contextEngineId', univ.OctetString()),
         namedtype.NamedType('contextName', univ.OctetString()),
         namedtype.NamedType('data', rfc1905.PDUs())
         )
@@ -67,7 +67,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         pdu,
@@ -85,11 +85,11 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
             )
 
         # 7.1.4
-        if contextEngineID is None:
+        if contextEngineId is None:
             if peerSnmpEngineData is None:
-                contextEngineID = snmpEngineID
+                contextEngineId = snmpEngineID
             else:
-                contextEngineID = peerSnmpEngineData['contextEngineID']
+                contextEngineId = peerSnmpEngineData['contextEngineId']
 
         # 7.1.5
         if not contextName:
@@ -97,7 +97,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
 
         # 7.1.6
         scopedPDU = ScopedPDU()
-        scopedPDU.setComponentByPosition(0, contextEngineID)
+        scopedPDU.setComponentByPosition(0, contextEngineId)
         scopedPDU.setComponentByPosition(1, contextName)
         scopedPDU.setComponentByPosition(2)
         scopedPDU.getComponentByPosition(2).setComponentByType(
@@ -197,7 +197,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                 securityModel=securityModel,
                 securityName=securityName,
                 securityLevel=securityLevel,
-                contextEngineID=contextEngineID,
+                contextEngineId=contextEngineId,
                 contextName=contextName,
                 transportDomain=transportDomain,
                 transportAddress=transportAddress
@@ -214,7 +214,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
         securityModel,
         securityName,
         securityLevel,
-        contextEngineID,
+        contextEngineId,
         contextName,
         pduVersion,
         pdu,
@@ -228,7 +228,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
         # 7.1.2.b
         cachedParams = self._cachePopByStateRef(stateReference)
         msgID = cachedParams['msgID']
-        contextEngineID = cachedParams['contextEngineID']
+        contextEngineId = cachedParams['contextEngineId']
         contextName = cachedParams['contextName']
         securityModel = cachedParams['securityModel']
         securityName = cachedParams['securityName']
@@ -276,10 +276,10 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                 securityLevel = 1
 
             # 7.1.3d.2
-            if statusInformation.has_key('contextEngineID'):
-                contextEngineID = statusInformation['contextEngineID']
+            if statusInformation.has_key('contextEngineId'):
+                contextEngineId = statusInformation['contextEngineId']
             else:
-                contextEngineID = snmpEngineID
+                contextEngineId = snmpEngineID
 
             # 7.1.3d.3
             if statusInformation.has_key('contextName'):
@@ -291,8 +291,8 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
             pdu = reportPDU
 
         # 7.1.4
-        if not contextEngineID:
-            contextEngineID = snmpEngineID  # XXX impl-dep manner
+        if not contextEngineId:
+            contextEngineId = snmpEngineID  # XXX impl-dep manner
 
         # 7.1.5
         if not contextName:
@@ -300,7 +300,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
 
         # 7.1.6
         scopedPDU = ScopedPDU()
-        scopedPDU.setComponentByPosition(0, contextEngineID)
+        scopedPDU.setComponentByPosition(0, contextEngineId)
         scopedPDU.setComponentByPosition(1, contextName)
         scopedPDU.setComponentByPosition(2)
         scopedPDU.getComponentByPosition(2).setComponentByType(
@@ -454,7 +454,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                     securityStateReference = statusInformation[
                         'securityStateReference'
                         ]
-                    contextEngineID = statusInformation['contextEngineID']
+                    contextEngineId = statusInformation['contextEngineId']
                     contextName = statusInformation['contextName']
                     scopedPDU = statusInformation.get('scopedPDU')
                     if scopedPDU is not None:
@@ -472,7 +472,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                         stateReference,
                         msgVersion=messageProcessingModel,
                         msgID=msgID,
-                        contextEngineID=contextEngineID,
+                        contextEngineId=contextEngineId,
                         contextName=contextName,
                         securityModel=securityModel,
                         securityName=securityName,
@@ -493,7 +493,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                             securityModel,
                             securityName,
                             securityLevel,
-                            contextEngineID,
+                            contextEngineId,
                             contextName,
                             1,
                             pdu,
@@ -510,10 +510,10 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
             # Sniff for engineIDs
             k = (transportDomain, transportAddress)
             if not self.__engineIDs.has_key(k):
-                contextEngineID, contextName, pdu = scopedPDU
+                contextEngineId, contextName, pdu = scopedPDU
                 self.__engineIDs[k] = {
                     'securityEngineID': securityEngineID,
-                    'contextEngineID': contextEngineID,
+                    'contextEngineId': contextEngineId,
                     'contextName': contextName
                     }
 
@@ -523,7 +523,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
         snmpEngineID = snmpEngineID.syntax
 
         # 7.2.7 XXX PDU would be parsed here?
-        contextEngineID, contextName, pdu = scopedPDU
+        contextEngineId, contextName, pdu = scopedPDU
         pdu = pdu.getComponent() # PDUs
             
         # 7.2.8
@@ -582,7 +582,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
             if securityModel != cachedReqParams['securityModel'] or \
                securityName != cachedReqParams['securityName'] or \
                securityLevel != cachedReqParams['securityLevel'] or \
-               contextEngineID != cachedReqParams['contextEngineID'] or \
+               contextEngineId != cachedReqParams['contextEngineId'] or \
                contextName != cachedReqParams['contextName']:
                 raise error.StatusInformation(
                     errorIndication = 'dataMispatch'
@@ -596,7 +596,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                      securityModel,
                      securityName,
                      securityLevel,
-                     contextEngineID,
+                     contextEngineId,
                      contextName,
                      pduVersion,
                      pdu,
@@ -621,7 +621,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                 stateReference,
                 msgVersion=messageProcessingModel,
                 msgID=msgID,
-                contextEngineID=contextEngineID,
+                contextEngineId=contextEngineId,
                 contextName=contextName,
                 securityModel=securityModel,
                 securityName=securityName,
@@ -639,7 +639,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                      securityModel,
                      securityName,
                      securityLevel,
-                     contextEngineID,
+                     contextEngineId,
                      contextName,
                      pduVersion,
                      pdu,
@@ -655,7 +655,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                      securityModel,
                      securityName,
                      securityLevel,
-                     contextEngineID,
+                     contextEngineId,
                      contextName,
                      pduVersion,
                      pdu,
@@ -663,7 +663,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                      sendPduHandle,
                      maxSizeResponseScopedPDU,
                      statusInformation,
-                     stateReference )
+                     None )
 
         raise error.StatusInformation(
             errorIndication = 'unknownPDU'