Updated based on sonic-py-common

Author: judyjoseph

sonic-ledd/scripts/ledd

@@ -10,6 +10,8 @@ try:
     import sys
 
     from sonic_py_common import daemon_base
+    from sonic_py_common import multi_asic
+    from sonic_py_common.interface import backplane_prefix
     from swsscommon import swsscommon
 except ImportError, e:
     raise ImportError (str(e) + " - required module not found")
@@ -35,6 +37,9 @@ SELECT_TIMEOUT = 1000
 
 LEDUTIL_LOAD_ERROR = 1
 
+# The empty namespace refers to linux host namespace.
+EMPTY_NAMESPACE = ''
+
 class DaemonLedd(daemon_base.DaemonBase):
 
     # Run daemon
@@ -65,8 +70,15 @@ class DaemonLedd(daemon_base.DaemonBase):
             self.log_error("Failed to load ledutil: %s" % (str(e)), True)
             sys.exit(LEDUTIL_LOAD_ERROR)
 
-        # Get the namespaces in the platform
-        namespaces = multi_asic.get_namespaces()
+        # Load the namespace details first from the database_global.json file.
+        swsscommon.SonicDBConfig.initializeGlobalConfig()
+
+        # Get the namespaces in the platform. For multi-asic devices we get the namespaces
+        # of front-end ascis which have front-panel interfaces.
+        namespaces = [EMPTY_NAMESPACE]
+        if multi_asic.is_multi_asic():
+            ns_list = multi_asic.get_all_namespaces()
+            namespaces = ns_list['front_ns']
 
         # Subscribe to PORT table notifications in the Application DB
         appl_db, sst = {}, {}
@@ -103,7 +115,7 @@ class DaemonLedd(daemon_base.DaemonBase):
                 fvp_dict = dict(fvp)
 
                 if op == "SET" and "oper_status" in fvp_dict:
-                    if not key.startswith(daemon_base.get_internal_interface_prefix()):
+                    if not key.startswith(backplane_prefix()):
                         led_control.port_link_state_change(key, fvp_dict["oper_status"])
 
         return 1

sonic-xcvrd/scripts/xcvrd

@@ -19,6 +19,7 @@ try:
     from enum import Enum
     from sonic_py_common import daemon_base, device_info, logger
     from swsscommon import swsscommon
+    from sonic_py_common import multi_asic
 except ImportError, e:
     raise ImportError (str(e) + " - required module not found")
 
@@ -95,13 +96,32 @@ platform_chassis = None
 # by DaemonXcvrd
 helper_logger = logger.Logger(SYSLOG_IDENTIFIER)
 
-# MultiAsic class instance
-multi_asic = MultiAsic()
+# The empty namespace refers to linux host namespace.
+EMPTY_NAMESPACE = ''
 
 #
 # Helper functions =============================================================
 #
 
+# Get namespaces, for single ASIC platform namespace is EMPTY_NAMESPACE
+def get_front_end_namesapces():
+    # Get the namespaces in the platform. For multi-asic devices we get the namespaces
+    # of front-end ascis which have front-panel interfaces.
+    namespaces = [EMPTY_NAMESPACE]
+    if multi_asic.is_multi_asic():
+        ns_list = multi_asic.get_all_namespaces()
+        namespaces = ns_list['front_ns']
+
+    return namespaces
+
+# Get asic index from the namespace name
+# With single ASIC platform, namespace is EMPTY_NAMESPACE, return index 0
+def get_asic_id_from_namespace(namespace):
+    if namespace == EMPTY_NAMESPACE:
+        return 0 
+    else:
+        return multi_asic.get_asic_id_from_name(namespace)
+
 # Find out the underneath physical port list by logical name
 def logical_port_name_to_physical_port_list(port_name):
     if port_name.startswith("Ethernet"):
