[change] Use Trie instead of Dict in walk function

openwisp · Jul 29, 2021 · 15c779d · 15c779d
1 parent 5dc3cc6
commit 15c779d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/netengine/backends/snmp/airos.py b/netengine/backends/snmp/airos.py
@@ -9,8 +9,6 @@
 import logging
 from datetime import datetime
 
-from pytrie import StringTrie as Trie
-
 from netengine.exceptions import NetEngineError
 
 from .base import SNMP
@@ -510,7 +508,7 @@ def resources_to_dict(self, snmpdump=None):
 
     def to_dict(self, snmpdump=None, autowalk=True):
         if autowalk:
-            snmpdump = Trie(self.walk('1.3.6'))
+            snmpdump = self.walk('1.3.6')
         result = self._dict(
             {
                 'type': 'DeviceMonitoring',

diff --git a/netengine/backends/snmp/base.py b/netengine/backends/snmp/base.py
@@ -13,6 +13,7 @@
 
 from netengine.backends import BaseBackend
 from netengine.exceptions import NetEngineError
+from pytrie import StringTrie
 
 __all__ = ['SNMP']
 
@@ -96,7 +97,7 @@ def _oid(self, oid):
         return str(oid)
 
     def walk(self, oid):
-        result = dict()
+        result = StringTrie()
         for (errorIndication, errorStatus, errorIndex, varBinds) in nextCmd(
             SnmpEngine(),
             self.community,

diff --git a/netengine/backends/snmp/openwrt.py b/netengine/backends/snmp/openwrt.py
@@ -12,7 +12,6 @@
 
 import pytz
 from netaddr import EUI, mac_unix_expanded
-from pytrie import StringTrie as Trie
 
 from netengine.backends.snmp import SNMP
 from netengine.exceptions import NetEngineError
@@ -606,7 +605,7 @@ def neighbors(self, snmpdump=None):
 
     def to_dict(self, snmpdump=None, autowalk=True):
         if autowalk:
-            snmpdump = Trie(self.walk('1.2'))
+            snmpdump = self.walk('1.2')
         result = self._dict(
             {
                 'type': 'DeviceMonitoring',