Fix missing PSU fans in test_psu_fan.py (sonic-net#17641)

Description of PR
Summary:
Fixes problem with missing PSU in test_psu_fan.py

Approach
What is the motivation for this PR?
Failing testcases in test_psu_fan.py

How did you do it?
Used the same approach as in test_psu.py

How did you verify/test it?
Run testcases in T0-100G

Signed-off-by: Eduard Yakubchyk <eyakubch@cisco.com>

Author: eyakubch

tests/platform_tests/api/conftest.py

@@ -1,13 +1,21 @@
 import os
 import pytest
 
+from tests.common.helpers.platform_api import psu
 from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer
 
 SERVER_FILE = 'platform_api_server.py'
 SERVER_PORT = 8000
 
 IPTABLES_DELETE_RULE_CMD = 'iptables -D INPUT -p tcp -m tcp --dport {} -j ACCEPT'.format(SERVER_PORT)
 
+def skip_absent_psu(psu_num, platform_api_conn, psu_skip_list, logger):    # noqa F811
+    name = psu.get_name(platform_api_conn, psu_num)
+    if name in psu_skip_list:
+        logger.info("Skipping PSU {} since it is part of psu_skip_list".format(name))
+        return True
+    return False
+
 
 @pytest.fixture(scope='module', autouse=True)
 def stop_platform_api_service(duthosts):

tests/platform_tests/api/test_psu.py

@@ -7,8 +7,10 @@
 from tests.platform_tests.cli.util import get_skip_mod_list
 from .platform_api_test_base import PlatformApiTestBase
 from tests.common.utilities import skip_release_for_platform, wait_until
+from tests.platform_tests.api.conftest import skip_absent_psu
 from tests.common.platform.device_utils import platform_api_conn, start_platform_api_service    # noqa F401
 
+
 ###################################################
 # TODO: Remove this after we transition to Python 3
 import sys
@@ -81,13 +83,6 @@ def get_psu_facts(self, duthost, psu_idx, def_value, *keys):
 
         return def_value
 
-    def skip_absent_psu(self, psu_num, platform_api_conn):    # noqa F811
-        name = psu.get_name(platform_api_conn, psu_num)
-        if name in self.psu_skip_list:
-            logger.info("Skipping PSU {} since it is part of psu_skip_list".format(name))
-            return True
-        return False
-
     def get_psu_parameter(self, psu_info, psu_parameter, get_data, message):
         data = None
         is_supported = self.get_psu_facts(psu_info["duthost"], psu_info["psu_id"], True, psu_parameter)
@@ -105,7 +100,7 @@ def get_psu_parameter(self, psu_info, psu_parameter, get_data, message):
     def test_get_name(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):    # noqa F811
         duthost = duthosts[enum_rand_one_per_hwsku_hostname]
         for i in range(self.num_psus):
-            if self.skip_absent_psu(i, platform_api_conn):
+            if skip_absent_psu(i, platform_api_conn, self.psu_skip_list, logger):
                 continue
             name = psu.get_name(platform_api_conn, i)
             if self.expect(name is not None, "Unable to retrieve PSU {} name".format(i)):
@@ -128,7 +123,7 @@ def test_get_presence(self, duthosts, enum_rand_one_per_hwsku_hostname, localhos
 
     def test_get_model(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):   # noqa F811
         for i in range(self.num_psus):
-            if self.skip_absent_psu(i, platform_api_conn):
+            if skip_absent_psu(i, platform_api_conn, self.psu_skip_list, logger):
                 continue
             model = psu.get_model(platform_api_conn, i)
             if self.expect(model is not None, "Unable to retrieve PSU {} model".format(i)):
@@ -137,7 +132,7 @@ def test_get_model(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost,
 
     def test_get_serial(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):  # noqa F811
         for i in range(self.num_psus):
-            if self.skip_absent_psu(i, platform_api_conn):
+            if skip_absent_psu(i, platform_api_conn, self.psu_skip_list, logger):
                 continue
             serial = psu.get_serial(platform_api_conn, i)
             if self.expect(serial is not None, "Unable to retrieve PSU {} serial number".format(i)):
@@ -148,7 +143,7 @@ def test_get_revision(self, duthosts, enum_rand_one_per_hwsku_hostname, localhos
         duthost = duthosts[enum_rand_one_per_hwsku_hostname]
         skip_release(duthost, ["201811", "201911", "202012"])
         for i in range(self.num_psus):
-            if self.skip_absent_psu(i, platform_api_conn):
+            if skip_absent_psu(i, platform_api_conn, self.psu_skip_list, logger):
                 continue
             revision = psu.get_revision(platform_api_conn, i)
             if self.expect(revision is not None, "Unable to retrieve PSU {} serial number".format(i)):
@@ -157,7 +152,7 @@ def test_get_revision(self, duthosts, enum_rand_one_per_hwsku_hostname, localhos
 
     def test_get_status(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):  # noqa F811
         for i in range(self.num_psus):
-            if self.skip_absent_psu(i, platform_api_conn):
+            if skip_absent_psu(i, platform_api_conn, self.psu_skip_list, logger):
                 continue
             status = psu.get_status(platform_api_conn, i)
             if self.expect(status is not None, "Unable to retrieve PSU {} status".format(i)):
@@ -166,7 +161,7 @@ def test_get_status(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost,
 
     def test_get_position_in_parent(self, platform_api_conn):     # noqa F811
         for psu_id in range(self.num_psus):
-            if self.skip_absent_psu(psu_id, platform_api_conn):
+            if skip_absent_psu(psu_id, platform_api_conn, self.psu_skip_list, logger):
                 continue
             position = psu.get_position_in_parent(platform_api_conn, psu_id)
             if self.expect(position is not None,
@@ -177,7 +172,7 @@ def test_get_position_in_parent(self, platform_api_conn):     # noqa F811
 
     def test_is_replaceable(self, platform_api_conn):     # noqa F811
         for psu_id in range(self.num_psus):
-            if self.skip_absent_psu(psu_id, platform_api_conn):
+            if skip_absent_psu(psu_id, platform_api_conn, self.psu_skip_list, logger):
                 continue
             replaceable = psu.is_replaceable(platform_api_conn, psu_id)
             if self.expect(replaceable is not None,
@@ -337,7 +332,7 @@ def test_led(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platfo
 
         psus_skipped = 0
         for psu_id in range(self.num_psus):
-            if self.skip_absent_psu(psu_id, platform_api_conn):
+            if skip_absent_psu(psu_id, platform_api_conn, self.psu_skip_list, logger):
                 continue
             name = psu.get_name(platform_api_conn, psu_id)
             led_support = duthost.facts.get("chassis").get("psus")[psu_id].get("led")
@@ -398,7 +393,7 @@ def test_led(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platfo
 
     def test_thermals(self, platform_api_conn):   # noqa F811
         for psu_id in range(self.num_psus):
-            if self.skip_absent_psu(psu_id, platform_api_conn):
+            if skip_absent_psu(psu_id, platform_api_conn, self.psu_skip_list, logger):
                 continue
             try:
                 num_thermals = int(psu.get_num_thermals(platform_api_conn, psu_id))

tests/platform_tests/api/test_psu_fans.py

@@ -5,6 +5,8 @@
 import pytest
 
 from tests.common.helpers.platform_api import chassis, psu, psu_fan
+from tests.platform_tests.cli.util import get_skip_mod_list
+from tests.platform_tests.api.conftest import skip_absent_psu
 from tests.common.platform.device_utils import platform_api_conn, start_platform_api_service    # noqa F401
 
 from .platform_api_test_base import PlatformApiTestBase
@@ -46,7 +48,7 @@ class TestPsuFans(PlatformApiTestBase):
     # level, so we must do the same here to prevent a scope mismatch.
 
     @pytest.fixture(scope="function", autouse=True)
-    def setup(self, platform_api_conn):   # noqa F811
+    def setup(self, platform_api_conn, duthosts, enum_rand_one_per_hwsku_hostname):   # noqa F811
         if self.num_psus is None:
             try:
                 self.num_psus = chassis.get_num_psus(platform_api_conn)
@@ -56,6 +58,9 @@ def setup(self, platform_api_conn):   # noqa F811
                 if self.num_psus == 0:
                     pytest.skip("No psus found on device")
 
+        duthost = duthosts[enum_rand_one_per_hwsku_hostname]
+        self.psu_skip_list = get_skip_mod_list(duthost, ['psus'])
+
     #
     # Helper functions
     #
@@ -99,6 +104,8 @@ def get_fan_facts(self, duthost, psu_idx, fan_idx, def_value, *keys):
     def test_get_name(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):    # noqa F811
         duthost = duthosts[enum_rand_one_per_hwsku_hostname]
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -135,6 +142,8 @@ def test_get_name(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, p
 
     def test_get_presence(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):  # noqa F811
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -151,6 +160,8 @@ def test_get_presence(self, duthosts, enum_rand_one_per_hwsku_hostname, localhos
 
     def test_get_model(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):   # noqa F811
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -163,6 +174,8 @@ def test_get_model(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost,
 
     def test_get_serial(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):  # noqa F811
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -176,6 +189,8 @@ def test_get_serial(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost,
 
     def test_get_status(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):  # noqa F811
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -188,6 +203,8 @@ def test_get_status(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost,
 
     def test_get_position_in_parent(self, platform_api_conn):     # noqa F811
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
             for i in range(num_fans):
                 position = psu_fan.get_position_in_parent(platform_api_conn, j, i)
@@ -199,6 +216,8 @@ def test_get_position_in_parent(self, platform_api_conn):     # noqa F811
 
     def test_is_replaceable(self, platform_api_conn):     # noqa F811
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
             for i in range(num_fans):
                 replaceable = psu_fan.is_replaceable(platform_api_conn, j, i)
@@ -216,6 +235,8 @@ def test_is_replaceable(self, platform_api_conn):     # noqa F811
     def test_get_speed(self, duthosts, enum_rand_one_per_hwsku_hostname, localhost, platform_api_conn):   # noqa F811
         duthost = duthosts[enum_rand_one_per_hwsku_hostname]
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -241,6 +262,8 @@ def test_get_direction(self, duthosts, enum_rand_one_per_hwsku_hostname, localho
         ]
 
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
 
             for i in range(num_fans):
@@ -257,6 +280,8 @@ def test_get_fans_target_speed(self, duthosts, enum_rand_one_per_hwsku_hostname,
         psus_skipped = 0
 
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
             fans_skipped = 0
 
@@ -297,6 +322,8 @@ def test_set_fans_speed(self, duthosts, enum_rand_one_per_hwsku_hostname, localh
         psus_skipped = 0
 
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             target_speed = random.randint(1, 100)
             num_fans = psu.get_num_fans(platform_api_conn, j)
             fans_skipped = 0
@@ -344,6 +371,8 @@ def test_set_fans_led(self, duthosts, enum_rand_one_per_hwsku_hostname, localhos
         psus_skipped = 0
 
         for j in range(self.num_psus):
+            if skip_absent_psu(j, platform_api_conn, self.psu_skip_list, logger):
+                continue
             num_fans = psu.get_num_fans(platform_api_conn, j)
             fans_skipped = 0