Move test functions to correct section

Author: Junchao-Mellanox

tests/platform_tests/api/test_chassis.py

@@ -135,6 +135,18 @@ def test_get_status(self, duthost, localhost, platform_api_conn):
         pytest_assert(status is not None, "Unable to retrieve chassis status")
         pytest_assert(isinstance(status, bool), "Chassis status appears incorrect")
 
+    def test_get_position_in_parent(self, platform_api_conn):
+        position = chassis.get_position_in_parent(platform_api_conn)
+        if self.expect(position is not None, "Failed to perform get_position_in_parent"):
+            self.expect(isinstance(position, int), "Position value must be an integer value")
+        self.assert_expectations()
+
+    def test_is_replaceable(self, platform_api_conn):
+        replaceable = chassis.is_replaceable(platform_api_conn)
+        if self.expect(replaceable is not None, "Failed to perform is_replaceable"):
+            self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value")
+        self.assert_expectations()
+
     #
     # Functions to test methods defined in ChassisBase class
     #
@@ -381,15 +393,3 @@ def test_get_watchdog(self, duthost, localhost, platform_api_conn):
     def test_get_eeprom(self, duthost, localhost, platform_api_conn):
         eeprom = chassis.get_eeprom(platform_api_conn)
         pytest_assert(eeprom is not None, "Failed to retrieve system EEPROM")
-
-    def test_get_position_in_parent(self, platform_api_conn):
-        position = chassis.get_position_in_parent(platform_api_conn)
-        if self.expect(position is not None, "Failed to perform get_position_in_parent"):
-            self.expect(isinstance(position, int), "Position value must be an integer value")
-        self.assert_expectations()
-
-    def test_is_replaceable(self, platform_api_conn):
-        replaceable = chassis.is_replaceable(platform_api_conn)
-        if self.expect(replaceable is not None, "Failed to perform is_replaceable"):
-            self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value")
-        self.assert_expectations()

tests/platform_tests/api/test_chassis_fans.py

@@ -129,6 +129,20 @@ def test_get_status(self, duthost, localhost, platform_api_conn):
 
         self.assert_expectations()
 
+    def test_get_position_in_parent(self, platform_api_conn):
+        for i in range(self.num_fans):
+            position = fan.get_position_in_parent(platform_api_conn, i)
+            if self.expect(position is not None, "Failed to perform get_position_in_parent for fan {}".format(i)):
+                self.expect(isinstance(position, int), "Position value must be an integer value for fan {}".format(i))
+        self.assert_expectations()
+
+    def test_is_replaceable(self, platform_api_conn):
+        for i in range(self.num_fans):
+            replaceable = fan.is_replaceable(platform_api_conn, i)
+            if self.expect(replaceable is not None, "Failed to perform is_replaceable for fan {}".format(i)):
+                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for fan {}".format(i))
+        self.assert_expectations()
+
     #
     # Functions to test methods defined in FanBase class
     #
@@ -221,17 +235,3 @@ def test_set_fans_led(self, duthost, localhost, platform_api_conn):
                             color, color_actual, i))
 
         self.assert_expectations()
-
-    def test_get_position_in_parent(self, platform_api_conn):
-        for i in range(self.num_fans):
-            position = fan.get_position_in_parent(platform_api_conn, i)
-            if self.expect(position is not None, "Failed to perform get_position_in_parent for fan {}".format(i)):
-                self.expect(isinstance(position, int), "Position value must be an integer value for fan {}".format(i))
-        self.assert_expectations()
-
-    def test_is_replaceable(self, platform_api_conn):
-        for i in range(self.num_fans):
-            replaceable = fan.is_replaceable(platform_api_conn, i)
-            if self.expect(replaceable is not None, "Failed to perform is_replaceable for fan {}".format(i)):
-                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for fan {}".format(i))
-        self.assert_expectations()

tests/platform_tests/api/test_fan_drawer.py

@@ -110,6 +110,20 @@ def test_get_status(self, duthost, localhost, platform_api_conn):
 
         self.assert_expectations()
 
