[202311][PR: 14370] Move all paltform test conditional marks to tests_mark_conditions_platform_tests.yaml

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -1046,128 +1046,6 @@ pfcwd/test_pfcwd_warm_reboot.py:
         - "'dualtor' in topo_name"
         - https://github.com/sonic-net/sonic-mgmt/issues/8400
 
-#######################################
-#####         platform_tests      #####
-#######################################
-platform_tests/api/test_psu.py::test_temperature:
-  skip:
-    reason: "Test not supported on Mellanox Platforms."
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/api/test_sfp.py::TestSfpApi::test_reset:
-  skip:
-    reason: "platform does not support sfp reset"
-    conditions:
-      - "platform in ['x86_64-cel_e1031-r0']"
-
-platform_tests/api/test_sfp.py::TestSfpApi::test_tx_disable_channel:
-  skip:
-    reason: "platform does not support"
-    conditions:
-      - "platform in ['x86_64-cel_e1031-r0']"
-
-platform_tests/cli/test_show_platform.py::test_show_platform_psustatus:
-  skip:
-    reason: "Test should be skipped on DPU for it doesn't have PSUs."
-    conditions: "'nvda_bf' in platform"
-
-platform_tests/cli/test_show_platform.py::test_show_platform_psustatus_json:
-  skip:
-    reason: "Test should be skipped on DPU for it doesn't have PSUs."
-    conditions: "'nvda_bf' in platform"
-
-platform_tests/daemon/test_chassisd.py:
-  skip:
-    reason: "chassisd platform daemon introduced in 202106"
-    conditions:
-      - "release in ['201811', '201911', '202012']"
-
-platform_tests/mellanox/test_check_sfp_using_ethtool.py:
-  skip:
-    reason: "Deprecated as Mellanox do not use ethtool in release 202305 or higher"
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/sfp/test_sfputil.py::test_check_sfputil_low_power_mode:
-  skip:
-    reason: "Get/Set low power mode is not supported in Cisco 8000 platform"
-    conditions:
-      - "platform in ['x86_64-cel_e1031-r0']"
-
-platform_tests/sfp/test_sfputil.py::test_check_sfputil_reset:
-  skip:
-    reason: "platform does not support sfp reset"
-    conditions:
-      - "platform in ['x86_64-cel_e1031-r0'] or 't2' in topo_name"
-      - https://github.com/sonic-net/sonic-mgmt/issues/6218
-
-
-platform_tests/test_auto_negotiation.py:
-  skip:
-    reason: "auto negotiation test highly depends on test enviroments, file issue to track and skip for now"
-    conditions: https://github.com/sonic-net/sonic-mgmt/issues/5447
-
-platform_tests/test_cont_warm_reboot.py:
-  skip:
-    reason: "Warm Reboot is not supported in dualtor"
-    conditions:
-      - "'dualtor' in topo_name"
-
-platform_tests/test_platform_info.py::test_show_platform_fanstatus_mocked:
-  skip:
-    reason: "Test not supported on Mellanox Platforms."
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/test_platform_info.py::test_show_platform_temperature_mocked:
-  skip:
-    reason: "Test not supported on Mellanox Platforms."
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/test_platform_info.py::test_thermal_control_fan_status:
-  skip:
-    reason: "Test not supported on Mellanox Platforms."
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/test_platform_info.py::test_thermal_control_load_invalid_format_json:
-  skip:
-    reason: "Test not supported on Mellanox Platforms."
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/test_platform_info.py::test_thermal_control_load_invalid_value_json:
-  skip:
-    reason: "Test not supported on Mellanox Platforms."
-    conditions:
-      - "asic_type in ['mellanox']"
-
-platform_tests/test_reboot.py::test_fast_reboot:
-  skip:
-    reason: "Fast reboot is broken on dualtor topology. Skipping for now."
-    conditions:
-      - "'dualtor' in topo_name and https://github.com/sonic-net/sonic-buildimage/issues/16502"
-
-platform_tests/test_reboot.py::test_warm_reboot:
-  skip:
-    reason: "Warm reboot is broken on dualtor topology. Skipping for now."
-    conditions:
-      - "'dualtor' in topo_name and https://github.com/sonic-net/sonic-buildimage/issues/16502"
-
-platform_tests/test_reload_config.py::test_reload_configuration_checks:
-  xfail:
-    reason: "Known testcase issue in Cisco platforms."
-    conditions:
-      - "asic_type in ['cisco-8000']"
-
-platform_tests/test_service_warm_restart.py:
-  skip:
-    reason: "Testcase ignored due to sonic-mgmt issue: https://github.com/sonic-net/sonic-mgmt/issues/10362"
-    conditions:
-      - "https://github.com/sonic-net/sonic-mgmt/issues/10362"
-
 #######################################
 #####     process_monitoring      #####
 #######################################

tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml

@@ -371,6 +371,12 @@ platform_tests/api/test_psu.py::TestPsuApi::test_temperature:
 #######################################
 #####    api/test_psu_fans.py     #####
 #######################################
+platform_tests/api/test_psu.py::test_temperature:
+  skip:
+    reason: "Test not supported on Mellanox Platforms."
+    conditions:
+      - "asic_type in ['mellanox']"
+
 platform_tests/api/test_psu_fans.py::TestPsuFans::test_get_error_description:
   xfail:
     reason: "Testcase consistently fails, raised issue to track"
@@ -516,8 +522,10 @@ platform_tests/api/test_sfp.py::TestSfpApi::test_power_override:
 platform_tests/api/test_sfp.py::TestSfpApi::test_reset:
   skip:
     reason: "Unsupported platform API"
+    conditions_logical_operator: or
     conditions:
       - "'sw_to3200k' in hwsku"
+      - "platform in ['x86_64-cel_e1031-r0']"
 
 platform_tests/api/test_sfp.py::TestSfpApi::test_thermals:
   skip:
@@ -535,7 +543,7 @@ platform_tests/api/test_sfp.py::TestSfpApi::test_tx_disable_channel:
   skip:
     reason: "Unsupported platform API"
     conditions:
-      - "asic_type in ['mellanox'] or (asic_type in ['barefoot'] and hwsku in ['newport']) or platform in ['armhf-nokia_ixs7215_52x-r0']"
+      - "asic_type in ['mellanox'] or (asic_type in ['barefoot'] and hwsku in ['newport']) or platform in ['armhf-nokia_ixs7215_52x-r0', 'x86_64-cel_e1031-r0']"
 
 #######################################
 #####     api/test_thermal.py     #####
@@ -683,13 +691,19 @@ platform_tests/cli/test_show_platform.py::test_show_platform_psustatus:
     conditions:
       - "hwsku in ['Celestica-DX010-C32']"
       - https://github.com/sonic-net/sonic-mgmt/issues/6518
+  skip:
+    reason: "Test should be skipped on DPU for it doesn't have PSUs."
+    conditions: "'nvda_bf' in platform"
 
 platform_tests/cli/test_show_platform.py::test_show_platform_psustatus_json:
   xfail:
     reason: "Testcase consistently fails, raised issue to track"
     conditions:
       - "hwsku in ['Celestica-DX010-C32']"
       - https://github.com/sonic-net/sonic-mgmt/issues/6518
+  skip:
+    reason: "Test should be skipped on DPU for it doesn't have PSUs."
+    conditions: "'nvda_bf' in platform"
 
 platform_tests/cli/test_show_platform.py::test_show_platform_syseeprom:
   xfail:
@@ -708,8 +722,14 @@ platform_tests/counterpoll/test_counterpoll_watermark.py::test_counterpoll_queue
       - "topo_type in ['m0', 'mx']"
 
 #######################################
-#####  daemon/test_syseepromd.py  #####
+#####            daemon           #####
 #######################################
+platform_tests/daemon/test_chassisd.py:
+  skip:
+    reason: "chassisd platform daemon introduced in 202106"
+    conditions:
+      - "release in ['201811', '201911', '202012']"
+
 platform_tests/daemon/test_ledd.py::test_pmon_ledd_kill_and_start_status:
   skip:
     reason: "LEDD daemon auto restart not included in 201911"
