Azure
diff --git a/‎scripts/sfpshow
Lines changed: 88 additions & 7 deletions b/‎scripts/sfpshow
Lines changed: 88 additions & 7 deletions
diff --git a/‎sfputil/main.py
Lines changed: 20 additions & 6 deletions b/‎sfputil/main.py
Lines changed: 20 additions & 6 deletions
diff --git a/‎tests/mock_platform_sfputil/mock_platform_sfputil.py
Lines changed: 8 additions & 0 deletions b/‎tests/mock_platform_sfputil/mock_platform_sfputil.py
Lines changed: 8 additions & 0 deletions
@@ -14,6 +14,7 @@ from typing import Dict
 
 import click
 from natsort import natsorted
+from utilities_common import platform_sfputil_helper
 from sonic_py_common import multi_asic
 from utilities_common.general import load_db_config
 from utilities_common.sfp_helper import covert_application_advertisement_to_output_string
@@ -23,7 +24,10 @@ from utilities_common.sfp_helper import (
         C_CMIS_DATA_MAP,
         QSFP_STATUS_MAP,
         CMIS_STATUS_MAP,
+        CMIS_VDM_TO_LEGACY_STATUS_MAP,
         CCMIS_STATUS_MAP,
+        CCMIS_VDM_TO_LEGACY_STATUS_MAP,
+        CCMIS_VDM_THRESHOLD_TO_LEGACY_DOM_THRESHOLD_MAP
 )
 from tabulate import tabulate
 
@@ -453,8 +457,14 @@ class SFPShow(object):
     def convert_interface_sfp_info_to_cli_output_string(self, state_db, interface_name, dump_dom):
         output = ''
 
+        first_subport = platform_sfputil_helper.get_first_subport(interface_name)
+        if first_subport is None:
+            click.echo("Error: Unable to get first subport for {} while converting SFP info".format(interface_name))
+            output = "SFP EEPROM Not detected\n"
+            return output
+
         sfp_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_INFO|{}'.format(interface_name))
-        sfp_firmware_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(interface_name))
+        sfp_firmware_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(first_subport))
         if sfp_info_dict:
             if sfp_info_dict['type'] == RJ45_PORT_TYPE:
                 output = 'SFP EEPROM is not applicable for RJ45 port\n'
@@ -465,8 +475,8 @@ class SFPShow(object):
 
                 if dump_dom:
                     sfp_type = sfp_info_dict['type']
