[202012][PR: 14370][PR: 14433] Cherry pick conditional marks into 202012

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -455,54 +455,6 @@ pfcwd/test_pfcwd_warm_reboot.py:
         - "'dualtor' in topo_name"
         - https://github.com/sonic-net/sonic-mgmt/issues/8400
 
-#######################################
-#####         platform_tests      #####
-#######################################
-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:
-      - "asic_type in ['cisco-8000'] or platform in ['x86_64-cel_e1031-r0']"
-
-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/Azure/sonic-mgmt/issues/5447
-
-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']"
-
-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/broadcom/test_ser.py::test_ser:
-  skip:
-    reason: "platform does not support test_ser"
-    conditions:
-      - "platform in ['x86_64-cel_e1031-r0']"
-      - https://github.com/sonic-net/sonic-mgmt/issues/6218
-
-#######################################
-#####           configlet         #####
-#######################################
-configlet/test_add_rack.py:
-  skip:
-    reason: "AddRack is not yet supported on multi-ASIC platform"
-    conditions:
-      - "is_multi_asic==True"
-
 #######################################
 #####           qos               #####
 #######################################
@@ -682,11 +634,6 @@ syslog/test_syslog.py:
     conditions:
       - "branch in ['internal-202012']"
       - "int(build_version.split('.')[1]) <= 33"
-  skip:
-    reason: "Testcase enhancements needed for backend topo"
-    conditions:
-      - "topo_name in ['t0-backend', 't1-backend']"
-      - https://github.com/Azure/sonic-mgmt/issues/4469
 
 #######################################
 #####         system_health       #####

tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml

@@ -424,6 +424,12 @@ platform_tests/api/test_sfp.py::TestSfpApi::test_power_override:
     conditions:
       - "asic_type in ['mellanox'] or platform in ['armhf-nokia_ixs7215_52x-r0']"
 
+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_thermals:
   skip:
     reason: "Unsupported platform API"
@@ -440,7 +446,7 @@ platform_tests/api/test_sfp.py::TestSfpApi::test_tx_disable_channel:
   skip:
     reason: "Unsupported platform API"
     conditions:
-      - "asic_type in ['mellanox'] or platform in ['armhf-nokia_ixs7215_52x-r0']"
+      - "asic_type in ['mellanox'] or platform in ['armhf-nokia_ixs7215_52x-r0', 'x86_64-cel_e1031-r0']"
 
 platform_tests/api/test_sfp.py::TestSfpApi::test_get_transceiver_threshold_info:
   skip:
@@ -551,6 +557,13 @@ platform_tests/broadcom:
     conditions:
       - "asic_type in ['marvell']"
 
+platform_tests/broadcom/test_ser.py::test_ser:
+  skip:
+    reason: "platform does not support test_ser"
+    conditions:
+      - "platform in ['x86_64-cel_e1031-r0']"
+      - https://github.com/sonic-net/sonic-mgmt/issues/6218
+
 #######################################
 #####  cli/test_show_platform.py  #####
 #######################################
@@ -611,6 +624,21 @@ 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:
+      - "asic_type in ['cisco-8000'] or 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']"
+
 #######################################
 ####    test_advanced_reboot      #####
 #######################################