@@ -739,11 +759,32 @@ platform_tests/mellanox:
     conditions:
       - "asic_type not in ['mellanox']"
 
+platform_tests/mellanox/test_check_sfp_using_ethtool.py:
+  skip:
+    reason: "Deprecated as Mellanox do not use ethtool in release 202305 or higher"
+    conditions:
+      - "asic_type in ['mellanox']"
+
 platform_tests/mellanox/test_reboot_cause.py:
   skip:
     reason: "Does not support platform_tests/mellanox/test_reboot_cause.py"
     conditions:
       - "platform in ['x86_64-mlnx_msn2010-r0', 'x86_64-mlnx_msn2700-r0', 'x86_64-mlnx_msn2100-r0', 'x86_64-mlnx_msn2410-r0', 'x86_64-nvidia_sn2201-r0']"
+#######################################
+#####            sfp              #####
+#######################################
+platform_tests/sfp/test_sfputil.py::test_check_sfputil_low_power_mode:
+  skip:
+    reason: "Get/Set low power mode is not supported in Cisco 8000 platform"
+    conditions:
+      - "platform in ['x86_64-cel_e1031-r0']"
+
+platform_tests/sfp/test_sfputil.py::test_check_sfputil_reset:
+  skip:
+    reason: "platform does not support sfp reset"
+    conditions:
+      - "platform in ['x86_64-cel_e1031-r0'] or 't2' in topo_name"
+      - https://github.com/sonic-net/sonic-mgmt/issues/6218
 
 #######################################
 ####    test_advanced_reboot      #####
@@ -762,6 +803,23 @@ platform_tests/test_advanced_reboot.py::test_fast_reboot_from_other_vendor:
     conditions:
       - https://github.com/sonic-net/sonic-mgmt/issues/11007
 
+#######################################
+#####   test_auto_negotiation.py  #####
+#######################################
+platform_tests/test_auto_negotiation.py:
+  skip:
+    reason: "auto negotiation test highly depends on test enviroments, file issue to track and skip for now"
+    conditions: https://github.com/sonic-net/sonic-mgmt/issues/5447
+
+#######################################
+#####   test_cont_warm_reboot.py  #####
+#######################################
+platform_tests/test_cont_warm_reboot.py:
+  skip:
+    reason: "Warm Reboot is not supported in dualtor"
+    conditions:
+      - "'dualtor' in topo_name"
+
 #######################################
 ####        test_kdump.py         #####
 #######################################
@@ -785,11 +843,25 @@ platform_tests/test_memory_exhaustion.py:
 #######################################
 #####    test_platform_info.py    #####
 #######################################
+platform_tests/test_platform_info.py::test_show_platform_fanstatus_mocked:
+  skip:
+    reason: "Test disabled on Mellanox platforms as it could be un-stable and interfered by the thermal algorithm."
+    conditions:
+      - "asic_type in ['mellanox']"
+
+platform_tests/test_platform_info.py::test_show_platform_temperature_mocked:
+  skip:
+    reason: "Test not supported on Mellanox Platforms."
+    conditions:
+      - "asic_type in ['mellanox']"
+      -
 platform_tests/test_platform_info.py::test_thermal_control_fan_status:
   skip:
-    reason: "Thermal control daemon is not present"
+    reason: "Thermal control daemon is not present / Test disabled on Mellanox platforms as it could be un-stable and interfered by the thermal algorithm."
+    conditions_logical_operator: or
     conditions:
       - "is_multi_asic==True and release in ['201911']"
+      - "asic_type in ['mellanox']"
 
 platform_tests/test_platform_info.py::test_thermal_control_load_invalid_format_json:
   #Thermal policies are implemented as part of BSP layer in Cisco 8000 platform, so there is no need for loading JSON file,
@@ -798,9 +870,11 @@ platform_tests/test_platform_info.py::test_thermal_control_load_invalid_format_j
     # Cisco platforms use different mechanism to generate thermal policy, current method is not applicable
     # Multi ASIC platform running 201911 release doesn't have thermalctld
     # s6100 has not supported get_thermal_manager yet
