Merge pull request #281 from Venkat-Kunaparaju/fix-plugin

Exclude plugins from pre-provisioning

Author: wizhaoredhat

trafficFlowTests.py

@@ -373,10 +373,13 @@ def _run_test_case_instance(
         ts.initialize_clmo_barrier(len(clients) + len(monitors))
 
         pre_provision = cfg_descr.get_tft().pre_provision
-        for tasks in servers + clients + monitors:
+        for sc_task in servers + clients:
             if not pre_provision:
-                tasks.initialize()
-            tasks.start_setup(skip_pod_setup=pre_provision)
+                sc_task.initialize()
+            sc_task.start_setup(skip_pod_setup=pre_provision)
+        for mon in monitors:
+            mon.initialize()
+            mon.start_setup()
 
         ts.event_server_alive.wait()
 
@@ -403,7 +406,6 @@ def _provision_all_resources(self, cfg_descr: ConfigDescriptor) -> None:
 
         seen_server_pods: set[str] = set()
         seen_client_pods: set[str] = set()
-        seen_monitor_pods: set[str] = set()
 
         for cfg_descr2 in cfg_descr.describe_all_test_cases():
             if cfg_descr2.get_test_case().is_udn and not self._udn_setup_done:
@@ -431,17 +433,6 @@ def _provision_all_resources(self, cfg_descr: ConfigDescriptor) -> None:
                         c.initialize()
                         c.start_setup(provisioning=True)
 
-                    for plugin in connection.plugins:
-                        if not plugin.applies_to_test_case(cfg_descr3.get_test_case()):
-                            continue
-                        for m in plugin.plugin.enable(
-                            ts=ts, perf_server=s, perf_client=c, tenant=True
-                        ):
-                            if m.pod_name not in seen_monitor_pods:
-                                seen_monitor_pods.add(m.pod_name)
-                                m.initialize()
-                                m.start_setup(provisioning=True)
-
     def _run_test_case(self, cfg_descr: ConfigDescriptor) -> list[TftResult]:
         # TODO Allow for multiple connections / instances to run simultaneously
         tft_results: list[TftResult] = []