tests: skip more excluded plugin tests

Check and skip VPP_EXCLUDED_PLUGINS tests for most of plugins.

Type: improvement
Signed-off-by: Dmitry Valter <d-valter@yandex-team.com>
Change-Id: I23fd3666729251c639aa8da72a676058e3f5bb4e

test/asf/test_adl.py

@@ -3,8 +3,10 @@
 import unittest
 
 from asfframework import VppAsfTestCase, VppTestRunner
+from config import config
 
 
+@unittest.skipIf("adl" in config.excluded_plugins, "Exclude ADL plugin tests")
 class TestAdl(VppAsfTestCase):
     """Allow/Deny Plugin Unit Test Cases"""
 

test/asf/test_lb_api.py

@@ -13,10 +13,14 @@
 #  limitations under the License.
 
 from asfframework import VppAsfTestCase
+from config import config
+
+import unittest
 
 DEFAULT_VIP = "lb_vip_details(_0=978, context=12, vip=vl_api_lb_ip_addr_t(pfx=IPv6Network(u'::/0'), protocol=<vl_api_ip_proto_t.IP_API_PROTO_RESERVED: 255>, port=0), encap=<vl_api_lb_encap_type_t.LB_API_ENCAP_TYPE_GRE4: 0>, dscp=<vl_api_ip_dscp_t.IP_API_DSCP_CS0: 0>, srv_type=<vl_api_lb_srv_type_t.LB_API_SRV_TYPE_CLUSTERIP: 0>, target_port=0, flow_table_length=0)"  # noqa
 
 
+@unittest.skipIf("lb" in config.excluded_plugins, "Exclude LB plugin tests")
 class TestLbEmptyApi(VppAsfTestCase):
     """TestLbEmptyApi"""
 
@@ -34,6 +38,7 @@ class TestLbEmptyApi(VppAsfTestCase):
         self.assertEqual(rv, [], "Expected: [] Received: %r." % rv)
 
 
+@unittest.skipIf("lb" in config.excluded_plugins, "Exclude LB plugin tests")
 class TestLbApi(VppAsfTestCase):
     """TestLbApi"""
 
@@ -55,6 +60,7 @@ class TestLbApi(VppAsfTestCase):
         self.vapi.cli("lb vip 2001::/16 del")
 
 
+@unittest.skipIf("lb" in config.excluded_plugins, "Exclude LB plugin tests")
 class TestLbAsApi(VppAsfTestCase):
     """TestLbAsApi"""
 

test/asf/test_session.py

@@ -9,9 +9,13 @@ from asfframework import (
     tag_run_solo,
 )
 from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
+from config import config
 
 
 @tag_fixme_vpp_workers
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class TestSession(VppAsfTestCase):
     """Session Test Case"""
 

test/asf/test_tcp.py

@@ -4,8 +4,12 @@ import unittest
 
 from asfframework import VppAsfTestCase, VppTestRunner
 from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
+from config import config
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class TestTCP(VppAsfTestCase):
     """TCP Test Case"""
 

test/asf/test_vcl.py

