Account for all offloaded pod network VFs

Request one VF for each attached secondary network and account for
the cluster default and primary UDN legs when pods share offloaded
networks.

Use the calculated quantity for SR-IOV and secondary-network pod
resources, and annotate generated NADs with the device resource
name.

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

Author: vkunaparaju

manifests/pod-secondary-network.yaml.j2

@@ -21,12 +21,14 @@ spec:
     image: {{ test_image }}
     command: {{ command }}
     args: {{ args }}
-    imagePullPolicy: {{ image_pull_policy }}{% if has_resources %}
+    imagePullPolicy: {{ image_pull_policy }}{% if has_resource_name or has_resources %}
     resources:
-      requests: {% if cpu_request %}
+      requests: {% if has_resource_name %}
+        {{ resource_name }}: {{ sriov_resource_quantity }}{% endif %}{% if cpu_request %}
         cpu: {{ cpu_request }}{% endif %}{% if mem_request %}
         memory: {{ mem_request }}{% endif %}
-      limits: {% if cpu_limit %}
+      limits: {% if has_resource_name %}
+        {{ resource_name }}: {{ sriov_resource_quantity }}{% endif %}{% if cpu_limit %}
         cpu: {{ cpu_limit }}{% endif %}{% if mem_limit %}
         memory: {{ mem_limit }}{% endif %}{% endif %}
     securityContext:

manifests/secondary-nad.yaml.j2

@@ -2,7 +2,9 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: {{ nad_name }}
-  namespace: {{ name_space }}
+  namespace: {{ name_space }}{% if has_resource_name %}
+  annotations:
+    k8s.v1.cni.cncf.io/resourceName: {{ resource_name }}{% endif %}
   labels:
     tft-tests: "secondary-nad"
 spec:
@@ -13,8 +15,7 @@ spec:
     "Role": "secondary",
     "topology": {{ topology }},
     "subnets": {{ subnets }},
-    "mtu": {{ mtu }},{% if has_resource_name %}
-    "resourceName": {{ resource_name }},{% endif %}
+    "mtu": {{ mtu }},
     "type": "ovn-k8s-cni-overlay",
     "logFile": "/var/log/ovn-kubernetes/flowtest.log",
     "logLevel": "5",

manifests/sriov-pod.yaml.j2

@@ -25,11 +25,11 @@ spec:
     imagePullPolicy: {{ image_pull_policy }}{% if has_resource_name or has_resources %}
     resources:
       requests: {% if has_resource_name %}
-        {{ resource_name }}: '1'{% endif %}{% if cpu_request %}
+        {{ resource_name }}: {{ sriov_resource_quantity }}{% endif %}{% if cpu_request %}
         cpu: {{ cpu_request }}{% endif %}{% if mem_request %}
         memory: {{ mem_request }}{% endif %}
       limits: {% if has_resource_name %}
-        {{ resource_name }}: '1'{% endif %}{% if cpu_limit %}
+        {{ resource_name }}: {{ sriov_resource_quantity }}{% endif %}{% if cpu_limit %}
         cpu: {{ cpu_limit }}{% endif %}{% if mem_limit %}
         memory: {{ mem_limit }}{% endif %}{% endif %}
     securityContext:

task.py

@@ -447,6 +447,22 @@ def _get_pod_secondary_network_nads(self) -> tuple[str, ...]:
             return (self._get_effective_secondary_network_nad(),)
         return ()
 
+    def _get_sriov_resource_quantity(
+        self,
+        secondary_network_nads: tuple[str, ...],
+    ) -> str:
+        if self.pod_type == PodType.SRIOV:
+            return str(1 + int(self.ts.test_case_id.is_udn_primary))
+        needs_primary_udn_vf = self.ts.test_case_id.is_udn_secondary and any(
+            test_case.is_udn_primary
+            for test_case in self.ts.cfg_descr.get_tft().test_cases
+        )
+        return str(
+            len(secondary_network_nads)
+            + int(self.node.sriov)
+            + int(needs_primary_udn_vf)
+        )
+
     def get_template_args(self) -> dict[str, str | list[str] | bool]:
         resource_name = self.get_resource_name()
         conn = self.ts.connection
@@ -482,6 +498,9 @@ def get_template_args(self) -> dict[str, str | list[str] | bool]:
             ),
             "has_resource_name": bool(resource_name),
             "resource_name": _j(resource_name),
+            "sriov_resource_quantity": _j(
+                self._get_sriov_resource_quantity(pod_secondary_network_nads)
+            ),
             "default_network": _j(self.node.default_network),
             "has_resources": has_resources,
             "cpu_request": conn.cpu_request or "",