From c34b351713452fe3d1ee91509b645058bf971807 Mon Sep 17 00:00:00 2001 From: Koos85 Date: Fri, 27 Jan 2023 18:18:04 +0100 Subject: [PATCH 1/2] remove recursive param --- asyncsnmplib/client.py | 7 +++---- asyncsnmplib/utils.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/asyncsnmplib/client.py b/asyncsnmplib/client.py index 7cc4161..731ef75 100644 --- a/asyncsnmplib/client.py +++ b/asyncsnmplib/client.py @@ -79,7 +79,7 @@ async def get_next_multi(self, oids): vbs = await self._get_next(oids) return [(oid, value) for oid, _, value in vbs if oid[:-1] in oids] - async def walk(self, oid, recursive=True): + async def walk(self, oid): next_oid = oid prefixlen = len(oid) rows = [] @@ -91,7 +91,6 @@ async def walk(self, oid, recursive=True): (oid_, value) for oid_, tag, value in vbs if oid_[:prefixlen] == oid and - (recursive or oid_[-1] == 0) and value is not None ] rows.extend(new_rows) @@ -116,7 +115,7 @@ def close(self): class SnmpV1(Snmp): version = 0 - async def walk(self, oid, recursive=True): + async def walk(self, oid): next_oid = oid prefixlen = len(oid) rows = [] @@ -131,7 +130,7 @@ async def walk(self, oid, recursive=True): new_rows = [ (oid_, value) for oid_, tag, value in vbs - if oid_[:prefixlen] == oid and (recursive or oid_[-1] == 0) + if oid_[:prefixlen] == oid ] rows.extend(new_rows) diff --git a/asyncsnmplib/utils.py b/asyncsnmplib/utils.py index d0f7f7f..076192e 100644 --- a/asyncsnmplib/utils.py +++ b/asyncsnmplib/utils.py @@ -127,7 +127,7 @@ async def snmp_queries( else: results = {} for oid in queries: - result = await cl.walk(oid, False) + result = await cl.walk(oid) try: name, parsed_result = on_result_base(oid, result) except Exception as e: From a167d113453a712ab3cf6ef04e57ae8c9e886066 Mon Sep 17 00:00:00 2001 From: Koos85 Date: Fri, 27 Jan 2023 18:21:51 +0100 Subject: [PATCH 2/2] version++ --- asyncsnmplib/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asyncsnmplib/version.py b/asyncsnmplib/version.py index 124e462..c3bb296 100644 --- a/asyncsnmplib/version.py +++ b/asyncsnmplib/version.py @@ -1 +1 @@ -__version__ = '0.1.7' +__version__ = '0.1.8'