Skip to content

Commit 0c843b7

Browse files
authored
Merge pull request #293 from Venkat-Kunaparaju/ns-prov
Pre_provision pods by both namespace and the pod name
2 parents bdb7dc8 + 5f85c62 commit 0c843b7

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

trafficFlowTests.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,8 @@ def _run_test_case_instance(
470470
def _provision_all_resources(self, cfg_descr: ConfigDescriptor) -> None:
471471
logger.info("Pre-provisioning all pods and services for the test run")
472472

473-
seen_server_pods: set[str] = set()
474-
seen_client_pods: set[str] = set()
473+
seen_server_pods: set[tuple[str, str]] = set()
474+
seen_client_pods: set[tuple[str, str]] = set()
475475

476476
for cfg_descr2 in cfg_descr.describe_all_test_cases():
477477
if cfg_descr2.get_test_case().is_udn and not self._udn_setup_done:
@@ -486,16 +486,19 @@ def _provision_all_resources(self, cfg_descr: ConfigDescriptor) -> None:
486486
)
487487
s, c = connection.test_type_handler.create_server_client(ts)
488488

489+
s_key = (s.get_namespace(), s.pod_name)
490+
c_key = (c.get_namespace(), c.pod_name)
491+
489492
# EXTERNAL_IP runs via podman; leave those per-test.
490-
if s.pod_name not in seen_server_pods:
491-
seen_server_pods.add(s.pod_name)
493+
if s_key not in seen_server_pods:
494+
seen_server_pods.add(s_key)
492495
s.initialize()
493496
s.start_setup(provisioning=True)
494497
else:
495498
s.ensure_services()
496499

497-
if c.pod_name not in seen_client_pods:
498-
seen_client_pods.add(c.pod_name)
500+
if c_key not in seen_client_pods:
501+
seen_client_pods.add(c_key)
499502
c.initialize()
500503
c.start_setup(provisioning=True)
501504

0 commit comments

Comments
 (0)