Merge remote-tracking branch 'base/202411' into code-sync-202412

Author: r12f

tests/sonic_xcvr/test_cmis.py

@@ -3010,7 +3010,7 @@ def test_set_application(self):
             'ConfigStatusLane5': 'ConfigSuccess',
             'ConfigStatusLane6': 'ConfigSuccess',
             'ConfigStatusLane7': 'ConfigSuccess',
-            'ConfigStatusLane8': 'ConfigSuccess' 
+            'ConfigStatusLane8': 'ConfigSuccess'
           } )
     ])
     def test_decommission_all_datapaths(self, datapath_state, config_state):
@@ -3152,7 +3152,7 @@ def test_get_error_description(self):
 
             result = self.api.get_error_description()
             assert result is 'OK'
-            
+
             self.api.get_config_datapath_hostlane_status.return_value = {
                 'ConfigStatusLane1': 'ConfigRejected',
                 'ConfigStatusLane2': 'ConfigRejected',
@@ -3165,7 +3165,7 @@ def test_get_error_description(self):
             }
             result = self.api.get_error_description()
             assert result is 'ConfigRejected'
-            
+
             self.api.get_datapath_state.return_value = {
                 'DP1State': 'DataPathDeactivated',
                 'DP2State': 'DataPathActivated',