chore: fixed some minor & major incompatible bugs

Author: abbi4code

pyproject.toml

@@ -2,3 +2,6 @@
 # python black formatting
 [tool.black]
 line-length = 80
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"

requirements.txt

@@ -32,7 +32,7 @@ graphql_server==3.0.0b5
 # Testing
 mock
 pytest
-pytest-asyncio
+pytest-asyncio>=0.24,<0.25
 
 # Other
 more-itertools

switchmap/poller/snmp/mib/cisco/mib_ciscoprocess.py

@@ -43,15 +43,19 @@ async def system(self):
             )
 
             # Populate final results with better structure
-            if cpu_data and not isinstance(cpu_data, Exception):
+            if cpu_data is not None and not isinstance(cpu_data, Exception):
                 final["CISCO-PROCESS-MIB"]["cpmCPUTotal5minRev"] = cpu_data
 
-            if memory_used_data and not isinstance(memory_used_data, Exception):
+            if memory_used_data is not None and not isinstance(
+                memory_used_data, Exception
+            ):
                 final["CISCO-PROCESS-MIB"][
                     "ciscoMemoryPoolUsed"
                 ] = memory_used_data
 
-            if memory_free_data and not isinstance(memory_free_data, Exception):
+            if memory_free_data is not None and not isinstance(
+                memory_free_data, Exception
+            ):
                 final["CISCO-PROCESS-MIB"][
                     "ciscoMemoryPoolFree"
                 ] = memory_free_data
@@ -83,16 +87,16 @@ async def cpmcputotal5minrev(self, oidonly=False):
         return data_dict
 
     async def memorypoolused(self, oidonly=False):
-        """Get total used memory from CISCO-MEMORY-POOL-MIB (ciscoMemoryPoolUsed).
+        """Get total used memory from CISCO-MEMORY-POOL-MIB.
 
         Args:
             oidonly (bool): If True, return the OID string instead of querying.
+
         Returns:
             int | str | dict: Sum of used memory in bytes,
                               OID string if oidonly=True,
-                              or empty dict on error.
+                              or None on error.
         """
-
         # Process OID - Enhanced memory pool used (high capacity)
         oid = ".1.3.6.1.4.1.9.9.48.1.1.1.5"
 
@@ -110,17 +114,16 @@ async def memorypoolused(self, oidonly=False):
             return None
 
     async def memorypoolfree(self, oidonly=False):
-        """Get total free memory from CISCO-MEMORY-POOL-MIB (ciscoMemoryPoolFree).
+        """Get total free memory from CISCO-MEMORY-POOL-MIB.
 
         Args:
             oidonly (bool): If True, return the OID string instead of querying.
+
         Returns:
             int | str | dict: Sum of free memory in bytes,
                               OID string if oidonly=True,
-                              or empty dict on error.
+                              or None on error.
         """
-        # Initialize key variables
-
         # Process OID - Enhanced memory pool free (high capacity)
         oid = ".1.3.6.1.4.1.9.9.48.1.1.1.6"
 

switchmap/poller/snmp/mib/generic/mib_if.py

@@ -716,6 +716,7 @@ async def ifstackstatus(self, oidonly=False):
 
     async def ifInUcastPkts(self, oidonly=False):
         """Get inbound unicast packet counters for each interface.
+
         Args:
             oidonly: Return OID's value, not results, if True
         Returns:
@@ -738,6 +739,7 @@ async def ifInUcastPkts(self, oidonly=False):
 
     async def ifOutUcastPkts(self, oidonly=False):
         """Get Outbound unicast packet counters for each interface.
+
         Args:
             oidonly: Return OID's value, not results, if True
         Returns:
@@ -760,6 +762,7 @@ async def ifOutUcastPkts(self, oidonly=False):
 
     async def ifInErrors(self, oidonly=False):
         """Return dict of IFMIB ifInErrors for each ifIndex for device.
+
         Args:
             oidonly: Return OID's value, not results, if True
         Returns:
@@ -782,6 +785,7 @@ async def ifInErrors(self, oidonly=False):
 
     async def ifInDiscards(self, oidonly=False):
         """Return dict of IFMIB ifInDiscards for each ifIndex for device.
