From 0eb1d3fb25425277de9826466bdbfc9baf27a8e5 Mon Sep 17 00:00:00 2001
From: elie <elie>
Date: Wed, 12 Oct 2005 16:09:07 +0000
Subject: contextEngineID->contextEngineId

---
 pysnmp/proto/secmod/rfc2576.py         | 24 ++++++++++++------------
 pysnmp/proto/secmod/rfc3414/service.py | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pysnmp/proto/secmod/rfc2576.py b/pysnmp/proto/secmod/rfc2576.py
index 240237f..19c5144 100644
--- a/pysnmp/proto/secmod/rfc2576.py
+++ b/pysnmp/proto/secmod/rfc2576.py
@@ -6,7 +6,7 @@ from pysnmp.proto import error
 
 class SnmpV1SecurityModel(base.AbstractSecurityModel):
     securityModelID = 1
-    # According to rfc2576, community name <-> contextEngineID/contextName
+    # According to rfc2576, community name <-> contextEngineId/contextName
     # mapping is up to MP module for notifications but belongs to secmod
     # responsibility for other PDU types. Since I do not yet understand
     # the reason for this de-coupling, I've moved this code from MP-scope
@@ -19,18 +19,18 @@ class SnmpV1SecurityModel(base.AbstractSecurityModel):
         globalData,
         maxMessageSize,
         securityModel,
-        securityEngineID,
+        securityEngineId,
         securityName,
         securityLevel,
         scopedPDU
         ):
         msg, = globalData