@@ -403,6 +403,9 @@ class LDPCutThruTestCase(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLCutThruTestCase(VCLTestCase):
     """VCL Cut Thru Tests"""
 
@@ -489,6 +492,9 @@ class VCLCutThruTestCase(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackEcho(VCLTestCase):
     """VCL Thru Host Stack Echo"""
 
@@ -543,6 +549,9 @@ class VCLThruHostStackEcho(VCLTestCase):
         self.logger.debug(self.vapi.cli("show app mq"))
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackTLS(VCLTestCase):
     """VCL Thru Host Stack TLS"""
 
@@ -594,6 +603,9 @@ class VCLThruHostStackTLS(VCLTestCase):
         self.logger.debug(self.vapi.cli("show app mq"))
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackEchoInterruptMode(VCLThruHostStackEcho):
     """VCL Thru Host Stack Echo interrupt mode"""
 
@@ -625,6 +637,9 @@ class VCLThruHostStackTLSInterruptMode(VCLThruHostStackTLS):
         super(VCLThruHostStackTLS, cls).setUpClass()
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackDTLS(VCLTestCase):
     """VCL Thru Host Stack DTLS"""
 
@@ -675,6 +690,9 @@ class VCLThruHostStackDTLS(VCLTestCase):
         self.logger.debug(self.vapi.cli("show app mq"))
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackQUIC(VCLTestCase):
     """VCL Thru Host Stack QUIC"""
 
@@ -726,6 +744,9 @@ class VCLThruHostStackQUIC(VCLTestCase):
         self.logger.debug(self.vapi.cli("show app mq"))
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackBidirNsock(VCLTestCase):
     """VCL Thru Host Stack Bidir Nsock"""
 
@@ -780,6 +801,9 @@ class VCLThruHostStackBidirNsock(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class LDPThruHostStackBidirNsock(VCLTestCase):
     """LDP Thru Host Stack Bidir Nsock"""
 
@@ -830,6 +854,9 @@ class LDPThruHostStackBidirNsock(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class LDPThruHostStackNsock(VCLTestCase):
     """LDP Thru Host Stack Nsock"""
 
@@ -879,6 +906,9 @@ class LDPThruHostStackNsock(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLThruHostStackNsock(VCLTestCase):
     """VCL Thru Host Stack Nsock"""
 
@@ -1125,6 +1155,9 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLIpv6CutThruTestCase(VCLTestCase):
     """VCL IPv6 Cut Thru Tests"""
 
@@ -1220,6 +1253,9 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
         )
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class VCLIpv6ThruHostStackEcho(VCLTestCase):
     """VCL IPv6 Thru Host Stack Echo"""
 

test/asf/test_vhost.py

@@ -5,8 +5,10 @@ import unittest
 from asfframework import VppAsfTestCase, VppTestRunner
 
 from vpp_vhost_interface import VppVhostInterface
+from config import config
 
 
+@unittest.skipIf("vhost" in config.excluded_plugins, "Exclude Vhost plugin tests")
 class TesVhostInterface(VppAsfTestCase):
     """Vhost User Test Case"""
 

test/template_ipsec.py

@@ -24,6 +24,7 @@ from vpp_ipsec import VppIpsecSpd, VppIpsecSpdEntry, VppIpsecSpdItfBinding
 from ipaddress import ip_address
 from re import search
 from os import popen
+from config import config
 
 
 class IPsecIPv4Params:
@@ -323,6 +324,9 @@ class IpsecTcp(object):
         self.assert_packet_checksums_valid(decrypted)
 
 
+@unittest.skipIf(
+    "hs_apps" in config.excluded_plugins, "Exclude tests requiring hs_apps plugin"
+)
 class IpsecTcpTests(IpsecTcp):
     def test_tcp_checksum(self):
         """verify checksum correctness for vpp generated packets"""
@@ -1849,6 +1853,9 @@ class IpsecTra4(object):
             self._verify_tra_anti_replay_algorithm_no_esn()
 
 
+@unittest.skipIf(
+    "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+)
 class IpsecTra4Tests(IpsecTra4):
     """UT test methods for Transport v4"""
 
@@ -2029,6 +2036,9 @@ class IpsecTra6(object):
             self.assert_equal(dc[IPv6ExtHdrFragment].id, 2)
 
 
+@unittest.skipIf(
+    "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+)
 class IpsecTra6Tests(IpsecTra6):
     """UT test methods for Transport v6"""
 

test/test_arping.py

@@ -2,6 +2,9 @@ from scapy.layers.l2 import ARP
 from scapy.layers.inet6 import ICMPv6ND_NS, ICMPv6ND_NA, IPv6
 
 from framework import VppTestCase
+from config import config
+
+import unittest
 
 """ TestArping is a subclass of  VPPTestCase classes.
 
@@ -10,6 +13,7 @@ Basic test for sanity check of arping.
 """
 
 
+@unittest.skipIf("arping" in config.excluded_plugins, "Exclude Arping plugin tests")
 class TestArping(VppTestCase):
     """Arping Test Case"""
 

test/test_bond.py

@@ -10,6 +10,7 @@ from framework import VppTestCase
 from asfframework import VppTestRunner
 from vpp_bond_interface import VppBondInterface
 from vpp_papi import MACAddress, VppEnum
+from config import config
 
 
 class TestBondInterface(VppTestCase):
@@ -174,6 +175,9 @@ class TestBondInterface(VppTestCase):
 
         bond0.remove_vpp_config()
 
+    @unittest.skipIf(
+        "lacp" in config.excluded_plugins, "Exclude tests requiring LACP plugin"
+    )
     def test_bond_add_member(self):
         """Bond add_member/detach member test"""
 
@@ -227,6 +231,9 @@ class TestBondInterface(VppTestCase):
 
         bond0.remove_vpp_config()
 
+    @unittest.skipIf(
+        "lacp" in config.excluded_plugins, "Exclude tests requiring LACP plugin"
+    )
     def test_bond(self):
         """Bond add/delete interface test"""
         self.logger.info("Bond add interfaces")

test/test_cdp.py

@@ -17,6 +17,7 @@ from scapy.all import raw
 from re import compile
 from time import sleep
 from util import ppp
+from config import config
 import platform
 import sys
 import unittest
@@ -39,6 +40,7 @@ class CustomTLV(Packet):
     ]
 
 
+@unittest.skipIf("cdp" in config.excluded_plugins, "Exclude CDP plugin tests")
 class TestCDP(VppTestCase):
     """CDP Test Case"""
 

test/test_cnat.py

@@ -6,6 +6,7 @@ from framework import VppTestCase
 from asfframework import VppTestRunner
 from vpp_ip import INVALID_INDEX
 from itertools import product
+from config import config
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
@@ -335,6 +336,7 @@ class CnatTestContext(object):
 # -------------------------------------------------------------------
 
 
+@unittest.skipIf("cnat" in config.excluded_plugins, "Exclude CNAT plugin tests")
 class TestCNatTranslation(CnatCommonTestCase):
     """CNat Translation"""
 
@@ -679,6 +681,7 @@ class TestCNatTranslation(CnatCommonTestCase):
         self.cnat_fhc_translation()
 
 
+@unittest.skipIf("cnat" in config.excluded_plugins, "Exclude CNAT plugin tests")
 class TestCNatSourceNAT(CnatCommonTestCase):
     """CNat Source NAT"""
 
@@ -818,6 +821,7 @@ class TestCNatSourceNAT(CnatCommonTestCase):
         self.vapi.cnat_session_purge()
 
 
+@unittest.skipIf("cnat" in config.excluded_plugins, "Exclude CNAT plugin tests")
 class TestCNatDHCP(CnatCommonTestCase):
     """CNat Translation"""
 

test/test_det44.py

@@ -12,8 +12,10 @@ from scapy.layers.inet import IP, TCP, UDP, ICMP
 from scapy.layers.inet import IPerror, UDPerror
 from scapy.layers.l2 import Ether
 from util import ppp
+from config import config
 
 
+@unittest.skipIf("nat" in config.excluded_plugins, "Exclude NAT plugin tests")
 class TestDET44(VppTestCase):
     """Deterministic NAT Test Cases"""
 

test/test_dhcp.py

@@ -32,6 +32,7 @@ from vpp_papi import mac_pton, VppEnum
 from vpp_sub_interface import VppDot1QSubint
 from vpp_qos import VppQosEgressMap, VppQosMark
 from vpp_dhcp import VppDHCPClient, VppDHCPProxy
+from config import config
 
 
 DHCP4_CLIENT_PORT = 68
@@ -41,6 +42,7 @@ DHCP6_SERVER_PORT = 546
 
 
 @tag_run_solo
+@unittest.skipIf("dhcp" in config.excluded_plugins, "Exclude DHCP plugin tests")
 class TestDHCP(VppTestCase):
     """DHCP Test Case"""
 

test/test_dhcp6.py

@@ -24,14 +24,17 @@ from scapy.layers.inet6 import IPv6, Ether, UDP
 from framework import VppTestCase
 from asfframework import tag_fixme_vpp_workers, tag_run_solo
 from vpp_papi import VppEnum
+from config import config
 import util
 import os
+import unittest
 
 
 def ip6_normalize(ip6):
     return inet_ntop(AF_INET6, inet_pton(AF_INET6, ip6))
 
 
+@unittest.skipIf("dhcp" in config.excluded_plugins, "Exclude DHCP plugin tests")
 class TestDHCPv6DataPlane(VppTestCase):
     """DHCPv6 Data Plane Test Case"""
 
@@ -243,6 +246,7 @@ class TestDHCPv6DataPlane(VppTestCase):
 
 
 @tag_run_solo
+@unittest.skipIf("dhcp" in config.excluded_plugins, "Exclude DHCP plugin tests")
 class TestDHCPv6IANAControlPlane(VppTestCase):
     """DHCPv6 IA NA Control Plane Test Case"""
 
@@ -497,6 +501,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
 
 
 @tag_fixme_vpp_workers
+@unittest.skipIf("dhcp" in config.excluded_plugins, "Exclude DHCP plugin tests")
 class TestDHCPv6PDControlPlane(VppTestCase):
     """DHCPv6 PD Control Plane Test Case"""
 

test/test_dns.py

@@ -5,12 +5,14 @@ import unittest
 from framework import VppTestCase
 from asfframework import VppTestRunner
 from ipaddress import *
+from config import config
 
 from scapy.layers.inet import IP, UDP
 from scapy.layers.l2 import Ether
 from scapy.layers.dns import DNS, DNSQR
 
 
+@unittest.skipIf("dns" in config.excluded_plugins, "Exclude DNS plugin tests")
 class TestDns(VppTestCase):
     """Dns Test Cases"""
 

test/test_dslite.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import socket
+import unittest
 
 from asfframework import tag_fixme_vpp_workers
 from framework import VppTestCase
@@ -17,9 +18,11 @@ from scapy.packet import Raw
 from syslog_rfc5424_parser import SyslogMessage, ParseError
 from syslog_rfc5424_parser.constants import SyslogSeverity
 from vpp_ip_route import VppIpRoute, VppRoutePath
+from config import config
 
 
 @tag_fixme_vpp_workers
+@unittest.skipIf("nat" in config.excluded_plugins, "Exclude NAT plugin tests")
 class TestDSlite(VppTestCase):
     """DS-Lite Test Cases"""
 
@@ -233,6 +236,7 @@ class TestDSlite(VppTestCase):
         self.logger.info(self.vapi.cli("show dslite sessions"))
 
 
+@unittest.skipIf("nat" in config.excluded_plugins, "Exclude NAT plugin tests")
 class TestDSliteCE(VppTestCase):
     """DS-Lite CE Test Cases"""
 

test/test_dvr.py

@@ -13,10 +13,12 @@ from scapy.layers.l2 import Ether, Dot1Q
 from scapy.layers.inet import IP, UDP
 from socket import AF_INET
 from ipaddress import IPv4Network
+from config import config
 
 NUM_PKTS = 67
 
 
+@unittest.skipIf("acl" in config.excluded_plugins, "Exclude tests requiring ACL plugin")
 class TestDVR(VppTestCase):
     """Distributed Virtual Router"""
 

test/test_flowprobe.py

@@ -31,6 +31,7 @@ from vpp_papi.macaddress import mac_ntop
 from socket import inet_ntop
 from vpp_papi import VppEnum
 from vpp_sub_interface import VppDot1ADSubint
+from config import config
 
 
 TMPL_COMMON_FIELD_COUNT = 6
@@ -384,6 +385,9 @@ class MethodHolder(VppTestCase):
 @tag_fixme_vpp_workers
 @tag_fixme_ubuntu2204
 @tag_fixme_debian11
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class Flowprobe(MethodHolder):
     """Template verification, timer tests"""
 
@@ -1226,6 +1230,9 @@ class DatapathTestsHolder(object):
         self.logger.info("FFP_TEST_FINISH_0002")
 
 
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class DatapathTx(MethodHolder, DatapathTestsHolder):
     """Collect info on Ethernet, IP4 and IP6 datapath (TX) (no timers)"""
 
@@ -1306,6 +1313,9 @@ class DatapathTx(MethodHolder, DatapathTestsHolder):
         ipfix.remove_vpp_config()
 
 
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class DatapathRx(MethodHolder, DatapathTestsHolder):
     """Collect info on Ethernet, IP4 and IP6 datapath (RX) (no timers)"""
 
@@ -1316,6 +1326,9 @@ class DatapathRx(MethodHolder, DatapathTestsHolder):
 
 
 @unittest.skipUnless(config.extended, "part of extended tests")
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class DisableIPFIX(MethodHolder):
     """Disable IPFIX"""
 
@@ -1364,6 +1377,9 @@ class DisableIPFIX(MethodHolder):
 
 
 @unittest.skipUnless(config.extended, "part of extended tests")
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class ReenableIPFIX(MethodHolder):
     """Re-enable IPFIX"""
 
@@ -1431,6 +1447,9 @@ class ReenableIPFIX(MethodHolder):
 
 
 @unittest.skipUnless(config.extended, "part of extended tests")
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class DisableFP(MethodHolder):
     """Disable Flowprobe feature"""
 
@@ -1539,6 +1558,9 @@ class DisableFP(MethodHolder):
 
 
 @unittest.skipUnless(config.extended, "part of extended tests")
+@unittest.skipIf(
+    "flowprobe" in config.excluded_plugins, "Exclude Flowprobe plugin tests"
+)
 class ReenableFP(MethodHolder):
     """Re-enable Flowprobe feature"""
 

test/test_geneve.py

@@ -5,6 +5,7 @@ import unittest
 from framework import VppTestCase
 from asfframework import VppTestRunner
 from template_bd import BridgeDomain
+from config import config
 
 from scapy.layers.l2 import Ether, ARP
 from scapy.layers.inet import IP, UDP, ICMP
@@ -15,6 +16,7 @@ from vpp_ip_route import VppIpRoute, VppRoutePath
 from vpp_ip import INVALID_INDEX
 
 
+@unittest.skipIf("geneve" in config.excluded_plugins, "Exclude GENEVE plugin tests")
 class TestGeneve(BridgeDomain, VppTestCase):
     """GENEVE Test Case"""
 
@@ -250,6 +252,7 @@ class TestGeneve(BridgeDomain, VppTestCase):
         self.logger.info(self.vapi.cli("show geneve tunnel"))
 
 
+@unittest.skipIf("geneve" in config.excluded_plugins, "Exclude GENEVE plugin tests")
 class TestGeneveL3(VppTestCase):
     """GENEVE L3 Test Case"""
 

test/test_gre.py

@@ -24,9 +24,11 @@ from vpp_ip_route import (
 from vpp_mpls_tunnel_interface import VppMPLSTunnelInterface
 from util import ppp, ppc
 from vpp_papi import VppEnum
+from config import config
 
 
 @tag_fixme_vpp_workers
+@unittest.skipIf("gre" in config.excluded_plugins, "Exclude GRE plugin tests")
 class TestGREInputNodes(VppTestCase):
     """GRE Input Nodes Test Case"""
 
@@ -73,6 +75,7 @@ class TestGREInputNodes(VppTestCase):
         self.assertEqual(err, err_count)
 
 
+@unittest.skipIf("gre" in config.excluded_plugins, "Exclude GRE plugin tests")
 class TestGRE(VppTestCase):
     """GRE Test Case"""
 

test/test_gso.py

@@ -25,6 +25,7 @@ from vpp_ip_route import VppIpRoute, VppRoutePath, FibPathProto
 from vpp_ipip_tun_interface import VppIpIpTunInterface
 from vpp_vxlan_tunnel import VppVxlanTunnel
 from vpp_gre_interface import VppGreInterface
+from config import config
 
 from vpp_ipsec import VppIpsecSA, VppIpsecTunProtect
 from template_ipsec import (
@@ -378,6 +379,9 @@ class TestGSO(VppTestCase):
             sw_if_index=self.pg1.sw_if_index, enable_disable=0
         )
 
+    @unittest.skipIf(
+        "vxlan" in config.excluded_plugins, "Exclude tests requiring VXLAN plugin"
+    )
     def test_gso_vxlan(self):
         """GSO VXLAN test"""
         self.logger.info(self.vapi.cli("sh int addr"))

test/test_gtpu.py

@@ -5,6 +5,7 @@ import unittest
 from framework import VppTestCase
 from asfframework import VppTestRunner, tag_fixme_vpp_workers
 from template_bd import BridgeDomain
+from config import config
 
 from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
@@ -17,6 +18,7 @@ from vpp_ip import INVALID_INDEX
 
 
 @tag_fixme_vpp_workers
+@unittest.skipIf("gtpu" in config.excluded_plugins, "Exclude GTPU plugin tests")
 class TestGtpuUDP(VppTestCase):
     """GTPU UDP ports Test Case"""
 
@@ -119,6 +121,7 @@ class TestGtpuUDP(VppTestCase):
         )
 
 
+@unittest.skipIf("gtpu" in config.excluded_plugins, "Exclude GTPU plugin tests")
 class TestGtpu(BridgeDomain, VppTestCase):
     """GTPU Test Case"""
 

test/test_igmp.py

@@ -19,6 +19,7 @@ from vpp_igmp import (
     wait_for_igmp_event,
 )
 from vpp_ip_route import find_mroute, VppIpTable
+from config import config
 
 
 class IgmpMode:
@@ -27,6 +28,7 @@ class IgmpMode:
 
 
 @tag_fixme_vpp_workers
+@unittest.skipIf("igmp" in config.excluded_plugins, "Exclude IGMP plugin tests")
 class TestIgmp(VppTestCase):
     """IGMP Test Case"""
 

test/test_interface_crud.py

@@ -18,6 +18,7 @@ from scapy.layers.l2 import Ether
 
 from framework import VppTestCase
 from asfframework import VppTestRunner
+from config import config
 
 
 class TestLoopbackInterfaceCRUD(VppTestCase):
@@ -81,6 +82,9 @@ class TestLoopbackInterfaceCRUD(VppTestCase):
             info = (i.local_ip4, request_src_if.remote_ip4, 0, i.sw_if_index)
             self.assertIn(info, rcvd_icmp_pkts)
 
+    @unittest.skipIf(
+        "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+    )
     def test_crud(self):
         # create
         loopbacks = self.create_loopback_interfaces(20)

test/test_ip4.py

@@ -34,6 +34,7 @@ from vpp_papi import vpp_papi, VppEnum
 from vpp_neighbor import VppNeighbor
 from vpp_lo_interface import VppLoInterface
 from vpp_policer import VppPolicer, PolicerAction
+from config import config
 
 NUM_PKTS = 67
 
@@ -502,6 +503,9 @@ class TestIPv4IfAddrRoute(VppTestCase):
             )
 
 
+@unittest.skipIf(
+    "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+)
 class TestICMPEcho(VppTestCase):
     """ICMP Echo Test Case"""
 

test/test_ip6.py

@@ -67,6 +67,7 @@ from vpp_policer import VppPolicer, PolicerAction
 from ipaddress import IPv6Network, IPv6Address
 from vpp_gre_interface import VppGreInterface
 from vpp_teib import VppTeib
+from config import config
 
 AF_INET6 = socket.AF_INET6
 
@@ -1368,6 +1369,9 @@ class TestIPv6IfAddrRoute(VppTestCase):
             )
 
 
+@unittest.skipIf(
+    "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+)
 class TestICMPv6Echo(VppTestCase):
     """ICMPv6 Echo Test Case"""
 
@@ -3324,6 +3328,9 @@ class TestIP6AddrReplace(VppTestCase):
             self.assertTrue(pfx.query_vpp_config())
 
 
+@unittest.skipIf(
+    "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+)
 class TestIP6LinkLocal(VppTestCase):
     """IPv6 Link Local"""
 
@@ -3416,6 +3423,9 @@ class TestIP6LinkLocal(VppTestCase):
         p_echo_request_3.dst = self.pg1.local_mac
         self.send_and_expect(self.pg1, [p_echo_request_3], self.pg1)
 
+    @unittest.skipIf(
+        "gre" in config.excluded_plugins, "Exclude tests requiring GRE plugin"
+    )
     def test_ip6_ll_p2p(self):
         """IPv6 Link Local P2P (GRE)"""
 
@@ -3445,6 +3455,9 @@ class TestIP6LinkLocal(VppTestCase):
         self.pg0.unconfig_ip4()
         gre_if.remove_vpp_config()
 
+    @unittest.skipIf(
+        "gre" in config.excluded_plugins, "Exclude tests requiring GRE plugin"
+    )
     def test_ip6_ll_p2mp(self):
         """IPv6 Link Local P2MP (GRE)"""
 

test/test_ip_mcast.py

@@ -14,6 +14,7 @@ from vpp_ip_route import (
 )
 from vpp_gre_interface import VppGreInterface
 from vpp_papi import VppEnum
+from config import config
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, GRE
@@ -884,6 +885,9 @@ class TestIPMcast(VppTestCase):
         signals = self.vapi.mfib_signal_dump()
         self.assertEqual(0, len(signals))
 
+    @unittest.skipIf(
+        "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+    )
     def test_ip_mcast_vrf(self):
         """IP Multicast Replication in non-default table"""
 
@@ -976,6 +980,9 @@ class TestIPMcast(VppTestCase):
 
         self.send_and_expect(self.pg8, tx, self.pg8)
 
+    @unittest.skipIf(
+        "gre" in config.excluded_plugins, "Exclude tests requiring GRE plugin"
+    )
     def test_ip_mcast_gre(self):
         """IP Multicast Replication over GRE"""
 
@@ -1056,6 +1063,9 @@ class TestIPMcast(VppTestCase):
             self.assertEqual(rx[IP].dst, gre_if_3.t_dst)
             self.assert_packet_checksums_valid(rx)
 
+    @unittest.skipIf(
+        "gre" in config.excluded_plugins, "Exclude tests requiring GRE plugin"
+    )
     def test_ip6_mcast_gre(self):
         """IP6 Multicast Replication over GRE"""
 

test/test_ip_session_redirect.py

@@ -13,8 +13,13 @@ from vpp_papi import VppEnum
 from vpp_ip_route import VppRoutePath
 
 from framework import VppTestCase
+from config import config
 
 
+@unittest.skipIf(
+    "ip_session_redirect" in config.excluded_plugins,
+    "Exclude IP session redirect plugin tests",
+)
 class TestIpSessionRedirect(VppTestCase):
     """IP session redirect Test Case"""
 

test/test_ipsec_ah.py

@@ -28,6 +28,7 @@ from vpp_ipsec import VppIpsecSA, VppIpsecSpd, VppIpsecSpdEntry, VppIpsecSpdItfB
 from vpp_ip_route import VppIpRoute, VppRoutePath
 from vpp_ip import DpoProto
 from vpp_papi import VppEnum
+from config import config
 
 
 class ConfigIpsecAH(TemplateIpsec):
@@ -526,6 +527,9 @@ class TestIpsecAhAll(ConfigIpsecAH, IpsecTra4, IpsecTra6, IpsecTun4, IpsecTun6):
     def tearDown(self):
         super(TestIpsecAhAll, self).tearDown()
 
+    @unittest.skipIf(
+        "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+    )
     def test_integ_algs(self):
         """All Engines SHA[1_96, 256, 384, 512] w/ & w/o ESN"""
         # foreach VPP crypto engine

test/test_ipsec_esp.py

@@ -1,4 +1,5 @@
 import socket
+import unittest
 from scapy.layers.ipsec import ESP
 from scapy.layers.inet import IP, ICMP, UDP
 from scapy.layers.inet6 import IPv6
@@ -27,6 +28,7 @@ from vpp_ipsec import VppIpsecSpd, VppIpsecSpdEntry, VppIpsecSA, VppIpsecSpdItfB
 from vpp_ip_route import VppIpRoute, VppRoutePath
 from vpp_ip import DpoProto
 from vpp_papi import VppEnum
+from config import config
 
 NUM_PKTS = 67
 engines_supporting_chain_bufs = ["openssl", "async"]
@@ -1075,6 +1077,9 @@ class MyParameters:
         }
 
 
+@unittest.skipIf(
+    "ping" in config.excluded_plugins, "Exclude tests requiring Ping plugin"
+)
 class RunTestIpsecEspAll(ConfigIpsecESP, IpsecTra4, IpsecTra6, IpsecTun4, IpsecTun6):
     """Ipsec ESP all Algos"""