+
         Args:
             oidonly: Return OID's value, not results, if True
         Returns:

switchmap/poller/snmp/mib/juniper/mib_juniperprocess.py

@@ -1,4 +1,4 @@
-"Module for JUNIPER-PROCESS-MIB." ""
+"""Module for JUNIPER-PROCESS-MIB."""
 
 from collections import defaultdict
 from switchmap.poller.snmp.base_query import Query
@@ -42,15 +42,19 @@ async def system(self):
                 return_exceptions=True,
             )
             # Populate final results
-            if cpu_data and not isinstance(cpu_data, Exception):
+            if cpu_data is not None and not isinstance(cpu_data, Exception):
                 final["JUNIPER-MIB"]["jnxOperatingCPU"] = cpu_data
 
-            if memory_used_data and not isinstance(memory_used_data, Exception):
+            if memory_used_data is not None and not isinstance(
+                memory_used_data, Exception
+            ):
                 final["JUNIPER-MIB"][
                     "jnxOperatingMemoryUsed"
                 ] = memory_used_data
 
-            if memory_free_data and not isinstance(memory_free_data, Exception):
+            if memory_free_data is not None and not isinstance(
+                memory_free_data, Exception
+            ):
                 final["JUNIPER-MIB"][
                     "jnxOperatingMemoryFree"
                 ] = memory_free_data

switchmap/poller/snmp/snmp_info.py

