Remove port from client pod names and use pod name for service

selectors

Client pod names no longer include the port suffix, allowing pods
to be reused across test types in pre_provision mode. Server pod
names retain the port suffix so the persistent server feature can
still be used with multiple connection types. Service selectors
now match on tft-pod-name instead of tft-port and tft-network.

Created ensure_services() from initialize() so pre-provisioned
server pods create services, which are still unique to the test
type since they operate on port-protocol binding.

Signed-off-by: Venkat Kunaparaju <vkunaparaju@nvidia.com>

Author: vkunaparaju

manifests/host-pod.yaml.j2

@@ -5,7 +5,7 @@ metadata:
   name: {{ pod_name }}
   labels:
     tft-tests: {{ label_tft_tests }}
-    tft-port: "{{ port }}"
+    tft-pod-name: {{ pod_name }}
     tft-network: primary
 spec:
   hostNetwork: true

manifests/pod-secondary-network.yaml.j2

@@ -5,7 +5,7 @@ metadata:
   name: {{ pod_name }}
   labels:
     tft-tests: {{ label_tft_tests }}
-    tft-port: "{{ port }}"
+    tft-pod-name: {{ pod_name }}
     tft-network: secondary
   annotations:
     k8s.v1.cni.cncf.io/networks: {{ secondary_network_nad }}

manifests/pod.yaml.j2

@@ -5,7 +5,7 @@ metadata:
   name: {{ pod_name }}
   labels:
     tft-tests: {{ label_tft_tests }}
-    tft-port: "{{ port }}"
+    tft-pod-name: {{ pod_name }}
     tft-network: primary
 spec:
   nodeSelector:

manifests/sriov-pod.yaml.j2

@@ -8,7 +8,7 @@ metadata:
     k8s.v1.cni.cncf.io/networks: {{ secondary_network_nad }} {% endif %}
   labels:
     tft-tests: {{ label_tft_tests }}
-    tft-port: "{{ port }}"
+    tft-pod-name: {{ pod_name }}
     tft-network: primary
 spec:
   nodeSelector:

manifests/svc-cluster-ip.yaml.j2

@@ -15,5 +15,4 @@ spec:
       protocol: UDP
       port: {{ port }}
   selector:
-    tft-port: "{{ port }}"
-    tft-network: {{ network_type }}
+    tft-pod-name: {{ pod_name }}

manifests/svc-loadbalancer.yaml.j2

@@ -16,5 +16,4 @@ spec:
       protocol: UDP
       port: {{ port }}
   selector:
-    tft-port: "{{ port }}"
-    tft-network: {{ network_type }}
+    tft-pod-name: {{ pod_name }}

manifests/svc-node-port.yaml.j2

@@ -15,5 +15,4 @@ spec:
       protocol: UDP
       port: {{ port }}
   selector:
-    tft-port: "{{ port }}"
-    tft-network: {{ network_type }}
+    tft-pod-name: {{ pod_name }}

task.py

@@ -1105,7 +1105,7 @@ def __init__(self, ts: TestSettings):
             ConnectionMode.MNP_PRIMARY_DENY,
         ):
             in_file_template = "pod-secondary-network.yaml.j2"
-            pod_name = f"normal-pod-secondary-network-server-{port}"
+            pod_name = f"normal-pod-secondary-server-{port}"
         elif pod_type == PodType.SRIOV:
             in_file_template = "sriov-pod.yaml.j2"
             pod_name = f"sriov-pod-server-{port}"
@@ -1145,16 +1145,20 @@ def _svc_backend_label(self) -> str:
         )
         return f"{prefix}-{self.port}"
 
-    def initialize(self) -> None:
-        super().initialize()
-
+    def ensure_services(self) -> None:
         if self.in_file_template != "":
-            self.render_pod_file("Server Pod Yaml")
             if self.get_cluster_ip() is None:
                 self.create_cluster_ip_service()
             if self.get_nodeport_ip() is None:
                 self.create_node_port_service()
 
+    def initialize(self) -> None:
+        super().initialize()
+
+        if self.in_file_template != "":
+            self.render_pod_file("Server Pod Yaml")
+        self.ensure_services()
+
     def _get_template_args_args(self) -> list[str]:
         if not self.exec_persistent:
             return []
@@ -1400,16 +1404,16 @@ def __init__(self, ts: TestSettings, server: ServerTask):
             ConnectionMode.MNP_PRIMARY_DENY,
         ):
             in_file_template = "pod-secondary-network.yaml.j2"
-            pod_name = f"normal-pod-secondary-network-{node_location}-client-{port}"
+            pod_name = f"normal-pod-secondary-{node_location}-client"
         elif pod_type == PodType.SRIOV:
             in_file_template = "sriov-pod.yaml.j2"
-            pod_name = f"sriov-pod-{node_location}-client-{port}"
+            pod_name = f"sriov-pod-{node_location}-client"
         elif pod_type == PodType.NORMAL:
             in_file_template = "pod.yaml.j2"
-            pod_name = f"normal-pod-{node_location}-client-{port}"
+            pod_name = f"normal-pod-{node_location}-client"
         elif pod_type == PodType.HOSTBACKED:
             in_file_template = "host-pod.yaml.j2"
-            pod_name = f"host-pod-{node_location}-client-{port}"
+            pod_name = f"host-pod-{node_location}-client"
         else:
             raise ValueError("Invalid pod_type {pod_type}")
 

trafficFlowTests.py

@@ -353,6 +353,8 @@ def _provision_all_resources(self, cfg_descr: ConfigDescriptor) -> None:
                         seen_server_pods.add(s.pod_name)
                         s.initialize()
                         s.start_setup(provisioning=True)
+                    else:
+                        s.ensure_services()
 
                     if c.pod_name not in seen_client_pods:
                         seen_client_pods.add(c.pod_name)