Fix issue sonic-net#104: lldpLocManAddrTable supports multiple IP add…

…resses (sonic-net#106)

src/sonic_ax_impl/mibs/ieee802_1ab.py

@@ -295,6 +295,8 @@ def reinit_data(self):
         """
         Subclass update data routine.
         """
+        self.man_addr_list = []
+
         # establish connection to application database.
         self.db_conn.connect(mibs.APPL_DB)
         mgmt_ip_bytes = self.db_conn.get(mibs.APPL_DB, mibs.LOC_CHASSIS_TABLE, b'lldp_loc_man_addr')
@@ -306,10 +308,16 @@ def reinit_data(self):
             logger.debug("Got mgmt ip from db : {}".format(self.mgmt_ip_str))
         try:
             addr_subtype_sub_oid = 4
-            mgmt_ip_sub_oid = (addr_subtype_sub_oid, *[int(i) for i in self.mgmt_ip_str.split('.')])
+            mgmt_ip_sub_oid = None
+            for mgmt_ip in self.mgmt_ip_str.split(','):
+                if '.' in mgmt_ip:
+                    mgmt_ip_sub_oid = (addr_subtype_sub_oid, *[int(i) for i in mgmt_ip.split('.')])
+                    break
         except ValueError:
             logger.error("Invalid local mgmt IP {}".format(self.mgmt_ip_str))
             return
+        if mgmt_ip_sub_oid == None:
+            return
         sub_oid = (ManAddrConst.man_addr_subtype_ipv4,
                    *mgmt_ip_sub_oid)
         self.man_addr_list.append(sub_oid)
@@ -340,7 +348,11 @@ def man_addr(self, sub_id):
         :param sub_id:
         :return: MGMT IP in HEX
         """
-        hex_ip = " ".join([format(int(i), '02X') for i in self.mgmt_ip_str.split('.')])
+        hex_ip = ''
+        for mgmt_ip in self.mgmt_ip_str.split(','):
+            if '.' in mgmt_ip:
+                hex_ip = " ".join([format(int(i), '02X') for i in mgmt_ip.split('.')])
+                break
         return hex_ip
 
     @staticmethod

tests/mock_tables/appl_db.json

@@ -466,7 +466,7 @@
     "lldp_loc_chassis_id": "00:11:22:AB:CD:EF",
     "lldp_loc_sys_name": "SONiC",
     "lldp_loc_sys_desc": "Gotta go Fast!",
-    "lldp_loc_man_addr": "10.224.25.26"
+    "lldp_loc_man_addr": "10.224.25.26,fe80::ce37:abff:feec:de9c"
   },
   "PORT_TABLE:Ethernet0": {
     "description": "snowflake",