@@ -23,7 +23,7 @@ def __init__(self, snmp_object):
         """Instantiate the class.
 
         Args:
-            snmp_object: SNMP interact class object from async_snmp_manager.py
+            snmp_object: SNMP interact class object from snmp_manager.py
 
         Returns:
             None

switchmap/poller/snmp/snmp_manager.py

@@ -431,7 +431,7 @@ async def walk(
                 blank values.
 
         Returns:
-            result: Dictionary of tuples (OID, value)
+            result: Dictionary of {OID: value} pairs
         """
         (_, _, result) = await self.query(
             oid_to_get,
@@ -689,7 +689,7 @@ async def _session(self, walk_operation=False):
                 else:
                     log.log2warning(
                         1218,
-                        f"Unknown auth protocol '{auth.privprotocol}',"
+                        f"Unknown privacy protocol '{auth.privprotocol}',"
                         f"leaving unset",
                     )
                     priv_protocol = None

switchmap/server/db/ingest/update/device.py

@@ -5,6 +5,9 @@
 from copy import deepcopy
 from operator import attrgetter
 
+from sqlalchemy import false
+from sqlalchemy.orm.base import instance_dict
+
 # Application imports
 from switchmap.core import log
 from switchmap.core import general
@@ -529,9 +532,15 @@ def macport(self, test=False):
                     # Initialize variables
                     valid_mac = None
 
-                    # Create lowercase version of MAC address
+                    # Normalize possible bytes OctetString to hex
+                    raw_mac = (
+                        next_mac.hex()
+                        if isinstance(next_mac, (bytes, bytearray))
+                        else next_mac
+                    )
+
                     # Handle double-encoded MAC addresses from async poller
-                    decoded_mac = decode_mac_address(next_mac)
+                    decoded_mac = decode_mac_address(raw_mac)
                     mactest = general.mac(decoded_mac)
                     if bool(mactest.valid) is False:
                         continue
@@ -613,8 +622,18 @@ def ipport(self, test=False):
 
                 # Iterate over the MACs found
                 for item in sorted(_macs):
+                    # Normalize possible bytes OctetString to hex and decode
+                    raw_mac = (
+                        item.hex()
+                        if isinstance(item, (bytes, bytearray))
+                        else item
+                    )
+                    decoded = decode_mac_address(raw_mac)
+                    mtest = general.mac(decoded)
+                    if bool(mtest.valid) is False:
+                        continue
                     # Ensure the MAC exists in the database
-                    mac_exists = _mac.exists(self._device.idx_zone, item)
+                    mac_exists = _mac.exists(self._device.idx_zone, mtest.mac)
                     if bool(mac_exists) is True:
                         # Get all the IP addresses for the mac
                         found = _macip.idx_ips_exist(mac_exists.idx_mac)
@@ -664,24 +683,43 @@ def systemstat(self, test=False):
         # Log start
         self.log("SystemStat")
 
-        # Extract CISCO MIB data from system section
+        # Extract vendor-specific MIB data from system section
         system_data = self._data.get("system", {})
 
-        # Get CPU data from CISCO-PROCESS-MIB
+        # Initialize variables
         cpu_5min = None
-        cisco_process = system_data.get("CISCO-PROCESS-MIB", {})
-        cpu_total_5min = cisco_process.get("cpmCPUTotal5minRev", {})
-        if cpu_total_5min:
-            # Get the first CPU value (usually CPU '1')
-            cpu_5min = next(iter(cpu_total_5min.values()), None)
-
-        # Get Memory data from CISCO-MEMORY-POOL-MIB
         mem_used = None
         mem_free = None
-        cisco_memory = system_data.get("CISCO-MEMORY-POOL-MIB", {})
-        if cisco_memory:
-            mem_used = cisco_memory.get("ciscoMemoryPoolUsed")
-            mem_free = cisco_memory.get("ciscoMemoryPoolFree")
+
+        # Get CPU and Memory data from CISCO-PROCESS-MIB
+        cisco_process = system_data.get("CISCO-PROCESS-MIB", {})
+        if cisco_process:
+            # Get CPU data
+            cpu_total_5min = cisco_process.get("cpmCPUTotal5minRev", {})
+            if cpu_total_5min:
+                # Get the first CPU value (usually CPU '1')
+                cpu_5min = next(iter(cpu_total_5min.values()), None)
+
+            # Get Memory data from CISCO-PROCESS-MIB
+            if not mem_used:
+                mem_used = cisco_process.get("ciscoMemoryPoolUsed")
+            if not mem_free:
+                mem_free = cisco_process.get("ciscoMemoryPoolFree")
+
+        # Get CPU and Memory data from JUNIPER-MIB
+        juniper_process = system_data.get("JUNIPER-MIB", {})
+        if juniper_process:
+            # Get CPU data
+            juniper_cpu = juniper_process.get("jnxOperatingCPU", {})
+            if juniper_cpu and cpu_5min is None:
+                # Get the first CPU value
+                cpu_5min = next(iter(juniper_cpu.values()), None)
+
+            # Get Memory data
+            if not mem_used:
+                mem_used = juniper_process.get("jnxOperatingMemoryUsed")
+            if not mem_free:
+                mem_free = juniper_process.get("jnxOperatingMemoryFree")
 
         # Only create record if we have some data
         if cpu_5min is not None or mem_used is not None or mem_free is not None:
@@ -701,8 +739,8 @@ def systemstat(self, test=False):
             else:
                 # Insert new record
                 if not test:
-                    _systemstat.insert_row(inserts)
-                    # Log completion
+                    _systemstat.insert_row(row)
+
         self.log("SystemStat", updated=True)
 
         # Mark as completed

switchmap/server/db/table/systemstat.py

@@ -10,6 +10,7 @@
 
 def idx_exists(idx):
     """Determine whether primary key exists.
+
     Args:
         idx: idx_systemstat
     Returns:
@@ -25,16 +26,14 @@ def idx_exists(idx):
 
     # Return
     for row in rows:
-        #! i think we are just finding if row exist we are ret bool
         result = _rows.systemstat(row)
-        #! why breaking just after appending result for single row
-        #! are we just checking if there exists a single row or not
         break
     return result
 
 
 def device_exists(idx_device):
     """Determine whether SystemStat record exists for a device.
+
     Args:
         idx_device: Device index
     Returns:
@@ -90,6 +89,7 @@ def insert_row(rows):
 
 def update_row(idx, row):
     """Update a systemstat table entry.
+
     Args:
         idx: idx_systemstat value
         row: SystemStat object