Fix port SI setting per speed during speed change

This change fixes the issue of port media settings not getting applied
when speed change command is issued in CLI.

Signed-off-by: Pavan Naregundi <[email protected]>

Author: pavannaregundi

sonic-xcvrd/xcvrd/xcvrd.py

@@ -1998,6 +1998,8 @@ def on_port_config_change(self , port_change_event):
         elif port_change_event.event_type == port_event_helper.PortChangeEvent.PORT_ADD:
             self.port_mapping.handle_port_change_event(port_change_event)
             self.on_add_logical_port(port_change_event)
+        elif port_change_event.event_type == port_event_helper.PortChangeEvent.PORT_SET:
+            self.on_update_logical_port(port_change_event)
 
     def on_remove_logical_port(self, port_change_event):
         """Called when a logical port is removed from CONFIG_DB.
@@ -2095,6 +2097,31 @@ def on_add_logical_port(self, port_change_event):
             status = sfp_status_helper.SFP_STATUS_REMOVED if not status else status
         update_port_transceiver_status_table_sw(port_change_event.port_name, status_sw_tbl, status, error_description)
 
+    def on_update_logical_port(self, port_change_event):
+        """Called when a logical port is updated.
+           Invoked to update media settings, when port speed is changed.
+
+        Args:
+            port_change_event (object): port change event
+        """
+        int_tbl = self.xcvr_table_helper.get_intf_tbl(port_change_event.asic_id)
+        state_port_table = self.xcvr_table_helper.get_state_port_tbl(port_change_event.asic_id)
+        found, state_port_table_fvs = state_port_table.get(port_change_event.port_name)
+        if not found:
+            helper_logger.log_warning("Logical port {} not found in STATE_DB PORT_TABLE".format(port_change_event.port_name))
+            return
+        # Initialize the NPU_SI_SETTINGS_SYNC_STATUS to default value
+        state_port_table.set(port_change_event.port_name, [(NPU_SI_SETTINGS_SYNC_STATUS_KEY, NPU_SI_SETTINGS_DEFAULT_VALUE)])
+
+        if _wrapper_get_presence(port_change_event.port_index):
+            transceiver_dict = {}
+            rc = post_port_sfp_info_to_db(port_change_event.port_name, self.port_mapping, int_tbl, transceiver_dict)
+            if rc == SFP_EEPROM_NOT_READY:
+                # Failed to read EEPROM, put it to retry set
+                self.retry_eeprom_set.add(port_change_event.port_name)
+            else:
+                media_settings_parser.notify_media_setting(port_change_event.port_name, transceiver_dict, self.xcvr_table_helper, self.port_mapping)
+
     def retry_eeprom_reading(self):
         """Retry EEPROM reading, if retry succeed, remove the logical port from the retry set
         """

sonic-xcvrd/xcvrd/xcvrd_utilities/port_event_helper.py

@@ -225,6 +225,13 @@ def __init__(self):
         self.physical_to_logical = {}
         # Logical port name to ASIC ID mapping
         self.logical_to_asic = {}
+        self.port_event_cache = {}
+
+    def apply_filter_to_fvp(self, filter, fvp):
+        if filter is not None:
+            for key in fvp.copy().keys():
+                if key not in (set(filter) | set({'index', 'port_name', 'asic_id'})):
+                    del fvp[key]
 
     def handle_port_change_event(self, port_change_event):
         if port_change_event.event_type == PortChangeEvent.PORT_ADD:
@@ -313,6 +320,12 @@ def read_port_config_change(asic_context, port_mapping, logger, port_change_even
             fvp = dict(fvp)
             if not multi_asic.is_front_panel_port(key, fvp.get(multi_asic.PORT_ROLE, None)):
                 continue
+
+            fvp['port_name'] = key
+            fvp['asic_id'] = asic_context[port_tbl]
+            filter = ['speed']
+            port_mapping.apply_filter_to_fvp(filter, fvp)
+
             if op == swsscommon.SET_COMMAND:
                 if 'index' not in fvp:
                     continue
@@ -333,6 +346,15 @@ def read_port_config_change(asic_context, port_mapping, logger, port_change_even
 
                         port_change_event = PortChangeEvent(key, new_physical_index, asic_context[port_tbl], PortChangeEvent.PORT_ADD)
                         port_change_event_handler(port_change_event)
+                    else:
+                        if key in port_mapping.port_event_cache:
+                            # Compare current event with last event on this key, to see if
+                            # there's really a need to update.
+                            diff = set(fvp.items()) - set(port_mapping.port_event_cache[key].items())
+                            # Create set event handler if there is a difference
+                            if diff:
+                                port_change_event = PortChangeEvent(key, new_physical_index, asic_context[port_tbl], PortChangeEvent.PORT_SET)
+                                port_change_event_handler(port_change_event)
             elif op == swsscommon.DEL_COMMAND:
                 if port_mapping.is_logical_port(key):
                     port_change_event = PortChangeEvent(key,
@@ -343,6 +365,9 @@ def read_port_config_change(asic_context, port_mapping, logger, port_change_even
             else:
                 logger.log_warning('Invalid DB operation: {}'.format(op))
 
+            # Update the latest event to the cache
+            port_mapping.port_event_cache[key] = fvp
+
 def get_port_mapping(namespaces):
     """Get port mapping from CONFIG_DB
     """