(fix) Adding extra slice variables in helm chart

charts/oai-5g-core/oai-5g-basic/values.yaml

@@ -111,6 +111,12 @@ oai-spgwu-tiny:
     nssaiSst0: 1 # should match with SMF information
     nssaiSd0: 10203  # should match with SMF information
     dnn0: "oai" # should match with SMF information
+    nssaiSst1: 1 # should match with SMF information
+    nssaiSd1: 1  # should match with SMF information
+    dnn1: "oai.ipv4" # should match with SMF information
+    nssaiSst2: 222 # should match with SMF information
+    nssaiSd2: 123  # should match with SMF information
+    dnn2: "default" # should match with SMF information
     mcc: 208 # should match with AMF and SMF
     mnc: 99 # should match with AMF and SMF
     netUeIp: "12.1.1.0/24"        #Make sure that the UE ip-address are allocated in this range

charts/oai-5g-core/oai-5g-mini/values.yaml

@@ -78,6 +78,12 @@ oai-spgwu-tiny:
     nssaiSst0: 1 # should match with SMF information
     nssaiSd0: 10203  # should match with SMF information
     dnn0: "oai" # should match with SMF information
+    nssaiSst1: 1 # should match with SMF information
+    nssaiSd1: 1  # should match with SMF information
+    dnn1: "oai.ipv4" # should match with SMF information
+    nssaiSst2: 222 # should match with SMF information
+    nssaiSd2: 123  # should match with SMF information
+    dnn2: "default" # should match with SMF information
     mcc: 208 # should match with AMF and SMF
     mnc: 99 # should match with AMF and SMF
     netUeIp: "12.1.1.0/24"

charts/oai-5g-core/oai-5g-slicing/values.yaml

@@ -120,6 +120,12 @@ oai-spgwu-tiny:
     nssaiSst0: 1 # should match with SMF information
     nssaiSd0: 10203  # should match with SMF information
     dnn0: "oai" # should match with SMF information
+    nssaiSst1: 1 # should match with SMF information
+    nssaiSd1: 1  # should match with SMF information
+    dnn1: "oai.ipv4" # should match with SMF information
+    nssaiSst2: 222 # should match with SMF information
+    nssaiSd2: 123  # should match with SMF information
+    dnn2: "default" # should match with SMF information
     mcc: 208 # should match with AMF and SMF
     mnc: 99 # should match with AMF and SMF
     netUeIp: "12.1.1.0/24"

charts/oai-5g-ran/oai-gnb-du/values.yaml

@@ -68,9 +68,8 @@ multus:    # needed when gnB service will run on another interface rather than t
   f1Netmask: "22"
   defaultGateway: "172.21.11.254"
   hostInterface: "ens2f0np0"      # Interface of the host machine on which this pod will be scheduled
-  rruInterfaceIpadd: "192.168.80.200"
+  rruInterfaceIpadd: "192.168.80.95"
   rruInterfaceNetmask: "24"
-  rruInterfaceGateway: "192.168.80.1"
 
 config:
   timeZone: "Europe/Paris"

docs/BUILD_IMAGES.md

