Remove logic about led trigger as the hw-mgmt is not upgraded yet

Author: Junchao-Mellanox

platform/mellanox/mlnx-platform-api/sonic_platform/led.py

@@ -89,62 +89,30 @@ def _set_status_blink(self, color, led_cap_list):
                 return False
 
         if Led.STATUS_LED_COLOR_GREEN_BLINK == color:
-            self._trigger_blink(self.get_green_led_trigger())
             return self._set_led_blink_status(self.get_green_led_delay_on_path(), self.get_green_led_delay_off_path(), Led.LED_BLINK)
         elif Led.STATUS_LED_COLOR_RED_BLINK == color:
-            self._trigger_blink(self.get_red_led_trigger())
             return self._set_led_blink_status(self.get_red_led_delay_on_path(), self.get_red_led_delay_off_path(), Led.LED_BLINK)
         elif Led.STATUS_LED_COLOR_ORANGE_BLINK == color:
-            self._trigger_blink(self.get_orange_led_trigger())
             return self._set_led_blink_status(self.get_orange_led_delay_on_path(), self.get_orange_led_delay_off_path(), Led.LED_BLINK)
         else:
             return False
 
     def _stop_blink(self, led_cap_list):
         try:
             if Led.STATUS_LED_COLOR_GREEN_BLINK in led_cap_list:
-                self._untrigger_blink(self.get_green_led_trigger())
+                self._set_led_blink_status(self.get_green_led_delay_on_path(), self.get_green_led_delay_off_path(), Led.LED_OFF)
             if Led.STATUS_LED_COLOR_RED_BLINK in led_cap_list:
-                self._untrigger_blink(self.get_red_led_trigger())
+                self._set_led_blink_status(self.get_red_led_delay_on_path(), self.get_red_led_delay_off_path(), Led.LED_OFF)
             if Led.STATUS_LED_COLOR_ORANGE_BLINK in led_cap_list:
-                self._untrigger_blink(self.get_orange_led_trigger())
+                self._set_led_blink_status(self.get_orange_led_delay_on_path(), self.get_orange_led_delay_off_path(), Led.LED_OFF)
         except Exception as e:
             return
 
-    def _trigger_blink(self, blink_trigger_file):
-        utils.write_file(blink_trigger_file, 'timer')
-
-    def _untrigger_blink(self, blink_trigger_file):
-        utils.write_file(blink_trigger_file, 'none')
-
     def _set_led_blink_status(self, delay_on_file, delay_off_file, value):
-        if not self._wait_files_ready((delay_on_file, delay_off_file)):
-            return False
-
         utils.write_file(delay_on_file, value)
         utils.write_file(delay_off_file, value)
         return True
 
-    def _wait_files_ready(self, file_list):
-        """delay_off and delay_on sysfs will be available only if _trigger_blink is called. And once 
-           _trigger_blink is called, driver might need time to prepare delay_off and delay_on. So,
-           need wait a few seconds here to make sure the sysfs is ready
-
-        Args:
-            file_list (list of str): files to be checked
-        """
-        wait_time = 5.0
-        initial_sleep = 0.01
-        while wait_time > 0:
-            if all([os.path.exists(x) for x in file_list]):
-                return True
-            time.sleep(initial_sleep)
-            wait_time -= initial_sleep
-            initial_sleep = initial_sleep * 2
-        
-        logger.log_error('Failed to set led link because symbol link is not ready in {} seconds: {}'.format(wait_time, file_list))
-        return False
-
     def get_status(self):
         led_cap_list = self.get_capability()
         if led_cap_list is None:

platform/mellanox/mlnx-platform-api/tests/test_led.py

@@ -36,13 +36,12 @@
 class TestLed:
     def test_chassis_led(self):
         chassis = Chassis()
-        assert chassis._led is None  
+        assert chassis._led is None
         assert chassis.set_status_led('red') is False
         physical_led = chassis._led
         assert physical_led is not None
         self._verify_non_shared_led(physical_led, chassis)
-        
-    @mock.patch('sonic_platform.led.Led._wait_files_ready', mock.MagicMock(return_value=True))
+
     def _verify_non_shared_led(self, physical_led, obj):
         mock_file_content = self._mock_led_file_content(physical_led)
 
@@ -67,7 +66,7 @@ def mock_write_file(file_path, content, **kwargs):
 
         assert obj.set_status_led(Led.STATUS_LED_COLOR_RED_BLINK)
         assert obj.get_status_led() == Led.STATUS_LED_COLOR_RED_BLINK
-        
+
         mock_file_content[physical_led.get_red_led_delay_off_path()] = Led.LED_OFF
         mock_file_content[physical_led.get_red_led_delay_on_path()] = Led.LED_OFF
 
@@ -144,9 +143,3 @@ def test_fixed_psu_led(self):
         psu = FixedPsu(0)
         physical_led = psu.led
         self._verify_non_shared_led(physical_led, psu)
-
-    @mock.patch('os.path.exists', mock.MagicMock(side_effect=[False, False, False, True, True, True]))
-    @mock.patch('time.sleep', mock.MagicMock())
-    def test_wait_file_ready(self):
-        led = Led()
-        assert led._wait_files_ready(['f1', 'f2'])