summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pysnmp/carrier/asyncore/dgram/base.py2
-rw-r--r--pysnmp/entity/config.py38
-rw-r--r--pysnmp/hlapi/asyncore/cmdgen.py3
-rw-r--r--pysnmp/hlapi/asyncore/sync/cmdgen.py13
-rw-r--r--pysnmp/hlapi/asyncore/sync/compat/cmdgen.py14
-rw-r--r--pysnmp/hlapi/asyncore/sync/ntforg.py6
-rw-r--r--pysnmp/hlapi/auth.py2
-rw-r--r--pysnmp/smi/rfc1902.py7
8 files changed, 44 insertions, 41 deletions
diff --git a/pysnmp/carrier/asyncore/dgram/base.py b/pysnmp/carrier/asyncore/dgram/base.py
index 7f9578e0..537a281d 100644
--- a/pysnmp/carrier/asyncore/dgram/base.py
+++ b/pysnmp/carrier/asyncore/dgram/base.py
@@ -38,7 +38,7 @@ class DgramSocketTransport(AbstractSocketTransport):
raise error.CarrierError('bind() for %s failed: %s' % (iface is None and "<all local>" or iface, sys.exc_info()[1]))
return self
- def openServerMode(self, iface):
+ def openServerMode(self, iface=None):
try:
self.socket.bind(iface)
except socket.error:
diff --git a/pysnmp/entity/config.py b/pysnmp/entity/config.py
index 59ac864e..8be32e4f 100644
--- a/pysnmp/entity/config.py
+++ b/pysnmp/entity/config.py
@@ -271,14 +271,14 @@ def addTargetAddr(snmpEngine, addrName, transportDomain, transportAddress,
)
snmpEngine.msgAndPduDsp.mibInstrumController.writeVars(
((snmpTargetAddrEntry.name + (9,) + tblIdx, 'createAndGo'),
- (snmpTargetAddrEntry.name + (1,) + tblIdx, addrName),
- (snmpTargetAddrEntry.name + (2,) + tblIdx, transportDomain),
- (snmpTargetAddrEntry.name + (3,) + tblIdx, transportAddress),
- (snmpTargetAddrEntry.name + (4,) + tblIdx, timeout),
- (snmpTargetAddrEntry.name + (5,) + tblIdx, retryCount),
- (snmpTargetAddrEntry.name + (6,) + tblIdx, tagList),
- (snmpTargetAddrEntry.name + (7,) + tblIdx, params),
- (snmpSourceAddrEntry.name + (1,) + tblIdx, sourceAddress),)
+ (snmpTargetAddrEntry.name + (1,) + tblIdx, addrName),
+ (snmpTargetAddrEntry.name + (2,) + tblIdx, transportDomain),
+ (snmpTargetAddrEntry.name + (3,) + tblIdx, transportAddress),
+ (snmpTargetAddrEntry.name + (4,) + tblIdx, timeout),
+ (snmpTargetAddrEntry.name + (5,) + tblIdx, retryCount),
+ (snmpTargetAddrEntry.name + (6,) + tblIdx, tagList),
+ (snmpTargetAddrEntry.name + (7,) + tblIdx, params),
+ (snmpSourceAddrEntry.name + (1,) + tblIdx, sourceAddress))
)
def delTargetAddr(snmpEngine, addrName):
@@ -367,9 +367,9 @@ def addVacmGroup(snmpEngine, groupName, securityModel, securityName):
)
snmpEngine.msgAndPduDsp.mibInstrumController.writeVars(
((vacmSecurityToGroupEntry.name + (5,) + tblIdx, 'createAndGo'),
- (vacmSecurityToGroupEntry.name + (1,) + tblIdx, securityModel),
- (vacmSecurityToGroupEntry.name + (2,) + tblIdx, securityName),
- (vacmSecurityToGroupEntry.name + (3,) + tblIdx, groupName),)
+ (vacmSecurityToGroupEntry.name + (1,) + tblIdx, securityModel),
+ (vacmSecurityToGroupEntry.name + (2,) + tblIdx, securityName),
+ (vacmSecurityToGroupEntry.name + (3,) + tblIdx, groupName),)
)
def delVacmGroup(snmpEngine, securityModel, securityName):
@@ -400,13 +400,13 @@ def addVacmAccess(snmpEngine, groupName, contextName, securityModel,
)
snmpEngine.msgAndPduDsp.mibInstrumController.writeVars(
((vacmAccessEntry.name + (9,) + tblIdx, 'createAndGo'),
- (vacmAccessEntry.name + (1,) + tblIdx, contextName),
- (vacmAccessEntry.name + (2,) + tblIdx, securityModel),
- (vacmAccessEntry.name + (3,) + tblIdx, securityLevel),
- (vacmAccessEntry.name + (4,) + tblIdx, prefix),
- (vacmAccessEntry.name + (5,) + tblIdx, readView),
- (vacmAccessEntry.name + (6,) + tblIdx, writeView),
- (vacmAccessEntry.name + (7,) + tblIdx, notifyView),)
+ (vacmAccessEntry.name + (1,) + tblIdx, contextName),
+ (vacmAccessEntry.name + (2,) + tblIdx, securityModel),
+ (vacmAccessEntry.name + (3,) + tblIdx, securityLevel),
+ (vacmAccessEntry.name + (4,) + tblIdx, prefix),
+ (vacmAccessEntry.name + (5,) + tblIdx, readView),
+ (vacmAccessEntry.name + (6,) + tblIdx, writeView),
+ (vacmAccessEntry.name + (7,) + tblIdx, notifyView),)
)
def delVacmAccess(snmpEngine, groupName, contextName, securityModel,
@@ -622,7 +622,7 @@ def setInitialVacmParameters(snmpEngine):
# rfc3415: A.1.5 (semi-secure)
addVacmView(snmpEngine, "internet",
- "included", (1, 3, 6, 1), "")
+ "included", (1, 3, 6, 1), "")
addVacmView(snmpEngine, "restricted",
"included", (1, 3, 6, 1, 2, 1, 1), "")
addVacmView(snmpEngine, "restricted",
diff --git a/pysnmp/hlapi/asyncore/cmdgen.py b/pysnmp/hlapi/asyncore/cmdgen.py
index ed1c7830..4d7afbda 100644
--- a/pysnmp/hlapi/asyncore/cmdgen.py
+++ b/pysnmp/hlapi/asyncore/cmdgen.py
@@ -446,8 +446,7 @@ def bulkCmd(snmpEngine, authData, transportTarget, contextData,
varBindTable, cbCtx):
lookupMib, cbFun, cbCtx = cbCtx
return cbFun(snmpEngine, sendRequestHandle, errorIndication,
- errorStatus, errorIndex,
- [vbProcessor.unmakeVarBinds(snmpEngine, varBindTableRow, lookupMib) for varBindTableRow in varBindTable], cbCtx)
+ errorStatus, errorIndex, [vbProcessor.unmakeVarBinds(snmpEngine, varBindTableRow, lookupMib) for varBindTableRow in varBindTable], cbCtx)
addrName, paramsName = lcd.configure(snmpEngine, authData, transportTarget)
return cmdgen.BulkCommandGenerator().sendVarBinds(
diff --git a/pysnmp/hlapi/asyncore/sync/cmdgen.py b/pysnmp/hlapi/asyncore/sync/cmdgen.py
index 25a63c0e..1a4f7dd4 100644
--- a/pysnmp/hlapi/asyncore/sync/cmdgen.py
+++ b/pysnmp/hlapi/asyncore/sync/cmdgen.py
@@ -89,9 +89,9 @@ def getCmd(snmpEngine, authData, transportTarget, contextData,
while True:
if varBinds:
cmdgen.getCmd(snmpEngine, authData, transportTarget,
- contextData, *varBinds,
- **dict(cbFun=cbFun, cbCtx=cbCtx,
- lookupMib=options.get('lookupMib', True)))
+ contextData, *varBinds,
+ **dict(cbFun=cbFun, cbCtx=cbCtx,
+ lookupMib=options.get('lookupMib', True)))
snmpEngine.transportDispatcher.runDispatcher()
@@ -192,10 +192,9 @@ def setCmd(snmpEngine, authData, transportTarget, contextData,
while True:
if varBinds:
cmdgen.setCmd(snmpEngine, authData, transportTarget,
- contextData, *varBinds,
- **dict(cbFun=cbFun, cbCtx=cbCtx,
- lookupMib=options.get('lookupMib', True))
- )
+ contextData, *varBinds,
+ **dict(cbFun=cbFun, cbCtx=cbCtx,
+ lookupMib=options.get('lookupMib', True)))
snmpEngine.transportDispatcher.runDispatcher()
diff --git a/pysnmp/hlapi/asyncore/sync/compat/cmdgen.py b/pysnmp/hlapi/asyncore/sync/compat/cmdgen.py
index 879eeac1..57923c40 100644
--- a/pysnmp/hlapi/asyncore/sync/compat/cmdgen.py
+++ b/pysnmp/hlapi/asyncore/sync/compat/cmdgen.py
@@ -26,9 +26,10 @@ def getCmd(snmpEngine, authData, transportTarget, contextData,
cbCtx = {}
if varBinds:
- cmdgen.getCmd(snmpEngine, authData, transportTarget, contextData,
- *varBinds, **dict(cbFun=cbFun, cbCtx=cbCtx,
- lookupMib=options.get('lookupMib', True)))
+ cmdgen.getCmd(snmpEngine, authData, transportTarget,
+ contextData, *varBinds,
+ **dict(cbFun=cbFun, cbCtx=cbCtx,
+ lookupMib=options.get('lookupMib', True)))
snmpEngine.transportDispatcher.runDispatcher()
@@ -56,9 +57,10 @@ def setCmd(snmpEngine, authData, transportTarget, contextData,
cbCtx = {}
while True:
- cmdgen.setCmd(snmpEngine, authData, transportTarget, contextData,
- *varBinds, **dict(cbFun=cbFun, cbCtx=cbCtx,
- lookupMib=options.get('lookupMib', True)))
+ cmdgen.setCmd(snmpEngine, authData, transportTarget,
+ contextData, *varBinds,
+ **dict(cbFun=cbFun, cbCtx=cbCtx,
+ lookupMib=options.get('lookupMib', True)))
snmpEngine.transportDispatcher.runDispatcher()
diff --git a/pysnmp/hlapi/asyncore/sync/ntforg.py b/pysnmp/hlapi/asyncore/sync/ntforg.py
index 1f16e7a4..2629c673 100644
--- a/pysnmp/hlapi/asyncore/sync/ntforg.py
+++ b/pysnmp/hlapi/asyncore/sync/ntforg.py
@@ -96,9 +96,9 @@ def sendNotification(snmpEngine, authData, transportTarget, contextData,
while True:
if varBinds:
ntforg.sendNotification(snmpEngine, authData, transportTarget,
- contextData, notifyType, varBinds,
- cbFun, cbCtx, lookupMib=options.get('lookupMib', True)
- )
+ contextData, notifyType, varBinds,
+ cbFun, cbCtx,
+ lookupMib=options.get('lookupMib', True))
snmpEngine.transportDispatcher.runDispatcher()
diff --git a/pysnmp/hlapi/auth.py b/pysnmp/hlapi/auth.py
index 246c445d..5990c8c2 100644
--- a/pysnmp/hlapi/auth.py
+++ b/pysnmp/hlapi/auth.py
@@ -77,7 +77,7 @@ class CommunityData:
if communityIndex is None:
self.communityIndex = self.securityName = 's%s' % hash(
(self.communityName, self.mpModel, self.contextEngineId,
- self.contextName, self.tag)
+ self.contextName, self.tag)
)
else:
self.communityIndex = communityIndex
diff --git a/pysnmp/smi/rfc1902.py b/pysnmp/smi/rfc1902.py
index cf8e5a50..5482c67f 100644
--- a/pysnmp/smi/rfc1902.py
+++ b/pysnmp/smi/rfc1902.py
@@ -80,6 +80,9 @@ class ObjectIdentity:
self.__mibSourcesToAdd = self.__modNamesToLoad = None
self.__asn1SourcesToAdd = self.__asn1SourcesOptions = None
self.__state = self.stDirty
+ self.__indices = self.__oid = self.__label = ()
+ self.__modName = self.__symName = ''
+ self.__mibNode = None
def getMibSymbol(self):
"""Returns MIB variable symbolic identification.
@@ -923,11 +926,11 @@ class NotificationType:
self.__objectIdentity).resolveWithMib(mibViewController)
)
- NotificationType, = mibViewController.mibBuilder.importSymbols('SNMPv2-SMI', 'NotificationType')
+ SmiNotificationType, = mibViewController.mibBuilder.importSymbols('SNMPv2-SMI', 'NotificationType')
mibNode = self.__objectIdentity.getMibNode()
- if isinstance(mibNode, NotificationType):
+ if isinstance(mibNode, SmiNotificationType):
for notificationObject in mibNode.getObjects():
objectIdentity = ObjectIdentity(*notificationObject+self.__instanceIndex).resolveWithMib(mibViewController)
self.__varBinds.append(
View Lorry Controller Status