haraldwolff
/
pysnmp-sky
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor refactoring in part of rfc4001/4002

pull/23/merge
Ilya Etingof 2017-04-17 11:27:53 +02:00
parent 928ee3c56a
commit 6bc707925c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pysnmp/smi/mibs/INET-ADDRESS-MIB.py
View File

@ -55,6 +55,8 @@ class InetAddressDNS(TextualConvention, OctetString):
displayHint = '255a'
subtypeSpec = OctetString.subtypeSpec + ValueSizeConstraint(1, 255)
# https://tools.ietf.org/html/rfc4001#section-4.1
class InetAddress(TextualConvention, OctetString):
description = "Denotes a generic Internet address. An InetAddress value is always interpreted within the context of an InetAddressType value. Every usage of the InetAddress textual convention is required to specify the InetAddressType object that provides the context. It is suggested that the InetAddressType object be logically registered before the object(s) that use the InetAddress textual convention, if they appear in the same logical row. The value of an InetAddress object must always be consistent with the value of the associated InetAddressType object. Attempts to set an InetAddress object to a value inconsistent with the associated InetAddressType must fail with an inconsistentValue error. When this textual convention is used as the syntax of an index object, there may be issues with the limit of 128 sub-identifiers specified in SMIv2, STD 58. In this case, the object definition MUST include a 'SIZE' clause to limit the number of potential instance sub-identifiers; otherwise the applicable constraints MUST be stated in the appropriate conceptual row DESCRIPTION clauses, or in the surrounding documentation if there is no single DESCRIPTION clause that is appropriate."
status = 'current'
@ -69,7 +71,7 @@ class InetAddress(TextualConvention, OctetString):
}
@classmethod
def cloneAsIndex(cls, value, impliedFlag, parentRow, parentIndices):
def cloneFromName(cls, value, impliedFlag, parentRow, parentIndices):
for parentIndex in reversed(parentIndices):
if isinstance(parentIndex, InetAddressType):
try:

4
pysnmp/smi/mibs/SNMPv2-SMI.py
View File

@ -997,8 +997,8 @@ class MibTableRow(MibTree):
if not value:
raise error.SmiError('Short OID for index %r' % (obj,))
value = tuple(value) # possible ObjectIdentifiers
if hasattr(obj, 'cloneAsIndex'):
return obj.cloneAsIndex(value, impliedFlag, parentRow=self, parentIndices=parentIndices)
if hasattr(obj, 'cloneFromName'):
return obj.cloneFromName(value, impliedFlag, parentRow=self, parentIndices=parentIndices)
baseTag = obj.getTagSet().getBaseTag()
if baseTag == self.__intBaseTag:
return obj.clone(value[0]), value[1:]