+    def test_get_position_in_parent(self, platform_api_conn):
+        for i in range(self.num_fan_drawers):
+            position = fan_drawer.get_position_in_parent(platform_api_conn, i)
+            if self.expect(position is not None, "Failed to perform get_position_in_parent for fan drawer {}".format(i)):
+                self.expect(isinstance(position, int), "Position value must be an integer value for fan drawer {}".format(i))
+        self.assert_expectations()
+
+    def test_is_replaceable(self, platform_api_conn):
+        for i in range(self.num_fan_drawers):
+            replaceable = fan_drawer.is_replaceable(platform_api_conn, i)
+            if self.expect(replaceable is not None, "Failed to perform is_replaceable for fan drawer {}".format(i)):
+                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for fan drawer {}".format(i))
+        self.assert_expectations()
+
     #
     # Functions to test methods defined in Fan_drawerBase class
     #
@@ -154,17 +168,3 @@ def test_set_fan_drawers_led(self, duthost, localhost, platform_api_conn):
                             color, color_actual, i))
 
         self.assert_expectations()
-
-    def test_get_position_in_parent(self, platform_api_conn):
-        for i in range(self.num_fan_drawers):
-            position = fan_drawer.get_position_in_parent(platform_api_conn, i)
-            if self.expect(position is not None, "Failed to perform get_position_in_parent for fan drawer {}".format(i)):
-                self.expect(isinstance(position, int), "Position value must be an integer value for fan drawer {}".format(i))
-        self.assert_expectations()
-
-    def test_is_replaceable(self, platform_api_conn):
-        for i in range(self.num_fan_drawers):
-            replaceable = fan_drawer.is_replaceable(platform_api_conn, i)
-            if self.expect(replaceable is not None, "Failed to perform is_replaceable for fan drawer {}".format(i)):
-                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for fan drawer {}".format(i))
-        self.assert_expectations()

tests/platform_tests/api/test_psu.py

@@ -111,6 +111,20 @@ def test_get_status(self, duthost, localhost, platform_api_conn):
                 self.expect(isinstance(status, bool), "PSU {} status appears incorrect".format(i))
         self.assert_expectations()
 
+    def test_get_position_in_parent(self, platform_api_conn):
+        for psu_id in range(self.num_psus):
+            position = psu.get_position_in_parent(platform_api_conn, psu_id)
+            if self.expect(position is not None, "Failed to perform get_position_in_parent for psu id {}".format(psu_id)):
+                self.expect(isinstance(position, int), "Position value must be an integer value for psu id {}".format(psu_id))
+        self.assert_expectations()
+
+    def test_is_replaceable(self, platform_api_conn):
+        for psu_id in range(self.num_psus):
+            replaceable = psu.is_replaceable(platform_api_conn, psu_id)
+            if self.expect(replaceable is not None, "Failed to perform is_replaceable for psu id {}".format(psu_id)):
+                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for psu id {}".format(psu_id))
+        self.assert_expectations()
+
     #
     # Functions to test methods defined in PsuBase class
     #
@@ -200,20 +214,6 @@ def test_led(self, duthost, localhost, platform_api_conn):
                         self.expect(color == color_actual, "Status LED color incorrect (expected: {}, actual: {}) from PSU {}".format(color, color_actual, psu_id))
         self.assert_expectations()
 
-    def test_get_position_in_parent(self, platform_api_conn):
-        for psu_id in range(self.num_psus):
-            position = psu.get_position_in_parent(platform_api_conn, psu_id)
-            if self.expect(position is not None, "Failed to perform get_position_in_parent for psu id {}".format(psu_id)):
-                self.expect(isinstance(position, int), "Position value must be an integer value for psu id {}".format(psu_id))
-        self.assert_expectations()
-
-    def test_is_replaceable(self, platform_api_conn):
-        for psu_id in range(self.num_psus):
-            replaceable = psu.is_replaceable(platform_api_conn, psu_id)
-            if self.expect(replaceable is not None, "Failed to perform is_replaceable for psu id {}".format(psu_id)):
-                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for psu id {}".format(psu_id))
-        self.assert_expectations()
-
     def test_thermals(self, platform_api_conn):
         for psu_id in range(self.num_psus):
             try:

tests/platform_tests/api/test_sfp.py

@@ -177,6 +177,20 @@ def test_get_status(self, duthost, localhost, platform_api_conn):
                 self.expect(isinstance(status, bool), "Transceiver {} status appears incorrect".format(i))
         self.assert_expectations()
 
