Unify secondary pod handling and share pods under pre_provision

New pod type value to capture deployments that require a
secondary pod, mimicking logic used to deploy other pod types.

Created a new function to determine if secondary or primary IP
is required for a test case, and updated validate_offload to
use this new logic.

If in pre_provision mode and both primary and secondary tests
are specified, only one pod is deployed for both sets of test
cases, reducing the number of resources required. Currently
only supported for NORMAL and SECONDARY pods.

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

Author: vkunaparaju

pluginValidateOffload.py

@@ -481,11 +481,7 @@ def _thread_action() -> BaseOutput:
                 logger.info("There is no VF on an external server")
                 msg = "External Iperf Server"
             else:
-                ifname = (
-                    "net1"
-                    if self._perf_instance._network_type == "secondary"
-                    else "eth0"
-                )
+                ifname = "net1" if self._perf_instance.uses_secondary_ip else "eth0"
                 # Get VF representor - use DPU mode if configured
                 if self._is_dpu_mode:
                     logger.info("DPU mode: querying VF representor from DPU cluster")

task.py

@@ -45,12 +45,6 @@
 
 EXTERNAL_PERF_SERVER = "external-perf-server"
 
-_SECONDARY_MODES = (
-    ConnectionMode.MULTI_HOME,
-    ConnectionMode.MNP_2ND_DENY,
-    ConnectionMode.MNP_2ND_ALLOW,
-)
-
 
 NP_ACTION_ALLOW = "Allow"
 NP_ACTION_DENY = "Deny"
@@ -302,6 +296,7 @@ def __init__(
         self.task_role = task_role
         self.in_file_template = ""
         self.pod_name = ""
+        self.pod_type: Optional[PodType] = None
         self._setup_operation: Optional[TaskOperation] = None
         self._task_operation: Optional[TaskOperation] = None
         self._result: Optional[BaseOutput] = None
@@ -485,14 +480,19 @@ def _svc_backend_label(self) -> str:
 
     @property
     def _network_type(self) -> str:
-        if (
-            self.ts.connection_mode in _SECONDARY_MODES
-            or self.ts.test_case_id.is_udn_secondary
-            or self.ts.test_case_id.is_udn_localnet
-        ):
+        assert self.pod_type is not None
+        if self.pod_type == PodType.SECONDARY:
             return "secondary"
         return "primary"
 
+    @property
+    def uses_secondary_ip(self) -> bool:
+        # MNP_PRIMARY_DENY is a SECONDARY pod, but its traffic still flows on the primary IP
+        return (
+            self._network_type == "secondary"
+            and self.ts.connection_mode != ConnectionMode.MNP_PRIMARY_DENY
+        )
+
     def render_pod_file(self, log_info: str) -> None:
         self.render_file(
             log_info,
@@ -1115,9 +1115,10 @@ def __init__(self, ts: TestSettings):
         elif connection_mode == ConnectionMode.EXTERNAL_IP:
             in_file_template = ""
             pod_name = EXTERNAL_PERF_SERVER
-        elif (
-            self._network_type == "secondary"
-            or connection_mode == ConnectionMode.MNP_PRIMARY_DENY
+        elif pod_type == PodType.SECONDARY or (
+            pod_type == PodType.NORMAL
+            and ts.cfg_descr.get_tft().pre_provision
+            and ts.cfg_descr.get_tft().uses_secondary_network_pod
         ):
             in_file_template = "pod-secondary-network.yaml.j2"
             pod_name = f"normal-pod-secondary-server-{port}"
@@ -1420,11 +1421,11 @@ def __init__(self, ts: TestSettings, server: ServerTask):
         pod_type = ts.client_pod_type
         node_location = self.node_location
         port = server.port
-        connection_mode = ts.connection_mode
 
-        if (
-            self._network_type == "secondary"
-            or connection_mode == ConnectionMode.MNP_PRIMARY_DENY
+        if pod_type == PodType.SECONDARY or (
+            pod_type == PodType.NORMAL
+            and ts.cfg_descr.get_tft().pre_provision
+            and ts.cfg_descr.get_tft().uses_secondary_network_pod
         ):
             in_file_template = "pod-secondary-network.yaml.j2"
             pod_name = f"normal-pod-secondary-{node_location}-client"

testConfig.py

@@ -657,6 +657,10 @@ def logs_abspath(self) -> pathlib.Path:
             cwd=self.config.test_config.cwddir,
         )
 
+    @property
+    def uses_secondary_network_pod(self) -> bool:
+        return any(tc.info.uses_secondary_network_pod for tc in self.test_cases)
+
     def get_output_file(self) -> pathlib.Path:
         output_base = self.config.test_config.output_base
 

tftbase.py

@@ -368,6 +368,7 @@ class PodType(Enum):
     NORMAL = 1
     SRIOV = 2
     HOSTBACKED = 3
+    SECONDARY = 4
 
 
 class TestCaseType(Enum):
@@ -472,6 +473,14 @@ class ConnectionMode(Enum):
     LOAD_BALANCER = 14
 
 
+_SECONDARY_MODES = (
+    ConnectionMode.MULTI_HOME,
+    ConnectionMode.MNP_2ND_DENY,
+    ConnectionMode.MNP_2ND_ALLOW,
+    ConnectionMode.MNP_PRIMARY_DENY,
+)
+
+
 @strict_dataclass
 @dataclass(frozen=True, kw_only=True)
 class Bitrate:
@@ -908,16 +917,28 @@ def node_location(self) -> str:
             return "same-node"
         return "diff-node"
 
+    @property
+    def uses_secondary_network_pod(self) -> bool:
+        return (
+            self.connection_mode in _SECONDARY_MODES
+            or self.test_case_type.is_udn_secondary
+            or self.test_case_type.is_udn_localnet
+        )
+
     def get_server_pod_type(self, pod_type: PodType) -> PodType:
         if self.is_server_hostbacked:
             return PodType.HOSTBACKED
+        if self.uses_secondary_network_pod:
+            return PodType.SECONDARY
         if pod_type == PodType.SRIOV:
             return PodType.SRIOV
         return PodType.NORMAL
 
     def get_client_pod_type(self, pod_type: PodType) -> PodType:
         if self.is_client_hostbacked:
             return PodType.HOSTBACKED
+        if self.uses_secondary_network_pod:
+            return PodType.SECONDARY
         if pod_type == PodType.SRIOV:
             return PodType.SRIOV
         return PodType.NORMAL