@@ -427,9 +447,9 @@ def post_port_sfp_dom_info_to_db(is_warm_start, stop_event=threading.Event()):
     transceiver_dict, state_db, appl_db, int_tbl, dom_tbl, app_port_tbl = {}, {}, {}, {}, {}, {}
 
     # Get the namespaces in the platform
-    namespaces = multi_asic.get_namespaces()
+    namespaces = get_front_end_namesapces()
     for namespace in namespaces:
-        asic_id = multi_asic.get_asic_id_from_namespace(namespace)
+        asic_id = get_asic_id_from_namespace(namespace)
         state_db[asic_id] = daemon_base.db_connect("STATE_DB", namespace)
         appl_db[asic_id] = daemon_base.db_connect("APPL_DB", namespace)
         int_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_INFO_TABLE)
@@ -740,9 +760,9 @@ def init_port_sfp_status_tbl(stop_event=threading.Event()):
     state_db, status_tbl = {},{}
 
     # Get the namespaces in the platform
-    namespaces = multi_asic.get_namespaces()
+    namespaces = get_front_end_namesapces()
     for namespace in namespaces:
-        asic_id = multi_asic.get_asic_id_from_namespace(namespace)
+        asic_id = get_asic_id_from_namespace(namespace)
         state_db[asic_id] = daemon_base.db_connect("STATE_DB", namespace)
         status_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_STATUS_TABLE)
 
@@ -789,9 +809,9 @@ class DomInfoUpdateTask(object):
         state_db, dom_tbl, status_tbl = {}, {}, {}
 
         # Get the namespaces in the platform
-        namespaces = multi_asic.get_namespaces()
+        namespaces = get_front_end_namesapces()
         for namespace in namespaces:
-            asic_id = multi_asic.get_asic_id_from_namespace(namespace)
+            asic_id = get_asic_id_from_namespace(namespace)
             state_db[asic_id] = daemon_base.db_connect("STATE_DB", namespace)
             dom_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_DOM_SENSOR_TABLE)
             status_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_STATUS_TABLE)
@@ -861,9 +881,9 @@ class SfpStateUpdateTask(object):
         state_db, appl_db, int_tbl, dom_tbl, status_tbl, app_port_tbl = {}, {}, {}, {}, {}, {}
 
         # Get the namespaces in the platform
-        namespaces = multi_asic.get_namespaces()
+        namespaces = get_front_end_namesapces()
         for namespace in namespaces:
-            asic_id = multi_asic.get_asic_id_from_namespace(namespace)
+            asic_id = get_asic_id_from_namespace(namespace)
             state_db[asic_id] = daemon_base.db_connect("STATE_DB", namespace)
             int_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_INFO_TABLE)
             dom_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_DOM_SENSOR_TABLE)
@@ -1179,6 +1199,9 @@ class DaemonXcvrd(daemon_base.DaemonBase):
                 self.log_error("Failed to load sfputil: %s" % (str(e)), True)
                 sys.exit(SFPUTIL_LOAD_ERROR)
 
+        # Load the namespace details first from the database_global.json file.
+        swsscommon.SonicDBConfig.initializeGlobalConfig()
+
         # Load port info
         try:
             if multi_asic.is_multi_asic():
@@ -1197,9 +1220,9 @@ class DaemonXcvrd(daemon_base.DaemonBase):
         state_db, self.int_tbl, self.dom_tbl, self.status_tbl = {}, {}, {}, {}
 
         # Get the namespaces in the platform
-        namespaces = multi_asic.get_namespaces()
+        namespaces = get_front_end_namesapces()
         for namespace in namespaces:
-            asic_id = multi_asic.get_asic_id_from_namespace(namespace)
+            asic_id = get_asic_id_from_namespace(namespace)
             state_db[asic_id] = daemon_base.db_connect("STATE_DB", namespace)
             self.int_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_INFO_TABLE)
             self.dom_tbl[asic_id] = swsscommon.Table(state_db[asic_id], TRANSCEIVER_DOM_SENSOR_TABLE)