diff options
| -rw-r--r-- | pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py | 8 | ||||
| -rw-r--r-- | pysnmp/smi/mibs/SNMP-TARGET-MIB.py | 4 | ||||
| -rw-r--r-- | pysnmp/smi/mibs/SNMPv2-TC.py | 24 | ||||
| -rw-r--r-- | pysnmp/smi/mibs/SNMPv2-TM.py | 2 | ||||
| -rw-r--r-- | pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py | 12 |
5 files changed, 25 insertions, 25 deletions
diff --git a/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py b/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py index 9c9b7ce0..6fdc79a5 100644 --- a/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py +++ b/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py @@ -24,7 +24,7 @@ class SnmpAdminString(TextualConvention, OctetString): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(0,255) displayHint = "255a" -class SnmpEngineID(TextualConvention, OctetString): +class SnmpEngineID(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(5,32) try: # Attempt to base engine ID on local IP address @@ -37,14 +37,14 @@ class SnmpEngineID(TextualConvention, OctetString): # ...otherwise, use rudimentary text ID defaultValue = '80004fb8' + '4' + 'mozhinka' -class SnmpMessageProcessingModel(TextualConvention, Integer32): +class SnmpMessageProcessingModel(Integer32, TextualConvention): subtypeSpec = Integer32.subtypeSpec+constraint.ValueRangeConstraint(0,2147483647L) -class SnmpSecurityLevel(TextualConvention, Integer): +class SnmpSecurityLevel(Integer, TextualConvention): subtypeSpec = Integer.subtypeSpec+constraint.SingleValueConstraint(1,3,2,) namedValues = namedval.NamedValues(("noAuthNoPriv", 1), ("authNoPriv", 2), ("authPriv", 3), ) -class SnmpSecurityModel(TextualConvention, Integer32): +class SnmpSecurityModel(Integer32, TextualConvention): subtypeSpec = Integer32.subtypeSpec+constraint.ValueRangeConstraint(0,2147483647L) # Objects diff --git a/pysnmp/smi/mibs/SNMP-TARGET-MIB.py b/pysnmp/smi/mibs/SNMP-TARGET-MIB.py index 00e19174..39d38f16 100644 --- a/pysnmp/smi/mibs/SNMP-TARGET-MIB.py +++ b/pysnmp/smi/mibs/SNMP-TARGET-MIB.py @@ -15,11 +15,11 @@ from pyasn1.type import constraint, namedval # Types -class SnmpTagList(TextualConvention, OctetString): +class SnmpTagList(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(0,255) pass -class SnmpTagValue(TextualConvention, OctetString): +class SnmpTagValue(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(0,255) pass diff --git a/pysnmp/smi/mibs/SNMPv2-TC.py b/pysnmp/smi/mibs/SNMPv2-TC.py index 43575f49..e863b901 100644 --- a/pysnmp/smi/mibs/SNMPv2-TC.py +++ b/pysnmp/smi/mibs/SNMPv2-TC.py @@ -160,11 +160,11 @@ class MacAddress(TextualConvention, OctetString): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(6,6) displayHint = "1x:" -class TruthValue(TextualConvention, Integer): +class TruthValue(Integer, TextualConvention): subtypeSpec = Integer.subtypeSpec+constraint.SingleValueConstraint(1, 2) namedValues = namedval.NamedValues(('true', 1), ('false', 2)) -class TestAndIncr(Integer): +class TestAndIncr(Integer, TextualConvention): subtypeSpec = Integer.subtypeSpec+constraint.ValueRangeConstraint(0, 2147483647) def clone(self, value=None, tagSet=None, subtypeSpec=None): if value is None: @@ -178,13 +178,13 @@ class TestAndIncr(Integer): value = 0 return Integer.clone(self, value, tagSet, subtypeSpec) -class AutonomousType(TextualConvention, ObjectIdentifier): pass -class InstancePointer(TextualConvention,ObjectIdentifier): +class AutonomousType(ObjectIdentifier, TextualConvention): pass +class InstancePointer(ObjectIdentifier, TextualConvention): status = 'obsolete' -class VariablePointer(TextualConvention, ObjectIdentifier): pass -class RowPointer(TextualConvention, ObjectIdentifier): pass +class VariablePointer(ObjectIdentifier, TextualConvention): pass +class RowPointer(ObjectIdentifier, TextualConvention): pass -class RowStatus(TextualConvention, Integer): +class RowStatus(Integer, TextualConvention): """A special kind of scalar MIB variable responsible for MIB table row creation/destruction. """ @@ -287,25 +287,25 @@ class RowStatus(TextualConvention, Integer): raise err return self -class TimeStamp(TextualConvention, TimeTicks): pass +class TimeStamp(TimeTicks, TextualConvention): pass -class TimeInterval(TextualConvention, Integer): +class TimeInterval(Integer, TextualConvention): subtypeSpec = Integer.subtypeSpec+constraint.ValueRangeConstraint(0, 2147483647) class DateAndTime(TextualConvention, OctetString): subtypeSpec = Integer.subtypeSpec+constraint.ValueSizeConstraint(8, 11) displayHint = "2d-1d-1d,1d:1d:1d.1d,1a1d:1d" -class StorageType(TextualConvention, Integer): +class StorageType(Integer, TextualConvention): subtypeSpec = Integer.subtypeSpec+constraint.SingleValueConstraint(1, 2, 3, 4, 5) namedValues = namedval.NamedValues( ('other', 1), ('volatile', 2), ('nonVolatile', 3), ('permanent', 4), ('readOnly', 5) ) -class TDomain(TextualConvention, ObjectIdentifier): pass +class TDomain(ObjectIdentifier, TextualConvention): pass -class TAddress(TextualConvention, OctetString): +class TAddress(OctetString, TextualConvention): subtypeSpec = Integer.subtypeSpec+constraint.ValueSizeConstraint(1, 255) mibBuilder.exportSymbols( diff --git a/pysnmp/smi/mibs/SNMPv2-TM.py b/pysnmp/smi/mibs/SNMPv2-TM.py index 5427568d..59e25476 100644 --- a/pysnmp/smi/mibs/SNMPv2-TM.py +++ b/pysnmp/smi/mibs/SNMPv2-TM.py @@ -31,7 +31,7 @@ class SnmpOSIAddress(TextualConvention, OctetString): snmpDDPDomain = ObjectIdentity(snmpDomains.name + (4,)) -class SnmpNBPAddress(TextualConvention, OctetString): +class SnmpNBPAddress(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec + constraint.ValueSizeConstraint(3, 99) snmpIPXDomain = ObjectIdentity(snmpDomains.name + (5,)) diff --git a/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py b/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py index db5c32c1..68db1755 100644 --- a/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py +++ b/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py @@ -17,27 +17,27 @@ class TransportAddress(OctetString): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(0,255) pass -class TransportAddressDns(TextualConvention, OctetString): +class TransportAddressDns(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(1,255) pass -class TransportAddressIPv4(TextualConvention, OctetString): +class TransportAddressIPv4(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(6,6) pass -class TransportAddressIPv4z(TextualConvention, OctetString): +class TransportAddressIPv4z(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(10,10) pass -class TransportAddressIPv6(TextualConvention, OctetString): +class TransportAddressIPv6(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(18,18) pass -class TransportAddressIPv6z(TextualConvention, OctetString): +class TransportAddressIPv6z(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(22,22) pass -class TransportAddressLocal(TextualConvention, OctetString): +class TransportAddressLocal(OctetString, TextualConvention): subtypeSpec = OctetString.subtypeSpec+constraint.ValueSizeConstraint(1,255) pass |