1 files changed, 23 insertions, 5 deletions
diff --git a/test/test_flowprobe.py b/test/test_flowprobe.py
index 8e3fecfd7b4..18a2e3a36c2 100644
--- a/test/test_flowprobe.py
+++ b/test/test_flowprobe.py
@@ -16,7 +16,6 @@ from config import config
 from framework import VppTestCase
 from asfframework import (
     tag_fixme_vpp_workers,
-    tag_fixme_ubuntu2204,
     tag_fixme_debian11,
     tag_run_solo,
     is_distro_ubuntu2204,
@@ -31,6 +30,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
@@ -183,9 +183,7 @@ class MethodHolder(VppTestCase):
         variables and configure VPP.
         """
         super(MethodHolder, cls).setUpClass()
-        if (is_distro_ubuntu2204 == True or is_distro_debian11 == True) and not hasattr(
-            cls, "vpp"
-        ):
+        if (is_distro_debian11 == True) and not hasattr(cls, "vpp"):
             return
         try:
             # Create pg interfaces
@@ -384,8 +382,10 @@ class MethodHolder(VppTestCase):
 
 @tag_run_solo
 @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"""
 
@@ -1228,6 +1228,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)"""
 
@@ -1308,6 +1311,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)"""
 
@@ -1318,6 +1324,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"""
 
@@ -1366,6 +1375,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"""
 
@@ -1433,6 +1445,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"""
 
@@ -1541,6 +1556,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"""