[change] NetJSON DeviceMonitoring compliance #2

netengine/backends/snmp/base.py

@@ -8,6 +8,8 @@
 import binascii
 import logging
 
+import netaddr
+
 from netengine.backends import BaseBackend
 from netengine.exceptions import NetEngineError
 
@@ -57,6 +59,20 @@ def _octet_to_mac(self, octet_mac):
             )
         return mac_address
 
+    def _ascii_blocks_to_ipv6(self, ascii_string):
+        """
+        converts an ascii representation into ipv6 address
+        """
+        blocks = ascii_string.split('.')
+        for b in range(len(blocks)):
+            blocks[b] = format(int(blocks[b]), '02x')
+        res = netaddr.IPAddress(
+            ':'.join(
+                [''.join(blocks[slice(i, i + 2)]) for i in range(0, len(blocks), 2)]
+            )
+        )
+        return res
+
     def _oid(self, oid):
         """
         returns valid oid value to be passed to getCmd() or nextCmd()

netengine/backends/snmp/openwrt.py

@@ -507,6 +507,11 @@ def neighbors(self):
 
         for index, neighbor in enumerate(neighbors):
             try:
+                oid = neighbor[0][0].getOid()
+                if oid[12] == 4:
+                    ip = oid[13:]
+                else:
+                    ip = self._ascii_blocks_to_ipv6(str(oid[13:]))
                 mac = EUI(
                     int(neighbor[0][1].prettyPrint(), 16), dialect=mac_unix_expanded
                 )
@@ -517,7 +522,12 @@ def neighbors(self):
                 continue
             result.append(
                 self._dict(
-                    {'mac': str(mac), 'state': str(state), 'interface': str(interface)}
+                    {
+                        'mac': str(mac),
+                        'state': str(state),
+                        'interface': str(interface),
+                        'ip': str(ip),
+                    }
                 )
             )
         return result