diff options
author | elie <elie> | 2015-05-31 19:35:10 +0000 |
---|---|---|
committer | elie <elie> | 2015-05-31 19:35:10 +0000 |
commit | bea11dfe16e6714737b6f5016697206a038f051b (patch) | |
tree | 439ca11bab4cacb13f6438d50ad8500e902fdd82 /examples/v3arch/oneliner/manager/cmdgen | |
parent | 8a7fa29b9b4cd263db4b283704bda1c09eb002e6 (diff) | |
download | pysnmp-bea11dfe16e6714737b6f5016697206a038f051b.tar.gz |
Major overhaul related to PySMI integration and Standard SNMP Applications
API redesign:
* MibVariable becomes ObjectIdentity and moves to pysnmp.smi.rfc1902
* ObjectType and NotificationType classes resempling corresponding MIB MACROs
implemented
* SNMP Standard Applications and examples modified to support ObjectType
and NotificationType parameters
Diffstat (limited to 'examples/v3arch/oneliner/manager/cmdgen')
21 files changed, 68 insertions, 59 deletions
diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py b/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py index 1b7d156..94c1f54 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py @@ -35,18 +35,18 @@ targets = ( # 1-st target (SNMPv1 over IPv4/UDP) ( cmdgen.CommunityData('public', mpModel=0), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 2-nd target (SNMPv2c over IPv4/UDP) ( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 1161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 3-nd target (SNMPv3 over IPv4/UDP) ( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 2161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ) + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ) # N-th target # ... ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-transports-and-protocols.py b/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-transports-and-protocols.py index d70617d..d169377 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-transports-and-protocols.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-transports-and-protocols.py @@ -22,29 +22,29 @@ targets = ( # 1-st target (SNMPv1 over IPv4/UDP) ( cmdgen.CommunityData('public', mpModel=0), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 2-nd target (SNMPv2c over IPv4/UDP) ( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 3-nd target (SNMPv2c over IPv4/UDP) - same community and # different transport address. ( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('localhost', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysContact', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysName', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysContact', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysName', 0) ) ), # 4-nd target (SNMPv3 over IPv4/UDP) ( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 5-th target (SNMPv3 over IPv6/UDP) ( cmdgen.UsmUserData('usr-md5-none', 'authkey1'), cmdgen.Udp6TransportTarget(('::1', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # N-th target # ... ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-threaded-multiple-transports-and-protocols.py b/examples/v3arch/oneliner/manager/cmdgen/get-threaded-multiple-transports-and-protocols.py index df22afb..5d589f9 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-threaded-multiple-transports-and-protocols.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-threaded-multiple-transports-and-protocols.py @@ -28,29 +28,29 @@ targets = ( # 1-st target (SNMPv1 over IPv4/UDP) ( cmdgen.CommunityData('public', mpModel=0), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 2-nd target (SNMPv2c over IPv4/UDP) ( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 3-nd target (SNMPv2c over IPv4/UDP) - same community and # different transport address. ( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('localhost', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysContact', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysName', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysContact', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysName', 0) ) ), # 4-nd target (SNMPv3 over IPv4/UDP) ( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # 5-th target (SNMPv3 over IPv6/UDP) ( cmdgen.UsmUserData('usr-md5-none', 'authkey1'), cmdgen.Udp6TransportTarget(('::1', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0), - cmdgen.MibVariable('SNMPv2-MIB', 'sysLocation', 0) ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysLocation', 0) ) ), # N-th target # ... ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-v1.py b/examples/v3arch/oneliner/manager/cmdgen/get-v1.py index f05c5f8..664df9d 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-v1.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-v1.py @@ -16,8 +16,8 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.getCmd( cmdgen.CommunityData('public', mpModel=0), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('iso.org.dod.internet.mgmt.mib-2.system.sysDescr.0'), - cmdgen.MibVariable('SNMPv2-MIB', 'sysDescr', 0) + cmdgen.ObjectIdentity('iso.org.dod.internet.mgmt.mib-2.system.sysDescr.0'), + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysDescr', 0) ) # Check for errors and print out results diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-v2c-with-asn1-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/get-v2c-with-mib-compilation-and-lookup.py index a8f1e73..2c69699 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-v2c-with-asn1-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-v2c-with-mib-compilation-and-lookup.py @@ -9,16 +9,13 @@ # * for IF-MIB::ifInOctets.1 MIB object # from pysnmp.entity.rfc3413.oneliner import cmdgen -from pysnmp import debug - -#debug.setLogger(debug.Debug('mibbuild')) cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.getCmd( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', 'ifInOctets', '1').addAsn1Sources('file:///usr/share/snmp', 'http://mibs.snmplabs.com/asn1/<mib>'), + cmdgen.ObjectIdentity('IF-MIB', 'ifInOctets', 1).addMibCompiler('file:///usr/share/snmp', 'http://mibs.snmplabs.com/asn1/<mib>'), lookupNames=True, lookupValues=True ) @@ -33,5 +30,5 @@ else: ) ) else: - for name, val in varBinds: - print('%s = %s' % (name.prettyPrint(), val.prettyPrint())) + for oid, val in varBinds: + print('%s = %s' % (oid.prettyPrint(), val.prettyPrint())) diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-v3-over-ipv6-with-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/get-v3-over-ipv6-with-mib-lookup.py index 452c811..b766fad 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-v3-over-ipv6-with-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-v3-over-ipv6-with-mib-lookup.py @@ -6,7 +6,7 @@ # * with SNMPv3 with user 'usr-md5-des', MD5 auth and DES privacy protocols # * over IPv6/UDP # * to an Agent at [::1]:161 -# * for three OIDs: one passed as a MibVariable object while others are +# * for three OIDs: one passed as a ObjectIdentity object while others are # * in string form # from pysnmp.entity.rfc3413.oneliner import cmdgen @@ -16,7 +16,7 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.getCmd( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.Udp6TransportTarget(('::1', 161)), - cmdgen.MibVariable('1.3.6.1.2.1.1.1.0'), + cmdgen.ObjectIdentity('1.3.6.1.2.1.1.1.0'), '1.3.6.1.2.1.1.2.0', '1.3.6.1.2.1.1.3.0' ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-index.py b/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-index.py index 35fe0df..c641993 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-index.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-index.py @@ -16,7 +16,7 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.getCmd( cmdgen.UsmUserData('usr-none-none'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', 'ifInOctets', '1'), + cmdgen.ObjectIdentity('IF-MIB', 'ifInOctets', 1), lookupNames=True, lookupValues=True ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-multiple-indices.py b/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-multiple-indices.py index 74f31b0..8bc4562 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-multiple-indices.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-v3-table-object-by-multiple-indices.py @@ -17,7 +17,7 @@ errorIndication, errorStatus, errorIndex, varBinds = cmdGen.getCmd( authProtocol=cmdgen.usmHMACSHAAuthProtocol, privProtocol=cmdgen.usmAesCfb128Protocol ), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('TCP-MIB', 'tcpConnLocalAddress', '0.0.0.0', 22, '0.0.0.0', 0) + cmdgen.ObjectIdentity('TCP-MIB', 'tcpConnLocalAddress', '0.0.0.0', 22, '0.0.0.0', 0) ) # Check for errors and print out results diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-v3-with-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/get-v3-with-mib-lookup.py index 5392c0c..47f025f 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/get-v3-with-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/get-v3-with-mib-lookup.py @@ -15,7 +15,7 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.getCmd( cmdgen.UsmUserData('usr-md5-none', 'authkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', 'ifInOctets', '1') + cmdgen.ObjectIdentity('IF-MIB', 'ifInOctets', 1) ) # Check for errors and print out results diff --git a/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py index 7291ee8..99df3c1 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py @@ -22,8 +22,8 @@ errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.bulkCmd( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.Udp6TransportTarget(('::1', 161)), 1, 25, - cmdgen.MibVariable('IP-MIB', 'ipAdEntAddr'), - cmdgen.MibVariable('IF-MIB', 'ifEntry'), + cmdgen.ObjectIdentity('IP-MIB', 'ipAdEntAddr'), + cmdgen.ObjectIdentity('IF-MIB', 'ifEntry'), lookupNames=True, lookupValues=True, maxRows=20 ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py b/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py index a0f0f29..4ca6b6e 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py @@ -22,7 +22,7 @@ errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.bulkCmd( cmdgen.UsmUserData('usr-none-none'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), 0, 50, - cmdgen.MibVariable('TCP-MIB', 'tcpConnTable').addMibSource('/tmp/mymibs'), + cmdgen.ObjectIdentity('TCP-MIB', 'tcpConnTable').addMibSource('/tmp/mibs'), lexicographicMode=True, maxRows=100, maxCalls=10,ignoreNonIncreasingOid=True ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/getnext-async-multiple-transports-and-protocols.py b/examples/v3arch/oneliner/manager/cmdgen/getnext-async-multiple-transports-and-protocols.py index af3a40f..80ff0fe 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getnext-async-multiple-transports-and-protocols.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getnext-async-multiple-transports-and-protocols.py @@ -29,11 +29,11 @@ targets = ( # 3-nd target (SNMPv3 over IPv4/UDP) ( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - ( cmdgen.MibVariable('SNMPv2-MIB', 'system'), ) ), + ( cmdgen.ObjectIdentity('SNMPv2-MIB', 'system'), ) ), # 4-th target (SNMPv3 over IPv6/UDP) ( cmdgen.UsmUserData('usr-md5-none', 'authkey1'), cmdgen.Udp6TransportTarget(('::1', 161)), - ( cmdgen.MibVariable('IF-MIB', 'ifTable'), ) ) + ( cmdgen.ObjectIdentity('IF-MIB', 'ifTable'), ) ) # N-th target # ... ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/getnext-v1-with-custom-mibs-location.py b/examples/v3arch/oneliner/manager/cmdgen/getnext-v1-with-custom-mibs-location.py index 42e8f46..e693562 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getnext-v1-with-custom-mibs-location.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getnext-v1-with-custom-mibs-location.py @@ -21,7 +21,7 @@ # found relative to $PYTHONPATH. Besides searching MIBs as Python modules # (which could be egg-ed or not), pysnmp can also search for stand-alone # files in given directories. The latter could be specified by -# MibVariable.addMibSource() calls. New search path entries are added +# ObjectIdentity.addMibSource() calls. New search path entries are added # in front of existing ones in search path. # from pysnmp.entity.rfc3413.oneliner import cmdgen @@ -31,8 +31,8 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.nextCmd( cmdgen.CommunityData('public', mpModel=0), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', 'ifDescr').addMibSource('/tmp/mymibs'), - cmdgen.MibVariable('IF-MIB', 'ifType') + cmdgen.ObjectIdentity('IF-MIB', 'ifDescr').addMibSource('/tmp/mymibs'), + cmdgen.ObjectIdentity('IF-MIB', 'ifType') ) if errorIndication: diff --git a/examples/v3arch/oneliner/manager/cmdgen/getnext-v1.py b/examples/v3arch/oneliner/manager/cmdgen/getnext-v1.py index 2a69895..7be99e2 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getnext-v1.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getnext-v1.py @@ -18,11 +18,11 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.nextCmd( cmdgen.CommunityData('public', mpModel=0), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', 'ifDescr'), - cmdgen.MibVariable('IF-MIB', 'ifType'), - cmdgen.MibVariable('IF-MIB', 'ifMtu'), - cmdgen.MibVariable('IF-MIB', 'ifSpeed'), - cmdgen.MibVariable('IF-MIB', 'ifPhysAddress') + cmdgen.ObjectIdentity('IF-MIB', 'ifDescr'), + cmdgen.ObjectIdentity('IF-MIB', 'ifType'), + cmdgen.ObjectIdentity('IF-MIB', 'ifMtu'), + cmdgen.ObjectIdentity('IF-MIB', 'ifSpeed'), + cmdgen.ObjectIdentity('IF-MIB', 'ifPhysAddress') ) if errorIndication: diff --git a/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py index 6354572..847ba25 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py @@ -19,7 +19,7 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.nextCmd( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.Udp6TransportTarget(('::1', 161)), - cmdgen.MibVariable('IF-MIB', 'ifEntry'), + cmdgen.ObjectIdentity('IF-MIB', 'ifEntry'), lookupNames=True, lookupValues=True ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-mib-lookup.py index 25352de..2d62e85 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-mib-lookup.py @@ -19,7 +19,7 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.nextCmd( cmdgen.UsmUserData('usr-md5-none', 'authkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', ''), + cmdgen.ObjectIdentity('IF-MIB', ''), lookupValues=True ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-options.py b/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-options.py index 2e9c9f4..bdeda85 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-options.py +++ b/examples/v3arch/oneliner/manager/cmdgen/getnext-v3-pull-whole-mib-with-options.py @@ -21,7 +21,7 @@ errorIndication, errorStatus, errorIndex, varBindTable = cmdGen.nextCmd( authProtocol=cmdgen.usmHMACSHAAuthProtocol, privProtocol=cmdgen.usmAesCfb128Protocol), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - cmdgen.MibVariable('IF-MIB', '').loadMibs(), + cmdgen.ObjectIdentity('IF-MIB', '').loadMibs(), lexicographicMode=True, maxRows=100, ignoreNonIncreasingOid=True ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/set-v2c-with-value-type-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/set-v2c-with-value-type-mib-lookup.py index d58ad9c..6732ec2 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/set-v2c-with-value-type-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/set-v2c-with-value-type-mib-lookup.py @@ -15,7 +15,10 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.setCmd( cmdgen.CommunityData('public'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - (cmdgen.MibVariable('SNMPv2-MIB', 'sysORDescr', 1), 'new system name') + cmdgen.ObjectType( + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysORDescr', 1), + 'new system name' + ) ) # Check for errors and print out results diff --git a/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid-and-contextname.py b/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid-and-contextname.py index e273bba..f28063b 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid-and-contextname.py +++ b/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid-and-contextname.py @@ -19,7 +19,10 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.setCmd( cmdgen.UsmUserData('usr-md5-none', 'authkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - (cmdgen.MibVariable('SNMPv2-MIB', 'sysORDescr', 1), 'new system name'), + cmdgen.ObjectType( + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysORDescr', 1), + 'new system name' + ), contextEngineId=rfc1902.OctetString(hexValue='80004fb805636c6f75644dab22cc'), contextName='da761cfc8c94d3aceef4f60f049105ba' ) diff --git a/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid.py b/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid.py index 04ee0bf..124a26f 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid.py +++ b/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-custom-contextengineid.py @@ -23,7 +23,10 @@ errorIndication, errorStatus, errorIndex, varBinds = cmdGen.setCmd( ) ), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - (cmdgen.MibVariable('SNMPv2-MIB', 'sysORDescr', 1), 'new system name'), + cmdgen.ObjectType( + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysORDescr', 1), + 'new system name' + ) ) # Check for errors and print out results diff --git a/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-value-type-mib-lookup.py b/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-value-type-mib-lookup.py index 9734400..c5ce06d 100644 --- a/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-value-type-mib-lookup.py +++ b/examples/v3arch/oneliner/manager/cmdgen/set-v3-with-value-type-mib-lookup.py @@ -16,7 +16,10 @@ cmdGen = cmdgen.CommandGenerator() errorIndication, errorStatus, errorIndex, varBinds = cmdGen.setCmd( cmdgen.UsmUserData('usr-md5-des', 'authkey1', 'privkey1'), cmdgen.UdpTransportTarget(('demo.snmplabs.com', 161)), - (cmdgen.MibVariable('SNMPv2-MIB', 'sysORDescr', 1), 'new system name'), + cmdgen.ObjectType( + cmdgen.ObjectIdentity('SNMPv2-MIB', 'sysORDescr', 1), + 'new system name' + ), lookupNames=True, lookupValues=True ) |