AETHER-3366 Remove simpleovs CNI support
Change-Id: If7b9411b6dc4e4e06ee4cf75bf389faf066fb47a
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index 79a36e7..14e0770 100644
--- a/5g-ran-sim/Chart.yaml
+++ b/5g-ran-sim/Chart.yaml
@@ -8,4 +8,4 @@
name: 5g-ran-sim
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.4.14
+version: 0.4.15
diff --git a/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl b/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl
index bc5db92..e262373 100644
--- a/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl
+++ b/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl
@@ -16,10 +16,8 @@
{{- if not .Values.config.gnbsim.singleInterface }}
{{- range .Values.config.gnbsim.networkTopo }}
-ip route add {{ .upfAddr }} via {{ .upfGw }}
+ip route replace {{ .upfAddr }} via {{ .upfGw }}
+{{- end }}
{{- end }}
-# Disabling checksum offloading to hardware
-ethtool -K enb tx off
-{{- end }}
sleep infinity
diff --git a/5g-ran-sim/templates/networks.yaml b/5g-ran-sim/templates/networks.yaml
index e75920e..90f9d20 100644
--- a/5g-ran-sim/templates/networks.yaml
+++ b/5g-ran-sim/templates/networks.yaml
@@ -8,10 +8,10 @@
apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
- name: enb-net
+ name: gnb-net
{{- if $.Values.config.gnbsim.sriov.enabled }}
annotations:
- k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_access_net
+ k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.gnbsim.sriov.resourceName }}
{{- end }}
spec:
config: '{
@@ -19,6 +19,12 @@
"cniVersion": "0.3.1",
{{- end }}
"type": {{ .Values.config.gnbsim.cniPlugin | quote }},
+ {{- if eq .Values.config.gnbsim.cniPlugin "macvlan" }}
+ "master": {{ .Values.config.gnbsim.iface | quote }},
+ {{- end }}
+ {{- if eq .Values.config.gnbsim.cniPlugin "host-device" }}
+ "device": {{ .Values.config.gnbsim.iface | quote }},
+ {{- end }}
"ipam": {
"type": {{ .Values.config.gnbsim.ipam | quote }}
}
diff --git a/5g-ran-sim/templates/statefulset-gnbsim.yaml b/5g-ran-sim/templates/statefulset-gnbsim.yaml
index 88a0146..090e66e 100644
--- a/5g-ran-sim/templates/statefulset-gnbsim.yaml
+++ b/5g-ran-sim/templates/statefulset-gnbsim.yaml
@@ -27,8 +27,8 @@
annotations:
k8s.v1.cni.cncf.io/networks: '[
{
- "name": "enb-net",
- "interface": "enb",
+ "name": "gnb-net",
+ "interface": "gnb",
{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
"ips": [{{ .Values.config.gnbsim.gnb.ip | quote }}]
{{- else }}
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index a4926b0..0238c8e 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -33,10 +33,16 @@
path: /tmp/coredump
gnbsim:
deploy: true
+ singleInterface: false
+ networkTopo:
+ - upfAddr: "192.168.252.3/32"
+ upfGw: "192.168.251.1"
sriov:
enabled: disabled
+ resourceName: "intel.com/intel_sriov_vfio"
ipam: static
- cniPlugin: simpleovs #need override value
+ cniPlugin: macvlan # supported CNIs: sriov, macvlan, host-device
+ iface: data # master in macvlan or device in host-device
gnb:
ip: 192.168.251.5/24 #user plane IP at gnb if 2 separate interface provided
profile:
@@ -47,10 +53,6 @@
nodePort:
enabled: false
port: 30071
- singleInterface: false
- networkTopo:
- - upfAddr: "192.168.252.3/32"
- upfGw: "192.168.251.1"
yamlCfgFiles:
gnb.conf:
info: