diff options
author | Ilya Etingof <etingof@gmail.com> | 2017-11-11 13:05:47 +0100 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2017-11-11 13:05:47 +0100 |
commit | bb48699267a8fc1acffe9e801f8458e7afb53785 (patch) | |
tree | 6750681bae4241b6f8b6ccc5bd450456c2748b71 | |
parent | 0645fc61512d84c097b118bfb23a3a65f98eda4f (diff) | |
download | pysnmp-git-bb48699267a8fc1acffe9e801f8458e7afb53785.tar.gz |
missing get/setReference() added to SNMPv2-SMI::NotificationType
-rw-r--r-- | CHANGES.txt | 2 | ||||
-rw-r--r-- | pysnmp/smi/mibs/SNMPv2-SMI.py | 37 |
2 files changed, 31 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 6a60a939..463d20e7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,8 @@ Revision 4.4.2, released 2017-11-XX - Added support for some more missing fields of SMIv2 MACRO types - Example scripts rearranged in a way that IPv6 requirement is clearly encoded in the script's name +- Fixed SNMPv2-SMI.NotificationType to expose .set/getReference() + instead of .set/getRevision() which - Fixed non-implied-OID encoding in SNMP table indices - Fixed inconsistent SNMPv3 discovery and retrying algorithm diff --git a/pysnmp/smi/mibs/SNMPv2-SMI.py b/pysnmp/smi/mibs/SNMPv2-SMI.py index da66164e..a2ccb49f 100644 --- a/pysnmp/smi/mibs/SNMPv2-SMI.py +++ b/pysnmp/smi/mibs/SNMPv2-SMI.py @@ -80,6 +80,7 @@ class ModuleIdentity(MibNode): contactInfo = '' description = '' revisions = () + revisionsDescriptions = () def getStatus(self): return self.status @@ -123,6 +124,13 @@ class ModuleIdentity(MibNode): self.revisions = args return self + def getRevisionsDescriptions(self): + return self.revisionsDescriptions + + def setRevisionsDescriptions(self, args): + self.revisionsDescriptions = args + return self + def asn1Print(self): return """\ MODULE-IDENTITY @@ -134,7 +142,7 @@ MODULE-IDENTITY self.getOrganization(), self.getContactInfo(), self.getDescription(), - ''.join(["REVISION \"%s\"\n" % x for x in self.getRevisions()])) + ''.join(['REVISION "%s"\n' % x for x in self.getRevisions()])) class ObjectIdentity(MibNode): @@ -168,9 +176,10 @@ class ObjectIdentity(MibNode): OBJECT-IDENTITY STATUS %s DESCRIPTION "%s" - REFERENCE "%s" """ % (self.getStatus(), - self.getDescription(), - self.getReference()) + REFERENCE "%s" +""" % (self.getStatus(), + self.getDescription(), + self.getReference()) # definition for objects @@ -179,6 +188,8 @@ class NotificationType(MibNode): objects = () status = 'current' description = '' + reference = '' + # retained for compatibility revisions = () def getObjects(self): @@ -205,11 +216,20 @@ class NotificationType(MibNode): self.description = v return self + def getReference(self): + return self.reference + + def setReference(self, v): + self.reference = v + return self + + # This should not be here. Retained for compatibility. + def getRevisions(self): return self.revisions - def setRevisions(self, args): - self.revisions = args + def setRevisions(self, v): + self.revisions = v return self def asn1Print(self): @@ -218,10 +238,11 @@ NOTIFICATION-TYPE OBJECTS { %s } STATUS %s DESCRIPTION "%s" - %s""" % (', '.join([x for x in self.getObjects()]), + REFERENCE "%s" +""" % (', '.join([x for x in self.getObjects()]), self.getStatus(), self.getDescription(), - ''.join(["REVISION \"%s\"\n" % x for x in self.getRevisions()])) + self.getReference()) class MibIdentifier(MibNode): |