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-cni/Chart.yaml b/omec/omec-data-plane-cni/Chart.yaml
index 89ce295..be46241 100644
--- a/omec/omec-data-plane-cni/Chart.yaml
+++ b/omec/omec-data-plane-cni/Chart.yaml
@@ -18,4 +18,4 @@
name: omec-data-plane-cni
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.1
+version: 1.0.2
diff --git a/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml b/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
index 6b625ed..2099c34 100644
--- a/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
+++ b/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
@@ -25,9 +25,16 @@
{
"resourceList": [
{
- "resourceName": "sriov_vfio",
+ "resourceName": "sriov_vfio_s1u_net",
"selectors": {
- "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.pfNames }},
+ "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.s1uPfNames }},
+ "drivers": ["vfio-pci"]
+ }
+ },
+ {
+ "resourceName": "sriov_vfio_sgi_net",
+ "selectors": {
+ "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.sgiPfNames }},
"drivers": ["vfio-pci"]
}
}
diff --git a/omec/omec-data-plane-cni/values.yaml b/omec/omec-data-plane-cni/values.yaml
index 9b0d814..a7346e5 100644
--- a/omec/omec-data-plane-cni/values.yaml
+++ b/omec/omec-data-plane-cni/values.yaml
@@ -15,7 +15,7 @@
images:
tags:
omecCni: docker.io/omecproject/omec-cni:1.0.0
- sriovPlugin: docker.io/nfvpe/sriov-device-plugin:v3.0.0
+ sriovPlugin: docker.io/nfvpe/sriov-device-plugin:v3.1
pullPolicy: IfNotPresent
config:
@@ -24,10 +24,13 @@
# If your cluster has multiple nodes with different interface names,
# simply provide the whole list
resourceList:
- # Provide PF name with its VFs are bounded to vfio-pci driver
+ # Provide PF name with VF range for S1U and SGI interfaces.
+ # Note that VF range of S1U must be smaller than SGI's.
vfio:
- pfNames:
- - eno1
+ s1uPfNames:
+ - eno1#0-3
+ sgiPfNames:
+ - eno1#4-7
# Provide PF name with its VFs bounded to PF's driver
# The driver name must be specified to prevent one interface is
# registered to both vfio and netdevice resource pools
diff --git a/omec/omec-data-plane/Chart.yaml b/omec/omec-data-plane/Chart.yaml
index e20e7bf..5b334b1 100644
--- a/omec/omec-data-plane/Chart.yaml
+++ b/omec/omec-data-plane/Chart.yaml
@@ -19,4 +19,4 @@
name: omec-data-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.10
+version: 0.1.11
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