@@ -75,7 +75,7 @@ or a little bit more dangerous
 
 ```bash
 $ ./scripts/syncComponents.sh --nrf-branch v1.4.0 --amf-branch v1.4.0 \
-                              --smf-branch v1.4.0 --spgwu-tiny-branch v1.1.6 \
+                              --smf-branch v1.4.0 --spgwu-tiny-branch v1.4.0 \
                               --udr-branch v1.4.0 --udm-branch v1.4.0 \
                               --ausf-branch v1.4.0 --upf-vpp-branch v1.4.0 \
                               --nssf-branch v1.4.0
@@ -83,7 +83,7 @@ $ ./scripts/syncComponents.sh --nrf-branch v1.4.0 --amf-branch v1.4.0 \
 OAI-NRF     component branch : v1.4.0
 OAI-AMF     component branch : v1.4.0
 OAI-SMF     component branch : v1.4.0
-OAI-SPGW-U  component branch : v1.1.6
+OAI-SPGW-U  component branch : v1.4.0
 OAI-UDR     component branch : v1.4.0
 OAI-UDM     component branch : v1.4.0
 OAI-AUSF    component branch : v1.4.0

docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md

@@ -401,7 +401,7 @@ docker-compose-host $: ping <ue-ip-address>
 - The `oai-ext-dn` container is optional and is only required if the user wants to ping from the UE. In general this container is not required except for testing purposes.
 - Using the python script from above you can perform minimum `AMF, SMF, UPF (SPGWU), NRF, MYSQL` and basic `AMF, SMF, UPF (SPGWU), NRF, UDM, UDR, AUSF, MYSQL` 5g core funtional testing with `FQDN/IP` based feature along with `NRF/noNRF`. Check the configuration before using the docker compose [files](../docker-compose/).
 - This tutorial can be taken as reference to test the OAI 5G core with a COTS UE. The configuration files has to be changed according to the gNB and COTS UE information should be present in the mysql database. 
-- In case you are interested to use HTTP V2 for SBI between the network functions instead of HTTP V1 then you have to use [docker-compose-basic-nrf-httpv2.yaml](../docker-compose/docker-compose-basic-nrf-httpv2.yaml)
+- In case you are interested to use HTTP V2 for SBI between the network functions instead of HTTP V1 then you have to use [docker-compose-basic-nrf-http2.yaml](../docker-compose/docker-compose-basic-nrf-http2.yaml)
 - Generally, in a COTS UE two PDN sessions are created by default so configure the IMS in SMF properly. 
 - In case you want to deploy debuggers/developers core network environment with more logs please follow [this tutorial](./DEBUG_5G_CORE.md)
 - It is not necessary to use [core-network.py](../docker-compose/core-network.py) bash script, it is possible to directly deploy using `docker-compose` command

docs/DEPLOY_SA5G_BASIC_STATIC_UE_IP.md

@@ -320,7 +320,7 @@ docker-compose-host $: sed -i 's/SMF_SELECTION=no/SMF_SELECTION=yes/g' docker-co
 - The `oai-ext-dn` container is optional and is only required if the user wants to ping from the UE. In general this container is not required except for testing purposes.
 - Using the python script from above you can perform minimum `AMF, SMF, UPF (SPGWU), NRF, MYSQL` and basic `AMF, SMF, UPF (SPGWU), NRF, UDM, UDR, AUSF, MYSQL` 5g core funtional testing with `FQDN/IP` based feature along with `NRF/noNRF`. Check the configuration before using the docker compose [files](../docker-compose/).
 - This tutorial can be taken as reference to test the OAI 5G core with a COTS UE. The configuration files has to be changed according to the gNB and COTS UE information should be present in the mysql database. 
-- In case you are interested to use HTTP V2 for SBI between the network functions instead of HTTP V1 then you have to use [docker-compose-basic-nrf-httpv2.yaml](../docker-compose/docker-compose-basic-nrf-httpv2.yaml)
+- In case you are interested to use HTTP V2 for SBI between the network functions instead of HTTP V1 then you have to use [docker-compose-basic-nrf-http2.yaml](../docker-compose/docker-compose-basic-nrf-http2.yaml)
 - Generally, in a COTS UE two PDN sessions are created by default so configure the IMS in SMF properly. Currently some parameters can not be configured via [docker-compose-basic-nrf.yaml](../docker-compose/docker-compose-basic-nrf.yaml). We recommend you directly configure them in the conf file and mount the file in the docker during run time. 
 - It is not necessary to use [core-network.py](../docker-compose/core-network.py) bash script, it is possible to directly deploy using `docker-compose` command
 - In case you want to deploy debuggers/developers core network environment with more logs please follow [this tutorial](./DEBUG_5G_CORE.md)

docs/DEPLOY_SA5G_WITH_My5g-RANTester.md

@@ -338,8 +338,17 @@ docker-compose-host $: docker logs oai-udr > /tmp/oai/vpp-upf-my5g/udr.log 2>&1
 docker-compose-host $: docker logs oai-udm > /tmp/oai/vpp-upf-my5g/udm.log 2>&1
 docker-compose-host $: docker logs oai-ausf > /tmp/oai/vpp-upf-my5g/ausf.log 2>&1
 docker-compose-host $: docker logs my5grantester > /tmp/oai/vpp-upf-my5g/my5grantester.log 2>&1
+
+```
+
+## Stop the core network
+
+``` shell
+docker-compose-host $: docker-compose -f docker-compose-my5grantester-vpp.yaml down
+docker-compose-host $: python3 ./core-network.py --type stop-basic-vpp --scenario 1
 ```
 
+
 ## 8. Analysing the Scenario Results
 
 | Pcap/log files                                                                             |
@@ -349,11 +358,4 @@ docker-compose-host $: docker logs my5grantester > /tmp/oai/vpp-upf-my5g/my5gran
 
 * For detailed analysis of messages, please refer previous tutorial of [testing with dsTester](./docs/DEPLOY_SA5G_WITH_DS_TESTER.md).
 
-## 9. Undeploy
-
-Last thing is to remove the gnb simulator and core network
 
