re-generated (and then manually fixed) to comply pyasn1 object model

1 files changed, 14 insertions, 15 deletions

diff --git a/pysnmp/smi/mibs/SNMPv2-TM.py b/pysnmp/smi/mibs/SNMPv2-TM.py
index 48ea99e..b395cfe 100644
--- a/pysnmp/smi/mibs/SNMPv2-TM.py
+++ b/pysnmp/smi/mibs/SNMPv2-TM.py
@@ -1,8 +1,8 @@
-from pysnmp.asn1 import subtypes
+from pyasn1.type import constraint
 
 OctetString, = mibBuilder.importSymbols('ASN1', 'OctetString')
-ModuleIdentity, MibIdentifier, ObjectIdentity, snmpModules, \
-                snmpDomains, snmpProxys = mibBuilder.importSymbols(
+( ModuleIdentity, MibIdentifier, ObjectIdentity, snmpModules, 
+  snmpDomains, snmpProxys ) = mibBuilder.importSymbols(
     'SNMPv2-SMI', 'ModuleIdentity', 'MibIdentifier', 'ObjectIdentity',
     'snmpModules', 'snmpDomains', 'snmpProxys'
     )
@@ -13,33 +13,31 @@ snmpv2tm = ModuleIdentity(snmpModules.name + (19,))
 snmpUDPDomain = ObjectIdentity(snmpDomains.name + (1,))
 
 class SnmpUDPAddress(TextualConvention, OctetString):
-    subtypeConstraints = OctetString.subtypeConstraints + (
-        subtypes.ValueSizeConstraint(6, 6),
-        )
+    subtypeSpec = OctetString.subtypeSpec + constraint.ValueSizeConstraint(6, 6)
     displayHint = "1d.1d.1d.1d/2d"
+
+    def _prettyIn(self, value):
+        self.__nativeValue = value
+        return "0000/0"  # XXX
+    
+    def getNativeValue(self): return self.__nativeValue        
     
 snmpCLNSDomain = ObjectIdentity(snmpDomains.name + (2,))
 snmpCONSDomain = ObjectIdentity(snmpDomains.name + (3,))
 
 class SnmpOSIAddress(TextualConvention, OctetString):
-    subtypeConstraints = OctetString.subtypeConstraints + (
-        subtypes.ValueSizeConstraint(1, 85),
-        )
+    subtypeSpec = OctetString.subtypeSpec + constraint.ValueSizeConstraint(1, 85)
     displayHint = "*1x:/1x:"
     
 snmpDDPDomain = ObjectIdentity(snmpDomains.name + (4,))
 
 class SnmpNBPAddress(TextualConvention, OctetString):
-    subtypeConstraints = OctetString.subtypeConstraints + (
-        subtypes.ValueSizeConstraint(3, 99),
-        )
+    subtypeSpec = OctetString.subtypeSpec + constraint.ValueSizeConstraint(3, 99)
     
 snmpIPXDomain = ObjectIdentity(snmpDomains.name + (5,))
 
 class SnmpIPXAddress(TextualConvention, OctetString):
-    subtypeConstraints = OctetString.subtypeConstraints + (
-        subtypes.ValueSizeConstraint(12, 12),
-        )
+    subtypeSpec = OctetString.subtypeSpec + constraint.ValueSizeConstraint(12, 12)
     displayHint = "4x.1x:1x:1x:1x:1x:1x.2d"
 
 rfc1157Proxy = MibIdentifier(snmpProxys.name + (1,))
@@ -47,6 +45,7 @@ rfc1157Domain = MibIdentifier(rfc1157Proxy.name + (1,))
 
 mibBuilder.exportSymbols(
     'SNMPv2-TM', snmpv2tm=snmpv2tm, snmpUDPDomain=snmpUDPDomain,
+    SnmpUDPAddress=SnmpUDPAddress,
     snmpCLNSDomain=snmpCLNSDomain, snmpCONSDomain=snmpCONSDomain,
     SnmpOSIAddress=SnmpOSIAddress, snmpDDPDomain=snmpDDPDomain,
     SnmpNBPAddress=SnmpNBPAddress, snmpIPXDomain=snmpIPXDomain,