Tests to be skipped

tests/test_bfd.py

@@ -59,7 +59,7 @@ def clear_tsa(self):
         state = {"tsa_enabled": "false"}
         self.update_bgp_global_dev_state(state)
 
-
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession(self, dvs):
         self.setup_db(dvs)
 
@@ -101,6 +101,7 @@ def test_addRemoveBfdSession(self, dvs):
         self.remove_bfd_session("default:default:10.0.0.2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession_ipv6(self, dvs):
         self.setup_db(dvs)
 
@@ -142,6 +143,7 @@ def test_addRemoveBfdSession_ipv6(self, dvs):
         self.remove_bfd_session("default:default:2000::2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession_interface(self, dvs):
         self.setup_db(dvs)
 
@@ -185,6 +187,7 @@ def test_addRemoveBfdSession_interface(self, dvs):
         self.remove_bfd_session("default:Ethernet0:10.0.0.2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession_txrx_interval(self, dvs):
         self.setup_db(dvs)
 
@@ -228,6 +231,7 @@ def test_addRemoveBfdSession_txrx_interval(self, dvs):
         self.remove_bfd_session("default:default:10.0.0.2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession_multiplier(self, dvs):
         self.setup_db(dvs)
 
@@ -270,6 +274,7 @@ def test_addRemoveBfdSession_multiplier(self, dvs):
         self.remove_bfd_session("default:default:10.0.0.2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession_multihop(self, dvs):
         self.setup_db(dvs)
 
@@ -312,6 +317,7 @@ def test_addRemoveBfdSession_multihop(self, dvs):
         self.remove_bfd_session("default:default:10.0.0.2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_addRemoveBfdSession_type(self, dvs):
         self.setup_db(dvs)
 
@@ -353,6 +359,7 @@ def test_addRemoveBfdSession_type(self, dvs):
         self.remove_bfd_session("default:default:10.0.0.2")
         self.adb.wait_for_deleted_entry("ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION", session)
 
+    @pytest.mark.skip(reason="Flaky upstream test breaks CICD presubmit")
     def test_multipleBfdSessions(self, dvs):
         self.setup_db(dvs)
 

tests/test_drop_counters.py

@@ -666,6 +666,7 @@ def getPortOid(self, dvs, port_name):
         assert status == True
         return returned_value
 
+    @pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
     def test_add_remove_port(self, dvs, testlog):
         """
             This test verifies that debug counters are removed when we remove a port 

tests/test_gearbox.py

@@ -158,6 +158,7 @@ class TestGearbox(object):
     def test_GearboxSanity(self, gearbox, testlog):
         gearbox.SanityCheck(testlog)
 
+    @pytest.mark.skip(reason="Skip test due to GENETLINK hostif")
     def test_GearboxCounter(self, dvs, gbasic, enable_port_counter, testlog):
         counters_db = DVSDatabase(swsscommon.COUNTERS_DB, dvs.redis_sock)
         gb_counters_db = DVSDatabase(swsscommon.GB_COUNTERS_DB, dvs.redis_sock)
@@ -178,6 +179,7 @@ def test_GearboxCounter(self, dvs, gbasic, enable_port_counter, testlog):
         fvs = counters_db.wait_for_entry("COUNTERS", port_oid)
         assert fvs.get("SAI_PORT_STAT_IF_IN_ERRORS")
 
+    @pytest.mark.skip(reason="Skip test due to GENETLINK hostif")
     def test_GbAsicFEC(self, gbasic, testlog):
 
         # set fec rs on port 0 of phy 1

tests/test_macsec.py

@@ -628,6 +628,7 @@ def deinit_macsec(
                 macsec_port_identifier))
         wpa.deinit_macsec_port(port_name)
 
+    @pytest.mark.skip(reason="Disable since we remove macsecmgrd and macsecorch.")
     def test_macsec_term_orch(self, dvs: conftest.DockerVirtualSwitch, testlog):
         port_name = "Ethernet0"
         local_mac_address = "00-15-5D-78-FF-C1"
@@ -768,6 +769,7 @@ def test_macsec_term_orch(self, dvs: conftest.DockerVirtualSwitch, testlog):
             1)
         assert(not inspector.get_macsec_port(macsec_port))
 
+    @pytest.mark.skip(reason="Disable since we remove macsecmgrd and macsecorch.")
     def test_macsec_attribute_change(self, dvs: conftest.DockerVirtualSwitch, testlog):
         port_name = "Ethernet0"
         local_mac_address = "00-15-5D-78-FF-C1"
@@ -816,6 +818,7 @@ def test_macsec_attribute_change(self, dvs: conftest.DockerVirtualSwitch, testlo
             macsec_port_identifier,
             0)
 
+    @pytest.mark.skip(reason="Disable since we remove macsecmgrd and macsecorch.")
     def test_macsec_with_portchannel(self, dvs: conftest.DockerVirtualSwitch, testlog):
 
         # Set MACsec enabled on Ethernet0

tests/test_mirror.py

@@ -264,6 +264,7 @@ def remove_fdb(self, vlan, mac):
         tbl._del("Vlan" + vlan + ":" + mac)
         time.sleep(1)
 
+    @pytest.mark.skipif(StrictVersion(distro.linux_distribution()[1]) <= StrictVersion('8.9'), reason="Debian 8.9 or before has no support")
     def _test_MirrorToVlanAddRemove(self, dvs, testlog, v6_encap=False):
         """
         This test covers basic mirror session creation and removal operation

tests/test_nat.py

@@ -40,6 +40,7 @@ def clear_interfaces(self, dvs):
 
         time.sleep(1)
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_NatGlobalTable(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -57,6 +58,7 @@ def test_NatGlobalTable(self, dvs, testlog):
 
         assert fvs == {"admin_mode": "enabled", "nat_timeout": "450", "nat_udp_timeout": "360", "nat_tcp_timeout": "900"}
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_NatInterfaceZone(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -71,6 +73,7 @@ def test_NatInterfaceZone(self, dvs, testlog):
                 break
         assert zone
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_AddNatStaticEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -107,6 +110,7 @@ def test_AddNatStaticEntry(self, dvs, testlog):
             else:
                 assert False
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_DelNatStaticEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -123,6 +127,7 @@ def test_DelNatStaticEntry(self, dvs, testlog):
         #check the entry is not there in asic db
         self.asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY", 0)
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_AddNaPtStaticEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -157,6 +162,7 @@ def test_AddNaPtStaticEntry(self, dvs, testlog):
             else:
                 assert False
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_DelNaPtStaticEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -212,6 +218,7 @@ def test_AddTwiceNatEntry(self, dvs, testlog):
             else:
                 assert False
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_DelTwiceNatStaticEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -229,6 +236,7 @@ def test_DelTwiceNatStaticEntry(self, dvs, testlog):
         #check the entry is not there in asic db
         self.asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY", 0)
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_AddTwiceNaPtEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -269,6 +277,7 @@ def test_AddTwiceNaPtEntry(self, dvs, testlog):
             else:
                 assert False
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_DelTwiceNaPtStaticEntry(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)
@@ -286,6 +295,7 @@ def test_DelTwiceNaPtStaticEntry(self, dvs, testlog):
         #check the entry is not there in asic db
         self.asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_NAT_ENTRY", 0)
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_VerifyConntrackTimeoutForNatEntry(self, dvs, testlog):
         # get neighbor and arp entry
         dvs.servers[0].runcmd("ping -c 1 18.18.18.2")
@@ -320,6 +330,7 @@ def _check_conntrack_for_static_entry():
         # delete a static nat entry
         dvs.del_nat_basic_entry("67.66.65.1")
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_DoNotNatAclAction(self, dvs_acl, testlog):
 
         # Creating the ACL Table
@@ -349,6 +360,7 @@ def test_DoNotNatAclAction(self, dvs_acl, testlog):
         dvs_acl.remove_acl_table(L3_TABLE_NAME)
         dvs_acl.verify_acl_table_count(0)
 
+    @pytest.mark.skip(reason="Disable since we remove natorch.")
     def test_CrmSnatAndDnatEntryUsedCount(self, dvs, testlog):
         # initialize
         self.setup_db(dvs)

tests/test_pbh.py

@@ -45,6 +45,7 @@ def dvs_api(request, dvs_pbh, dvs_acl):
 
 @pytest.mark.usefixtures("dvs_lag_manager")
 class TestPbhInterfaceBinding:
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhTablePortBinding(self, testlog):
         try:
             port_list = ["Ethernet0", "Ethernet4"]
@@ -68,6 +69,7 @@ def test_PbhTablePortBinding(self, testlog):
             self.dvs_pbh.remove_pbh_table(PBH_TABLE_NAME)
             self.dvs_acl.verify_acl_table_count(0)
 
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhTablePortChannelBinding(self, testlog):
         try:
             # PortChannel0001
@@ -132,6 +134,7 @@ def test_PbhTablePortChannelBinding(self, testlog):
 
 @pytest.mark.usefixtures("dvs_hash_manager")
 class TestPbhBasicFlows:
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhHashFieldCreationDeletion(self, testlog):
         try:
             pbhlogger.info("Create PBH hash field: {}".format(PBH_HASH_FIELD_NAME))
@@ -146,6 +149,7 @@ def test_PbhHashFieldCreationDeletion(self, testlog):
             self.dvs_pbh.remove_pbh_hash_field(PBH_HASH_FIELD_NAME)
             self.dvs_pbh.verify_pbh_hash_field_count(0)
 
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhHashCreationDeletion(self, testlog):
         try:
             # PBH hash field
@@ -175,6 +179,7 @@ def test_PbhHashCreationDeletion(self, testlog):
             self.dvs_pbh.remove_pbh_hash_field(PBH_HASH_FIELD_NAME)
             self.dvs_pbh.verify_pbh_hash_field_count(0)
 
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhTableCreationDeletion(self, testlog):
         try:
             pbhlogger.info("Create PBH table: {}".format(PBH_TABLE_NAME))
@@ -189,6 +194,7 @@ def test_PbhTableCreationDeletion(self, testlog):
             self.dvs_pbh.remove_pbh_table(PBH_TABLE_NAME)
             self.dvs_acl.verify_acl_table_count(0)
 
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhRuleCreationDeletion(self, testlog):
         try:
             # PBH hash field
@@ -259,6 +265,7 @@ def test_PbhRuleCreationDeletion(self, testlog):
 @pytest.mark.usefixtures("dvs_hash_manager")
 @pytest.mark.xfail(reason="Failing after Bookworm/libnl 3.7.0 upgrade")
 class TestPbhBasicEditFlows:
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhRuleUpdate(self, testlog):
         try:
             # PBH hash field
@@ -362,7 +369,7 @@ def test_PbhRuleUpdate(self, testlog):
             self.dvs_pbh.remove_pbh_hash_field(PBH_HASH_FIELD_NAME)
             self.dvs_pbh.verify_pbh_hash_field_count(0)
 
-
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhRuleUpdateFlowCounter(self, dvs, testlog):
         try:
             # PBH hash field
@@ -909,12 +916,14 @@ def pbh_vxlan(
         finally:
             self.remove_rule(meta_dict, pbh_ref_count)
 
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhNvgreVxlanConfiguration(self, testlog, pbh_nvgre, pbh_vxlan):
         pass
 
 
 @pytest.mark.usefixtures("dvs_hash_manager")
 class TestPbhDependencyFlows:
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhHashCreationDeletionWithDependencies(self, testlog):
         try:
             # PBH hash
@@ -946,6 +955,7 @@ def test_PbhHashCreationDeletionWithDependencies(self, testlog):
             self.dvs_hash.verify_hash_count(0)
             self.dvs_pbh.verify_pbh_hash_field_count(0)
 
+    @pytest.mark.skipif("PBH_SUPPORT" not in os.environ, reason="Disable since we remove pbhorch.")
     def test_PbhRuleCreationDeletionWithDependencies(self, testlog):
         try:
             # PBH hash

tests/test_port.py

@@ -278,6 +278,7 @@ def test_PortIpredriver(self, dvs, testlog):
             if fv[0] == "SAI_PORT_ATTR_SERDES_IPREDRIVER":
                 assert fv[1] == ipre_val_asic
 
+    @pytest.mark.skip(reason="GENETLINK hostif does not set default TX queue")
     def test_PortHostif(self, dvs):
         adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
         atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_HOSTIF")

tests/test_port_add_remove.py

@@ -24,6 +24,7 @@ def dynamic_buffer(dvs):
 
 @pytest.mark.usefixtures('dvs_port_manager')
 @pytest.mark.usefixtures("dynamic_buffer")    
+@pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
 class TestPortAddRemove(object):
 
     def set_mmu(self,dvs):
@@ -254,6 +255,8 @@ def test_add_remove_all_the_ports(self, dvs, testlog, scenario):
 
 @pytest.mark.usefixtures("dynamic_buffer")
 @pytest.mark.usefixtures("dvs_port_manager")
+
+@pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
 class TestPortAddRemoveDup(object):
     def test_add_remove_with_dup_lanes(self, testlog, dvs):
         config_db = dvs.get_config_db()
@@ -329,6 +332,7 @@ def test_add_remove_with_dup_lanes(self, testlog, dvs):
 
 
 @pytest.mark.usefixtures("dvs_port_manager")
+@pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
 class TestPortAddRemoveInvalidMandatoryParam(object):
     @pytest.mark.parametrize(
         "port,lanes,speed", [
@@ -356,6 +360,7 @@ def test_add_remove_neg(self, testlog, port, lanes, speed):
 
 
 @pytest.mark.usefixtures("dvs_port_manager")
+@pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
 class TestPortAddRemoveInvalidSerdesParam(object):
     @pytest.fixture(scope="class")
     def port_attr(self):
@@ -403,6 +408,7 @@ def test_add_remove_neg(self, testlog, port_attr, serdes):
 
 
 @pytest.mark.usefixtures("dvs_port_manager")
+@pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
 class TestPortAddRemoveInvalidParam(object):
     def verify_add_remove(self, qualifiers):
         port = "Ethernet1000"

tests/test_port_dpb_lag.py

@@ -33,6 +33,7 @@ def remove_port_channel_member(self, dvs, channel, interface):
         tbl._del("PortChannel" + channel + ":" + interface)
         time.sleep(1)
 
+    @pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
     def test_dependency(self, dvs):
         dvs.setup_db()
         lag = "0001"

tests/test_port_dpb_vlan.py

@@ -10,6 +10,7 @@ def check_syslog(self, dvs, marker, log, expected_cnt):
         (exitcode, num) = dvs.runcmd(['sh', '-c', "awk \'/%s/,ENDFILE {print;}\' /var/log/syslog | grep \"%s\" | wc -l" % (marker, log)])
         assert num.strip() >= str(expected_cnt)
 
+    @pytest.mark.skip(reason="Standalone port deletion is not yet supported in pins")
     def test_dependency(self, dvs):
         vlan = "100"
         p = Port(dvs, "Ethernet0")