Skip to content

Commit 15c779d

Browse files
committed
[change] Use Trie instead of Dict in walk function
1 parent 5dc3cc6 commit 15c779d

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

netengine/backends/snmp/airos.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import logging
1010
from datetime import datetime
1111

12-
from pytrie import StringTrie as Trie
13-
1412
from netengine.exceptions import NetEngineError
1513

1614
from .base import SNMP
@@ -510,7 +508,7 @@ def resources_to_dict(self, snmpdump=None):
510508

511509
def to_dict(self, snmpdump=None, autowalk=True):
512510
if autowalk:
513-
snmpdump = Trie(self.walk('1.3.6'))
511+
snmpdump = self.walk('1.3.6')
514512
result = self._dict(
515513
{
516514
'type': 'DeviceMonitoring',

netengine/backends/snmp/base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
from netengine.backends import BaseBackend
1515
from netengine.exceptions import NetEngineError
16+
from pytrie import StringTrie
1617

1718
__all__ = ['SNMP']
1819

@@ -96,7 +97,7 @@ def _oid(self, oid):
9697
return str(oid)
9798

9899
def walk(self, oid):
99-
result = dict()
100+
result = StringTrie()
100101
for (errorIndication, errorStatus, errorIndex, varBinds) in nextCmd(
101102
SnmpEngine(),
102103
self.community,

netengine/backends/snmp/openwrt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import pytz
1414
from netaddr import EUI, mac_unix_expanded
15-
from pytrie import StringTrie as Trie
1615

1716
from netengine.backends.snmp import SNMP
1817
from netengine.exceptions import NetEngineError
@@ -606,7 +605,7 @@ def neighbors(self, snmpdump=None):
606605

607606
def to_dict(self, snmpdump=None, autowalk=True):
608607
if autowalk:
609-
snmpdump = Trie(self.walk('1.2'))
608+
snmpdump = self.walk('1.2')
610609
result = self._dict(
611610
{
612611
'type': 'DeviceMonitoring',

0 commit comments

Comments
 (0)