-                    dom_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_SENSOR|{}'.format(interface_name))
-                    dom_info_dict.update(state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_THRESHOLD|{}'.format(interface_name)))
+                    dom_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_SENSOR|{}'.format(first_subport)) or {}
+                    dom_info_dict.update(state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_THRESHOLD|{}'.format(first_subport)) or {})
                     dom_output = self.convert_dom_to_output_string(sfp_type, dom_info_dict)
                     output += dom_output
         else:
@@ -477,17 +487,75 @@ class SFPShow(object):
 
         return output
 
+    def convert_vdm_fields_to_legacy_fields(self, state_db, interface_name, dict_to_be_updated, vdm_to_legacy_field_map, vdm_field_type):
+        """
+        Converts VDM fields from the database into legacy field names
+        and updates the provided dictionary with the converted values.
+
+        This function ensures backward compatibility by mapping VDM fields to their corresponding
+        legacy field names based on the specified field type ('FLAG' or 'THRESHOLD').
+
+        Args:
+            state_db: The database connection object used to retrieve VDM data.
+            interface_name (str): The name of the interface for which VDM data is being retrieved.
+            dict_to_be_updated (dict): The dictionary to be updated with the converted legacy field names and values.
+            vdm_to_legacy_field_map (dict): A mapping of VDM field names to their corresponding legacy field name prefixes.
+            vdm_field_type (str): Specifies the type of VDM fields to process. It can be either 'FLAG' or 'THRESHOLD'.
+        """
+        if dict_to_be_updated is None:
+            return
+        if vdm_field_type not in ['FLAG', 'THRESHOLD']:
+            return
+
+        # Retrieve VDM data from the database
+        vdm_halarm_db_dict = state_db.get_all(state_db.STATE_DB, f'TRANSCEIVER_VDM_HALARM_{vdm_field_type}|{interface_name}') or {}
+        vdm_lalarm_db_dict = state_db.get_all(state_db.STATE_DB, f'TRANSCEIVER_VDM_LALARM_{vdm_field_type}|{interface_name}') or {}
+        vdm_hwarning_db_dict = state_db.get_all(state_db.STATE_DB, f'TRANSCEIVER_VDM_HWARN_{vdm_field_type}|{interface_name}') or {}
+        vdm_lwarning_db_dict = state_db.get_all(state_db.STATE_DB, f'TRANSCEIVER_VDM_LWARN_{vdm_field_type}|{interface_name}') or {}
+
+        # Define threshold types and their corresponding dictionaries
+        VDM_THRESHOLD_TYPES = {
+            'highalarm': vdm_halarm_db_dict,
+            'lowalarm': vdm_lalarm_db_dict,
+            'highwarning': vdm_hwarning_db_dict,
+            'lowwarning': vdm_lwarning_db_dict
+        }
+
+        # Process each VDM field and update the dictionary
+        for vdm_field, legacy_field_prefix in vdm_to_legacy_field_map.items():
+            for threshold_type, vdm_db_dict in VDM_THRESHOLD_TYPES.items():
+                if vdm_field in vdm_db_dict:
+                    if vdm_field_type == 'FLAG':
+                        legacy_field_name = f"{legacy_field_prefix}{threshold_type}_flag"
+                    else:
+                        legacy_field_name = f"{legacy_field_prefix}{threshold_type}"
+                    dict_to_be_updated[legacy_field_name] = vdm_db_dict[vdm_field]
+
     # Convert sfp status info in DB to cli output string
     def convert_interface_sfp_status_to_cli_output_string(self, state_db, interface_name):
-        sfp_status_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS|{}'.format(interface_name))
+        first_subport = platform_sfputil_helper.get_first_subport(interface_name)
+        if first_subport is None:
+            click.echo("Error: Unable to get first subport for {} while converting SFP status".format(interface_name))
+            output = QSFP_STATUS_NOT_APPLICABLE_STR + '\n'
+            return output
+
+        sfp_status_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS|{}'.format(first_subport))
+        if sfp_status_dict:
+            # Additional handling to ensure that the CLI output remains the same
+            # after restructuring the diagnostic data in the state DB
+            sfp_status_dict.update(state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS_SW|{}'.format(interface_name)) or {})
+            sfp_status_dict.update(state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS_FLAG|{}'.format(first_subport)) or {})
+            sfp_status_dict.update(state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_DOM_FLAG|{}'.format(first_subport)) or {})
         if sfp_status_dict and len(sfp_status_dict) > 2:
             # common section
             output = '\n' + self.convert_sfp_status_to_output_string(sfp_status_dict, QSFP_STATUS_MAP)
             # CMIS specific section
             if 'module_state' in sfp_status_dict:
+                self.convert_vdm_fields_to_legacy_fields(state_db, first_subport, sfp_status_dict, CMIS_VDM_TO_LEGACY_STATUS_MAP, 'FLAG')
                 output += self.convert_sfp_status_to_output_string(sfp_status_dict, CMIS_STATUS_MAP)
             # C-CMIS specific section
             if 'tuning_in_progress' in sfp_status_dict:
+                self.convert_vdm_fields_to_legacy_fields(state_db, first_subport, sfp_status_dict, CCMIS_VDM_TO_LEGACY_STATUS_MAP, 'FLAG')
                 output += self.convert_sfp_status_to_output_string(sfp_status_dict, CCMIS_STATUS_MAP)
         else:
             output = QSFP_STATUS_NOT_APPLICABLE_STR + '\n'
@@ -510,10 +578,18 @@ class SFPShow(object):
             return str(field)
 
     def convert_interface_sfp_pm_to_cli_output_string(self, state_db, interface_name):
+        first_subport = platform_sfputil_helper.get_first_subport(interface_name)
+        if first_subport is None:
+            click.echo("Error: Unable to get first subport for {} while converting SFP PM".format(interface_name))
+            output = ZR_PM_NOT_APPLICABLE_STR + '\n'
+            return output
+
         sfp_pm_dict = state_db.get_all(
-            self.db.STATE_DB, 'TRANSCEIVER_PM|{}'.format(interface_name))
+            self.db.STATE_DB, 'TRANSCEIVER_PM|{}'.format(first_subport))
         sfp_threshold_dict = state_db.get_all(
-            state_db.STATE_DB, 'TRANSCEIVER_DOM_THRESHOLD|{}'.format(interface_name))
+            state_db.STATE_DB, 'TRANSCEIVER_DOM_THRESHOLD|{}'.format(first_subport))
+        # Convert VDM THRESHOLD fields to legacy DOM THRESHOLD fields
+        self.convert_vdm_fields_to_legacy_fields(state_db, first_subport, sfp_threshold_dict, CCMIS_VDM_THRESHOLD_TO_LEGACY_DOM_THRESHOLD_MAP, 'THRESHOLD')
         table = []
         indent_num = 4
         indent = ' ' * indent_num
@@ -645,7 +721,12 @@ class SFPShow(object):
 @click.group()
 def cli():
     """sfpshow - Command line utility for display SFP transceivers information"""
-    pass
+    # Load platform-specific sfputil class
+    platform_sfputil_helper.load_platform_sfputil()
+
+    # Load port info
+    platform_sfputil_helper.platform_sfputil_read_porttab_mappings()
+
 
 # 'eeprom' subcommand
 
 
@@ -22,6 +22,10 @@
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 from natsort import natsorted
 from sonic_py_common import device_info, logger, multi_asic
+from utilities_common import platform_sfputil_helper
+from utilities_common.platform_sfputil_helper import (
+    get_first_subport
+)
 from utilities_common.sfp_helper import covert_application_advertisement_to_output_string
 from utilities_common.sfp_helper import QSFP_DATA_MAP
 from tabulate import tabulate
@@ -605,6 +609,11 @@ def cli():
     if not load_port_config():
         sys.exit(ERROR_PORT_CONFIG_LOAD)
 
+    # Generic way to load platform-specific sfputil
+    # and chassis classes
+    platform_sfputil_helper.load_platform_sfputil()
+    platform_sfputil_helper.load_chassis()
+    platform_sfputil_helper.platform_sfputil_read_porttab_mappings()
 
 cli.add_command(debug)
 
@@ -691,9 +700,10 @@ def eeprom(port, dump_dom, namespace):
                             output += "DOM values not supported for flat memory module\n"
                             continue
                     try:
-                        xcvr_dom_info = platform_chassis.get_sfp(physical_port).get_transceiver_bulk_status()
+                        xcvr_dom_info = platform_chassis.get_sfp(physical_port).get_transceiver_dom_real_value()
                     except NotImplementedError:
-                        click.echo("Sfp.get_transceiver_bulk_status() is currently not implemented for this platform")
+                        click.echo("Sfp.get_transceiver_dom_real_value() is currently not implemented "
+                                   "for this platform")
                         sys.exit(ERROR_NOT_IMPLEMENTED)
 
                     try:
@@ -1073,9 +1083,9 @@ def fetch_error_status_from_state_db(port, state_db):
     """
     status = {}
     if port:
-        status[port] = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS|{}'.format(port))
+        status[port] = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS_SW|{}'.format(port))
     else:
-        ports = state_db.keys(state_db.STATE_DB, 'TRANSCEIVER_STATUS|*')
+        ports = state_db.keys(state_db.STATE_DB, 'TRANSCEIVER_STATUS_SW|*')
         for key in ports:
             status[key.split('|')[1]] = state_db.get_all(state_db.STATE_DB, key)
 
@@ -1380,7 +1390,11 @@ def enable(port_name):
 
 
 def update_firmware_info_to_state_db(port_name):
-    physical_port = logical_port_to_physical_port_index(port_name)
+    first_subport = get_first_subport(port_name)
+    if first_subport is None:
+        click.echo("Error: Unable to get first subport for {} while updating FW info to DB".format(port_name))
+        return
+    physical_port = logical_port_to_physical_port_index(first_subport)
 
     namespaces = multi_asic.get_front_end_namespaces()
     for namespace in namespaces:
@@ -1390,7 +1404,7 @@ def update_firmware_info_to_state_db(port_name):
             transceiver_firmware_info_dict = platform_chassis.get_sfp(physical_port).get_transceiver_info_firmware_versions()
             if transceiver_firmware_info_dict is not None:
                 for key, value in transceiver_firmware_info_dict.items():
-                    state_db.set(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(port_name), key, value)
+                    state_db.set(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(first_subport), key, value)
 
 # 'firmware' subgroup
 @cli.group()
 
@@ -33,9 +33,17 @@ def mock_platform_sfputil_read_porttab_mappings():
         portMap = jsonobj['portMap']
         RJ45Ports = jsonobj['RJ45Ports']
 
+
+def mock_get_first_subport(logical_port_name):
+    """
+    Mock function to get the first subport of a logical port.
+    """
+    return logical_port_name
+
 def mock_platform_sfputil_helper():
     platform_sfputil_helper.platform_chassis = mock_Chassis()
     platform_sfputil_helper.platform_sfputil = True
     platform_sfputil_helper.platform_porttab_mapping_read = False
     platform_sfputil_helper.platform_sfputil_read_porttab_mappings = mock_platform_sfputil_read_porttab_mappings
     platform_sfputil_helper.logical_port_name_to_physical_port_list = mock_logical_port_name_to_physical_port_list
+    platform_sfputil_helper.get_first_subport = mock_get_first_subport