-``` shell
-docker-compose-host $: docker-compose -f docker-compose-my5grantester-vpp.yaml down
-docker-compose-host $: python3 ./core-network.py --type stop-basic-vpp --scenario 1
-```

docs/RETRIEVE_OFFICIAL_IMAGES.md

@@ -32,38 +32,41 @@ Password:
 ```
 
 The OAI CI/CD team has automated more frequent pushes to Docker-Hub on `oaisoftwarealliance` account. Two important things to be noted:
-  - We will keep pushing to the `latest` tag when a milestone is reached.
+  - We will keep pushing to the `latest` tag when a milestone is reached current `latest` tag correspond to v1.4.0 release.
   - We are making pushes on the `develop` tag whenever a contribution has been accepted. These images are **EXPERIMENTAL**.
+  - Release tag `vx.x.x` contains the release code
 
 Now pull images according to your requirement,
 
 ```bash
-$ docker pull oaisoftwarealliance/oai-amf:latest
-$ docker pull oaisoftwarealliance/oai-nrf:latest
-$ docker pull oaisoftwarealliance/oai-spgwu-tiny:latest
-$ docker pull oaisoftwarealliance/oai-smf:latest
-$ docker pull oaisoftwarealliance/oai-udr:latest
-$ docker pull oaisoftwarealliance/oai-udm:latest
-$ docker pull oaisoftwarealliance/oai-ausf:latest
-$ docker pull oaisoftwarealliance/oai-upf-vpp:latest
-$ docker pull oaisoftwarealliance/oai-nssf:latest
+#!/bin/bash
+docker pull oaisoftwarealliance/oai-amf:v1.4.0
+docker pull oaisoftwarealliance/oai-nrf:v1.4.0
+docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.4.0
+docker pull oaisoftwarealliance/oai-smf:v1.4.0
+docker pull oaisoftwarealliance/oai-udr:v1.4.0
+docker pull oaisoftwarealliance/oai-udm:v1.4.0
+docker pull oaisoftwarealliance/oai-ausf:v1.4.0
+docker pull oaisoftwarealliance/oai-upf-vpp:v1.4.0
+docker pull oaisoftwarealliance/oai-nssf:v1.4.0
 # Utility image to generate traffic
-$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest
+docker pull oaisoftwarealliance/trf-gen-cn5g:v1.4.0
 ```
 
 And **re-tag** them for tutorials' docker-compose file to work.
 
 ```bash
-$ docker image tag oaisoftwarealliance/oai-amf:latest oai-amf:latest
-$ docker image tag oaisoftwarealliance/oai-nrf:latest oai-nrf:latest
-$ docker image tag oaisoftwarealliance/oai-smf:latest oai-smf:latest
-$ docker image tag oaisoftwarealliance/oai-spgwu-tiny:latest oai-spgwu-tiny:latest
-$ docker image tag oaisoftwarealliance/oai-udr:latest oai-udr:latest
-$ docker image tag oaisoftwarealliance/oai-udm:latest oai-udm:latest
-$ docker image tag oaisoftwarealliance/oai-ausf:latest oai-ausf:latest
-$ docker image tag oaisoftwarealliance/oai-upf-vpp:latest oai-upf-vpp:latest
-$ docker image tag oaisoftwarealliance/oai-nssf:latest oai-nssf:latest
-$ docker image tag oaisoftwarealliance/trf-gen-cn5g:latest trf-gen-cn5g:latest
+#!/bin/bash
+docker image tag oaisoftwarealliance/oai-amf:v1.4.0 oai-amf:v1.4.0
+docker image tag oaisoftwarealliance/oai-nrf:v1.4.0 oai-nrf:v1.4.0
+docker image tag oaisoftwarealliance/oai-smf:v1.4.0 oai-smf:v1.4.0
+docker image tag oaisoftwarealliance/oai-spgwu-tiny:v1.4.0 oai-spgwu-tiny:v1.4.0
+docker image tag oaisoftwarealliance/oai-udr:v1.4.0 oai-udr:v1.4.0
+docker image tag oaisoftwarealliance/oai-udm:v1.4.0 oai-udm:v1.4.0
+docker image tag oaisoftwarealliance/oai-ausf:v1.4.0 oai-ausf:v1.4.0
+docker image tag oaisoftwarealliance/oai-upf-vpp:v1.4.0 oai-upf-vpp:v1.4.0
+docker image tag oaisoftwarealliance/oai-nssf:v1.4.0 oai-nssf:v1.4.0
+docker image tag oaisoftwarealliance/trf-gen-cn5g:latest trf-gen-cn5g:latest
 ```
 
 Finally you may logoff --> your token is stored in plain text..