Update 5G NF images & gNBSIm image tags
Change-Id: Ia3cc4b63b2f583cce6eaf8a2210d8c14dbcdfe3f
diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index d4b471d..d30d878 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.7.13
+version: 0.7.14
dependencies:
- name: mongodb
diff --git a/5g-control-plane/templates/bin/_upf-adapter-run.sh.tpl b/5g-control-plane/templates/bin/_upf-adapter-run.sh.tpl
index 20c518b..d823139 100644
--- a/5g-control-plane/templates/bin/_upf-adapter-run.sh.tpl
+++ b/5g-control-plane/templates/bin/_upf-adapter-run.sh.tpl
@@ -7,11 +7,11 @@
set -xe
{{- if .Values.config.coreDump.enabled }}
-cp /bin/upf-adapter /tmp/coredump/
+cp /free5gc/bin/upf-adapter /tmp/coredump/
{{- end }}
cd /free5gc
cat config/config.yaml
-GOTRACEBACK=crash /bin/upf-adapter config/config.yaml
+GOTRACEBACK=crash ./bin/upf-adapter config/config.yaml
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index 5f65c26..3a7615c 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -7,18 +7,18 @@
repository: "" #default docker hub
tags:
init: omecproject/pod-init:1.0.0
- amf: omecproject/5gc-amf:master-5a47e34
- nrf: omecproject/5gc-nrf:master-5200cf8
- smf: omecproject/5gc-smf:master-9498f2d
- ausf: omecproject/5gc-ausf:master-1890449
- nssf: omecproject/5gc-nssf:master-bb79816
- pcf: omecproject/5gc-pcf:master-e3db7df
- udr: omecproject/5gc-udr:master-71592fa
- udm: omecproject/5gc-udm:master-4bc7ed6
+ amf: omecproject/5gc-amf:master-af1c9f1
+ nrf: omecproject/5gc-nrf:master-4313faa
+ smf: omecproject/5gc-smf:master-d7c32f2
+ ausf: omecproject/5gc-ausf:master-c84dff4
+ nssf: omecproject/5gc-nssf:master-4e5aef3
+ pcf: omecproject/5gc-pcf:master-bcbdeb0
+ udr: omecproject/5gc-udr:master-35eb7b7
+ udm: omecproject/5gc-udm:master-a0f0671
webui: omecproject/5gc-webui:master-fec9bfc
- sctplb: omecproject/sctplb:master-538dad6
+ sctplb: omecproject/sctplb:master-bf081d5
metricfunc: metricfunc:0.0.1-dev-local0
- upfadapter: omecproject/5gc-smf:master-b73f587
+ upfadapter: omecproject/5gc-smf:master-d7c32f2
pullPolicy: IfNotPresent
resources:
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index c07417d..2e2162f 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.5.8
+version: 0.5.9
diff --git a/5g-ran-sim/templates/configmap-gnbsim.yaml b/5g-ran-sim/templates/configmap-gnbsim.yaml
index 75e0755..ec49c44 100644
--- a/5g-ran-sim/templates/configmap-gnbsim.yaml
+++ b/5g-ran-sim/templates/configmap-gnbsim.yaml
@@ -18,13 +18,9 @@
{{- $_ := dict "enable" .Values.config.gnbsim.httpServer.enable "ipAddr" .Values.config.gnbsim.httpServer.ipAddr "port" .Values.config.gnbsim.httpServer.port | set $configuration "httpServer" -}}
{{- end }}
-{{- if not (hasKey $configuration "singleInterface") -}}
-{{- $_ := .Values.config.gnbsim.singleInterface | set $configuration "singleInterface" -}}
-{{- end }}
{{- $_ := .Values.config.gnbsim.networkTopo | set $configuration "networkTopo" -}}
{{- end }}
-
---
apiVersion: v1
kind: ConfigMap
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 9de4ca3..b88d7da 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -6,7 +6,7 @@
repository: "" #default docker hub
tags:
init: omecproject/pod-init:1.0.0
- gnbsim: omecproject/5gc-gnbsim:main-cd26209
+ gnbsim: omecproject/5gc-gnbsim:main-0e4b557
pullPolicy: IfNotPresent
nodeSelectors:
@@ -34,7 +34,6 @@
gnbsim:
deploy: true
serviceType: ClusterIP
- singleInterface: false
networkTopo:
- upfAddr: "192.168.252.3/32"
upfGw: "192.168.251.1"
@@ -66,7 +65,8 @@
logger:
logLevel: info # how detailed the log will be, values: trace, debug, info, warn, error, fatal, panic
configuration:
- #singleInterface: #this will be added thorugh configmap script
+ singleInterface: #this will be added thorugh configmap script
+ execInParallel: false #run all profiles in parallel
gnbs: # pool of gNodeBs
gnb1:
n2IpAddr: # gNB N2 interface IP address used to connect to AMF
@@ -100,6 +100,8 @@
profileName: profile1 # uniqely identifies a profile within application
enable: false # Set true to execute the profile, false otherwise.
gnbName: gnb1 # gNB to be used for this profile
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo re than 1
ueCount: 5 # Number of UEs for for which the profile will be executed
defaultAs: "192.168.250.1" #default icmp pkt destination
@@ -112,6 +114,8 @@
profileName: profile2
enable: true
gnbName: gnb1
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007492
ueCount: 5
opc: "981d464c7c52eb6e5036234984ad0bcf"
@@ -125,6 +129,8 @@
profileName: profile3
enable: false
gnbName: gnb1
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007497
ueCount: 5
opc: "981d464c7c52eb6e5036234984ad0bcf"
@@ -137,6 +143,8 @@
profileName: profile4
enable: false
gnbName: gnb1
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007497
ueCount: 5
opc: "981d464c7c52eb6e5036234984ad0bcf"
@@ -149,6 +157,8 @@
profileName: profile5
enable: false
gnbName: gnb1
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007497
ueCount: 5
opc: "981d464c7c52eb6e5036234984ad0bcf"
@@ -161,6 +171,8 @@
profileName: profile6 # uniqely identifies a profile within application
enable: false # Set true to execute the profile, false otherwise.
gnbName: gnb1 # gNB to be used for this profile
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007497 # First IMSI. Subsequent values will be used if ueCount is more than 1
ueCount: 5 # Number of UEs for for which the profile will be executed
defaultAs: "192.168.250.1" #default icmp pkt destination
@@ -174,6 +186,8 @@
profileName: profile7 # uniqely identifies a profile within application
enable: false # Set true to execute the profile, false otherwise.
gnbName: gnb1 # gNB to be used for this profile
+ execInParallel: false #run all subscribers in this profile parallel
+ stepTrigger: false #wait for trigger to move to next step
startImsi: 208930100007497 # First IMSI. Subsequent values will be used if ueCount is more than 1
ueCount: 5 # Number of UEs for for which the profile will be executed
opc: "981d464c7c52eb6e5036234984ad0bcf"