-    reason: "Skip on Cisco platform and multi-asic platform running 201911 release"
+    reason: "Skip on Cisco platform and multi-asic platform running 201911 release / Test not required on Mellanox Platforms as all thermal policies have been removed from thermalctld"
+    conditions_logical_operator: or
     conditions:
       - "asic_type=='cisco-8000' or (is_multi_asic==True and release in ['201911']) or ('dell_s6100' in platform) or ('sw_to3200k' in hwsku)"
+      - "asic_type in ['mellanox']"
 
 platform_tests/test_platform_info.py::test_thermal_control_load_invalid_value_json:
   #Thermal policies are implemented as part of BSP layer in Cisco 8000 platform, so there is no need for loading JSON file,
@@ -809,9 +883,11 @@ platform_tests/test_platform_info.py::test_thermal_control_load_invalid_value_js
     # Cisco platforms use different mechanism to generate thermal policy, current method is not applicable
     # Multi ASIC platform running 201911 release doesn't have thermalctld
     # s6100 has not supported get_thermal_manager yet
-    reason: "Skip on Cisco platform and multi-asic platform running 201911 release"
+    reason: "Skip on Cisco platform and multi-asic platform running 201911 release/ Test not required on Mellanox Platforms as all thermal policies have been removed from thermalctld"
+    conditions_logical_operator: or
     conditions:
       - "asic_type=='cisco-8000' or (is_multi_asic==True and release in ['201911']) or ('dell_s6100' in platform) or ('sw_to3200k' in hwsku)"
+      - "asic_type in ['mellanox']"
 
 platform_tests/test_platform_info.py::test_turn_on_off_psu_and_check_psustatus:
   xfail:
@@ -839,9 +915,11 @@ platform_tests/test_reboot.py::test_cold_reboot:
 
 platform_tests/test_reboot.py::test_fast_reboot:
   skip:
-    reason: "Skip test_fast_reboot for m0/mx/t1/t2"
+    reason: "Skip test_fast_reboot for m0/mx/t1/t2/ Fast reboot is broken on dualtor topology. Skipping for now."
+    conditions_logical_operator: or
     conditions:
       - "topo_type in ['m0', 'mx', 't1', 't2']"
+      - "'dualtor' in topo_name and https://github.com/sonic-net/sonic-buildimage/issues/16502"
   xfail:
     reason: "case failed and waiting for fix"
     conditions:
@@ -861,9 +939,11 @@ platform_tests/test_reboot.py::test_soft_reboot:
 
 platform_tests/test_reboot.py::test_warm_reboot:
   skip:
-    reason: "Skip test_warm_reboot for m0/mx/t1/t2"
+    reason: "Skip test_warm_reboot for m0/mx/t1/t2/ Warm reboot is broken on dualtor topology. Skipping for now."
+    conditions_logical_operator: or
     conditions:
       - "topo_type in ['m0', 'mx', 't1', 't2']"
+      - "'dualtor' in topo_name and https://github.com/sonic-net/sonic-buildimage/issues/16502"
   xfail:
     reason: "case failed and waiting for fix"
     conditions:
@@ -886,6 +966,11 @@ platform_tests/test_reload_config.py:
     conditions:
       - "asic_type in ['barefoot'] and hwsku in ['newport']"
 
+platform_tests/test_reload_config.py::test_reload_configuration_checks:
+  xfail:
+    reason: "Known testcase issue in Cisco platforms."
+    conditions:
+      - "asic_type in ['cisco-8000']"
 
 #######################################
 ######  test_secure_upgrade.py  #######
@@ -914,6 +999,15 @@ platform_tests/test_sequential_restart.py::test_restart_syncd:
   skip:
     reason: "Restarting syncd is not supported yet"
 
+#######################################
+#####test_service_warm_restart.py #####
+#######################################
+platform_tests/test_service_warm_restart.py:
+  skip:
+    reason: "Testcase ignored due to sonic-mgmt issue: https://github.com/sonic-net/sonic-mgmt/issues/10362"
+    conditions:
+      - "https://github.com/sonic-net/sonic-mgmt/issues/10362"
+
 #######################################
 #####   test_xcvr_info_in_db.py   #####
 #######################################