-        contextEngineID, contextName, pdu = scopedPDU
+        contextEngineId, contextName, pdu = scopedPDU
         
         # rfc2576: 5.2.3
         ( snmpCommunityName,
           snmpCommunitySecurityName, 
-          snmpCommunityContextEngineID, 
+          snmpCommunityContextEngineId, 
           snmpCommunityContextName ) = snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.importSymbols(
             'SNMP-COMMUNITY-MIB',
             'snmpCommunityName',
@@ -49,10 +49,10 @@ class SnmpV1SecurityModel(base.AbstractSecurityModel):
             if mibNodeIdx.syntax != securityName:
                 continue
             instId = mibNodeIdx.name[len(snmpCommunitySecurityName.name):]
-            mibNode = snmpCommunityContextEngineID.getNode(
-                snmpCommunityContextEngineID.name + instId
+            mibNode = snmpCommunityContextEngineId.getNode(
+                snmpCommunityContextEngineId.name + instId
                 )
-            if mibNode.syntax != contextEngineID:
+            if mibNode.syntax != contextEngineId:
                 continue
             mibNode = snmpCommunityContextName.getNode(
                 snmpCommunityContextName.name + instId
@@ -89,7 +89,7 @@ class SnmpV1SecurityModel(base.AbstractSecurityModel):
         ):
         # rfc2576: 5.2.2
         msg, = globalData
-        contextEngineID, contextName, pdu = scopedPDU
+        contextEngineId, contextName, pdu = scopedPDU
         cachedSecurityData = self._cachePop(securityStateReference)
         communityName = cachedSecurityData['communityName']
         msg.setComponentByPosition(1, communityName)
@@ -114,7 +114,7 @@ class SnmpV1SecurityModel(base.AbstractSecurityModel):
         ( communityName, srcTransport, destTransport ) = securityParameters
         ( snmpCommunityName,
           snmpCommunitySecurityName,
-          snmpCommunityContextEngineID,
+          snmpCommunityContextEngineId,
           snmpCommunityContextName
           ) = snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.importSymbols(
             'SNMP-COMMUNITY-MIB',
@@ -149,8 +149,8 @@ class SnmpV1SecurityModel(base.AbstractSecurityModel):
         securityName = snmpCommunitySecurityName.getNode(
             snmpCommunitySecurityName.name + instId
             )
-        contextEngineID = snmpCommunityContextEngineID.getNode(
-            snmpCommunityContextEngineID.name + instId
+        contextEngineId = snmpCommunityContextEngineId.getNode(
+            snmpCommunityContextEngineId.name + instId
             )
         contextName = snmpCommunityContextName.getNode(
             snmpCommunityContextName.name + instId
@@ -166,7 +166,7 @@ class SnmpV1SecurityModel(base.AbstractSecurityModel):
         securityEngineID = snmpEngineID.syntax
         securityName = securityName.syntax
         scopedPDU = (
-            contextEngineID.syntax, contextName.syntax,
+            contextEngineId.syntax, contextName.syntax,
             msg.getComponentByPosition(2).getComponent()
             )
         maxSizeResponseScopedPDU = maxMessageSize - 128
diff --git a/pysnmp/proto/secmod/rfc3414/service.py b/pysnmp/proto/secmod/rfc3414/service.py
index 354bdd7..a59df12 100644
--- a/pysnmp/proto/secmod/rfc3414/service.py
+++ b/pysnmp/proto/secmod/rfc3414/service.py
@@ -447,7 +447,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
             )
 
         # Used for error reporting
-        contextEngineID = snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.importSymbols('SNMP-FRAMEWORK-MIB', 'snmpEngineID')[0].syntax
+        contextEngineId = snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.importSymbols('SNMP-FRAMEWORK-MIB', 'snmpEngineID')[0].syntax
         contextName = ''
 
         # 3.2.3
@@ -471,7 +471,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                         val=usmStatsUnknownEngineIDs.syntax,
                         securityStateReference=securityStateReference,
                         securityLevel=securityLevel,
-                        contextEngineID=contextEngineID,
+                        contextEngineId=contextEngineId,
                         contextName=contextName,
                         maxSizeResponseScopedPDU=maxSizeResponseScopedPDU
                         )
@@ -521,7 +521,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                             val = usmStatsUnknownUserNames.syntax,
                             securityStateReference=securityStateReference,
                             securityLevel=securityLevel,
-                            contextEngineID=contextEngineID,
+                            contextEngineId=contextEngineId,
                             contextName=contextName,
                             maxSizeResponseScopedPDU=maxSizeResponseScopedPDU
                             )
@@ -548,7 +548,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                 val=usmStatsUnknownEngineIDs.syntax,
                 securityStateReference=securityStateReference,
                 securityLevel=securityLevel,
-                contextEngineID=contextEngineID,
+                contextEngineId=contextEngineId,
                 contextName=contextName,
                 maxSizeResponseScopedPDU=maxSizeResponseScopedPDU
                 )
@@ -575,7 +575,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                     val=usmStatsWrongDigests.syntax,
                     securityStateReference=securityStateReference,
                     securityLevel=securityLevel,
-                    contextEngineID=contextEngineID,
+                    contextEngineId=contextEngineId,
                     contextName=contextName,
                     maxSizeResponseScopedPDU=maxSizeResponseScopedPDU
                     )
@@ -607,7 +607,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                         val=usmStatsNotInTimeWindows.syntax,
                         securityStateReference=securityStateReference,
                         securityLevel=2,
-                        contextEngineID=contextEngineID,
+                        contextEngineId=contextEngineId,
                         contextName=contextName,
                         maxSizeResponseScopedPDU=maxSizeResponseScopedPDU
                         )
@@ -661,7 +661,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                     val=usmStatsDecryptionErrors.syntax,
                     securityStateReference=securityStateReference,
                     securityLevel=securityLevel,
-                    contextEngineID=contextEngineID,
+                    contextEngineId=contextEngineId,
                     contextName=contextName,
                     maxSizeResponseScopedPDU=maxSizeResponseScopedPDU
                     )
@@ -701,7 +701,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                 securityStateReference=securityStateReference,
                 securityEngineID=securityEngineID,
                 securityLevel=securityLevel,
-                contextEngineID=contextEngineID,
+                contextEngineId=contextEngineId,
                 contextName=contextName,
                 maxSizeResponseScopedPDU=maxSizeResponseScopedPDU,
                 PDU=scopedPDU
-- 
cgit v1.2.1