EDGEPOD-83 Assign lower VFs to S1U interface than SGI interface

NGIC-DP assumes lower port interface is S1U but if it is not the
case, user packets are considered as spoofed packet and dropped.

Change-Id: Ie02bb2cb7697ed8a5bb469706786a0a8cd7bc607
diff --git a/omec/omec-data-plane/templates/networks.yaml b/omec/omec-data-plane/templates/networks.yaml
index c2e4a95..e937d62 100644
--- a/omec/omec-data-plane/templates/networks.yaml
+++ b/omec/omec-data-plane/templates/networks.yaml
@@ -22,7 +22,7 @@
   name: s1u-net
 {{- if $.Values.config.sriov.enabled }}
   annotations:
-    k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio
+    k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_s1u_net
 {{- end }}
 spec:
   config: '{
@@ -38,7 +38,7 @@
   name: sgi-net
 {{- if $.Values.config.sriov.enabled }}
   annotations:
-    k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio
+    k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_sgi_net
 {{- end }}
 spec:
   config: '{
diff --git a/omec/omec-data-plane/templates/statefulset-spgwu.yaml b/omec/omec-data-plane/templates/statefulset-spgwu.yaml
index f3452d4..593f2d2 100644
--- a/omec/omec-data-plane/templates/statefulset-spgwu.yaml
+++ b/omec/omec-data-plane/templates/statefulset-spgwu.yaml
@@ -125,14 +125,16 @@
 {{ toYaml .Values.resources.spgwu.requests | indent 12 }}
           {{- end }}
           {{- if .Values.config.sriov.enabled }}
-            intel.com/sriov_vfio: 2
+            intel.com/sriov_vfio_s1u_net: 1
+            intel.com/sriov_vfio_sgi_net: 1
           {{- end }}
           limits:
           {{- if .Values.resources.enabled }}
 {{ toYaml .Values.resources.spgwu.limits | indent 12 }}
           {{- end }}
           {{- if .Values.config.sriov.enabled }}
-            intel.com/sriov_vfio: 2
+            intel.com/sriov_vfio_s1u_net: 1
+            intel.com/sriov_vfio_sgi_net: 1
           {{- end }}
       volumes:
       - name: dp-script