+    def test_get_position_in_parent(self, platform_api_conn):
+        for i in range(self.num_sfps):
+            position = sfp.get_position_in_parent(platform_api_conn, i)
+            if self.expect(position is not None, "Failed to perform get_position_in_parent for sfp {}".format(i)):
+                self.expect(isinstance(position, int), "Position value must be an integer value for sfp {}".format(i))
+        self.assert_expectations()
+
+    def test_is_replaceable(self, platform_api_conn):
+        for sfp_id in range(self.num_sfps):
+            replaceable = sfp.is_replaceable(platform_api_conn, sfp_id)
+            if self.expect(replaceable is not None, "Failed to perform is_replaceable for sfp {}".format(sfp_id)):
+                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for sfp {}".format(sfp_id))
+        self.assert_expectations()
+
     #
     # Functions to test methods defined in SfpBase class
     #
@@ -424,20 +438,6 @@ def test_power_override(self, duthost, localhost, platform_api_conn):
                 self.expect(power_override is False, "Transceiver {} power override data is incorrect".format(i))
         self.assert_expectations()
 
-    def test_get_position_in_parent(self, platform_api_conn):
-        for i in range(self.num_sfps):
-            position = sfp.get_position_in_parent(platform_api_conn, i)
-            if self.expect(position is not None, "Failed to perform get_position_in_parent for sfp {}".format(i)):
-                self.expect(isinstance(position, int), "Position value must be an integer value for sfp {}".format(i))
-        self.assert_expectations()
-
-    def test_is_replaceable(self, platform_api_conn):
-        for sfp_id in range(self.num_sfps):
-            replaceable = sfp.is_replaceable(platform_api_conn, sfp_id)
-            if self.expect(replaceable is not None, "Failed to perform is_replaceable for sfp {}".format(sfp_id)):
-                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for sfp {}".format(sfp_id))
-        self.assert_expectations()
-
     def test_thermals(self, platform_api_conn):
         for sfp_id in range(self.num_sfps):
             try:

tests/platform_tests/api/test_thermal.py

@@ -118,6 +118,20 @@ def test_get_status(self, duthost, localhost, platform_api_conn):
 
         self.assert_expectations()
 
+    def test_get_position_in_parent(self, platform_api_conn):
+        for i in range(self.num_thermals):
+            position = thermal.get_position_in_parent(platform_api_conn, i)
+            if self.expect(position is not None, "Failed to perform get_position_in_parent for thermal {}".format(i)):
+                self.expect(isinstance(position, int), "Position value must be an integer value for thermal {}".format(i))
+        self.assert_expectations()
+
+    def test_is_replaceable(self, platform_api_conn):
+        for i in range(self.num_thermals):
+            replaceable = thermal.is_replaceable(platform_api_conn, i)
+            if self.expect(replaceable is not None, "Failed to perform is_replaceable for thermal {}".format(i)):
+                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for thermal {}".format(i))
+        self.assert_expectations()
+
     #
     # Functions to test methods defined in ThermalBase class
     #
@@ -206,17 +220,3 @@ def test_set_high_threshold(self, duthost, localhost, platform_api_conn):
                     self.expect(temperature == 80,
                                 "Thermal {} high threshold {} is not matching the set value {}".format(i, temperature, high_temperature))
         self.assert_expectations()
-
-    def test_get_position_in_parent(self, platform_api_conn):
-        for i in range(self.num_thermals):
-            position = thermal.get_position_in_parent(platform_api_conn, i)
-            if self.expect(position is not None, "Failed to perform get_position_in_parent for thermal {}".format(i)):
-                self.expect(isinstance(position, int), "Position value must be an integer value for thermal {}".format(i))
-        self.assert_expectations()
-
-    def test_is_replaceable(self, platform_api_conn):
-        for i in range(self.num_thermals):
-            replaceable = thermal.is_replaceable(platform_api_conn, i)
-            if self.expect(replaceable is not None, "Failed to perform is_replaceable for thermal {}".format(i)):
-                self.expect(isinstance(replaceable, bool), "Replaceable value must be a bool value for thermal {}".format(i))
-        self.assert_expectations()