Skip to content
Snippets Groups Projects
Commit 9839cef4 authored by Sagar Arora's avatar Sagar Arora :bicyclist_tone1:
Browse files

Update the release tag of spgwu to v1.4.0

parent 3f21bb7c
No related branches found
No related tags found
1 merge request!57Release v1.4.0
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 88 deletions
docker-compose/docker-compose-no-privilege.yaml
+ 1
− 1
View file @ 9839cef4
......@@ -195,7 +195,7 @@ services:
ipv4_address: 192.168.70.133
oai-spgwu:
container_name: "oai-spgwu"
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
docker-compose/docker-compose-slicing-basic-nrf.yaml
+ 3
− 3
View file @ 9839cef4
......@@ -4,7 +4,7 @@ services:
container_name: mysql
image: mysql:5.7
volumes:
- /database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
environment:
- TZ=Europe/Paris
......@@ -403,7 +403,7 @@ services:
ipv4_address: 192.168.70.141
oai_spgwu_slice1:
container_name: oai-spgwu-slice1
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......@@ -451,7 +451,7 @@ services:
ipv4_address: 192.168.70.142
oai_spgwu_slice2:
container_name: oai-spgwu-slice2
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
docker-compose/nssf_slice_config.yaml
+ 14
− 16
View file @ 9839cef4
# Reference:- TS 29.531 R16.0.0., Section- 6.1.6 Data Model
info:
version: 1.3.0
description: OAI-NSSF Release v1.3.0
version: 1.4.0
description: OAI-NSSF Release v1.4.0
configuration:
nsiInfoList:
- snssai:
sst: 2
sd: '2'
sst: 128
sd: '128'
nsiInformationList:
nrfId: http://192.168.70.136:80/nnrf-disc/v1/nf-instances
nsiId: '11'
- snssai:
sst: 3
sd: '3'
sst: 1
nsiInformationList:
nrfId: http://192.168.70.136:80/nnrf-disc/v1/nf-instances
nsiId: '12'
- snssai:
sst: 4
sd: '4'
sst: 130
sd: '130'
nsiInformationList:
nrfId: http://192.168.70.137:80/nnrf-disc/v1/nf-instances
nsiId: '12'
......@@ -60,7 +59,7 @@ configuration:
supportedSnssaiList:
- sst: 222
sd: '123'
- sst: 2
- sst: 128
amfInfoList:
- targetAmfSet: oai5gcn.mcc208.mnc95.regionid128.setid1.3gppnetwork.org
nrfAmfSet: http://oai-cn5g-nrf.fr:8080/nnrf-disc/v1/nf-instances'
......@@ -74,12 +73,11 @@ configuration:
mnc: 95
tac: 33456
supportedSnssaiList:
- sst: 2
sd: 2
- sst: 3
sd: 3
- sst: 4
sd: 4
- sst: 128
sd: 128
- sst: 1
- sst: 130
sd: 130
- nfId: 405e8251-cc5a-45dd-a494-efb9eaf1cd68
supportedNssaiAvailabilityData:
tai:
......@@ -112,4 +110,4 @@ configuration:
mnc: 95
tac: 33460
supportedSnssaiList:
- sst: 133
- sst: 133
\ No newline at end of file
docs/BUILD_IMAGES.md
+ 5
− 5
View file @ 9839cef4
......@@ -38,7 +38,7 @@ We also recommend that you synchronize this "tutorial" repository with a provide
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| AUSF | `master` | `v1.4.0` | X | X |
......@@ -50,7 +50,7 @@ We also recommend that you synchronize this "tutorial" repository with a provide
# Clone directly on the v1.4.0 release tag
$ git clone --branch v1.4.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
$ cd oai-cn5g-fed
# If you forgot to clone directly to the v1.3.0 release tag
# If you forgot to clone directly to the v1.4.0 release tag
$ git checkout -f v1.4.0
# Synchronize all git submodules
......@@ -251,12 +251,12 @@ The above command is with podman, in case of docker it can be changed with its d
## 6.1 On a Ubuntu 18.04 Host ##
```bash
$ docker build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.3.0 \
$ docker build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.4.0 \
--file component/oai-upf-equivalent/docker/Dockerfile.ubuntu18.04 \
component/oai-upf-equivalent
$ docker image prune --force
$ docker image ls
oai-spgwu-tiny v1.3.0 dec6311cef3b 1 minute ago 255MB
oai-spgwu-tiny v1.4.0 dec6311cef3b 1 minute ago 255MB
...
```
......@@ -271,7 +271,7 @@ Copy the ca and entitlement .pem files in your present working directory `pwd` b
$: mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca
$: cp /etc/pki/entitlement/*pem ./etc-pki-entitlement
$: cp /etc/rhsm/ca/*pem ./rhsm-ca
$ sudo podman build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.3.0 \
$ sudo podman build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.4.0 \
--file component/oai-spgwu-tiny/docker/Dockerfile.rhel8 \
component/oai-upf-equivalent
...
......
docs/DEPLOY_HOME.md
+ 1
− 1
View file @ 9839cef4
......@@ -29,4 +29,4 @@ Welcome to the tutorial home page of OAI 5g Core project. Here you can find lot
- The Developers Corner
- [How to Deploy Developers Core Network and Basic Debugging](./DEBUG_5G_CORE.md)
- [Using Virtual Machine, deploy and test with a Commercial UE](./DEPLOY_SA5G_VM_COTSUE.md)
- [Report an issue](./DEPLOY_SA5G_BASIC_DEPLOYMENT.md#8-how-to-report-an-issue)
\ No newline at end of file
- [Report an Issue or bug for Core Network Functions](./DEPLOY_SA5G_BASIC_DEPLOYMENT.md#8-report-an-issue)
\ No newline at end of file
docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md
+ 15
− 12
View file @ 9839cef4
......@@ -46,7 +46,7 @@ Please follow the tutorial step by step to create a stable working testbed. You
5. [Configuring OAI 5G Core Network Functions](#5-configuring-the-oai-5g-core-network-functions)
6. [Deploying OAI 5G Core Network](#6-deploying-oai-5g-core-network)
7. [Notes](#7-notes)
8. [How to report an issue?](#8-how-to-report-an-issue)
8. [Report an Issue](#8-report-an-issue)
## 1. Basic Deployment Flavours ##
......@@ -105,7 +105,7 @@ docker-compose-host $: sudo iptables -P FORWARD ACCEPT
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| AUSF | `master` | `v1.4.0` | X | X |
......@@ -232,6 +232,9 @@ In docker-compose the [service-name](https://docs.docker.com/compose/compose-fil
The docker-compose file has configuration parameters of each core network component. The file is pre-configured with parameters related to this scenario. The table contains the location of the configuration files. These files contains allowed configurable parameters. **Keep checking this file it is possible that we will add new parameters for new features.**
You can also check configuration on our [wiki](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/wikis/home)
```console
| File Name | Repository | Location |
|:----------- |:-------------------------------------------- |:------------------------------------------------------------------------------------------------------|
......@@ -402,16 +405,16 @@ docker-compose-host $: ping <ue-ip-address>
- 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
``` console
#To start the containers
docker-compose-host $: docker-compose -f <file-name> up -d
#To check their health status and wait till the time they are healthy, you ctrl + c to exit watch command
docker-compose-host $: watch docker-compose -f <file-name> ps -a
#To stop the containers with zero graceful period
docker-compose-host $: docker-compose -f <file-name> down -t 0
```
## 8. How to report an issue? ##
``` console
#To start the containers
docker-compose-host $: docker-compose -f <file-name> up -d
#To check their health status and wait till the time they are healthy, you ctrl + c to exit watch command
docker-compose-host $: watch docker-compose -f <file-name> ps -a
#To stop the containers with zero graceful period
docker-compose-host $: docker-compose -f <file-name> down -t 0
```
## 8. Report an Issue ##
To report an issue regarding any-component of CN5G,
......
docs/DEPLOY_SA5G_HC.md
+ 3
− 1
View file @ 9839cef4
......@@ -41,7 +41,7 @@ The gNB simulator requires lot of resources. The configuration of the machine on
Clone the git repository
```console
$: git clone -b <branch-of-the-tutorial> https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed
$: git clone -b master https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed
```
## 1. Description
......@@ -207,6 +207,8 @@ imagePullSecrets:
When pulling images from docker hub you have several choices either to use images with develop tag (based on latest develop branch somtimes might not be stable), latest (built from current master branch) and release tags.
At the time of writing this tutorial the latest image was tag v1.4.0.
### 3.3 Configuring Helm Chart Parameters
In the [values.yaml](../charts/oai-5g-core/oai-5g-basic) of oai-5g-basic helm charts you will see the configurable parameters for all the network functions check, the PLMN, DNN and subscriber information in mysql database
......
docs/DEPLOY_SA5G_HC_mini.md
+ 16
− 13
View file @ 9839cef4
......@@ -15,6 +15,9 @@
OAI 5G core network have different network functions which can be used invidiually or deployed all together in different combination on a production grade Kubernetes cluster like Openshift or a vanilla kubernetes cluster.
**Caution**: This is an old tutorial, the helm charts can be slightly different
![Helm Chart Deployment](./images/helm-chart-mini.png)
**Reading time**: ~30
......@@ -185,8 +188,8 @@ namespace: "oai"
nfimage:
registry: local
repository: rdefosseoai/oai-amf # image name either locally present or in a public/private repository
version: develop # image tag
repository: docker.io/oaisoftwarealliance/oai-amf # image name either locally present or in a public/private repository
version: v1.4.0 # image tag
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
......@@ -243,14 +246,14 @@ namespace: "oai" # namespace where SMF will be deployed
nfimage:
registry: local
repository: rdefosseoai/oai-smf
version: develop
repository: docker.io/oaisoftwarealliance/oai-smf
version: v1.4.0
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
tcpdumpimage:
registry: local
repository: corfr/tcpdump
repository: docker.io/corfr/tcpdump
version: latest
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
......@@ -275,22 +278,22 @@ namespace: "oai" # namespace where SMF will be deployed
nfimage:
registry: local
repository: rdefosseoai/oai-spgwu-tiny
version: develop
repository: docker.io/oaisoftwarealliance/oai-spgwu-tiny
version: v1.4.0
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
tcpdumpimage:
registry: local
repository: corfr/tcpdump
version: latest
repository: docker.io/corfr/tcpdump
version: v1.4.0
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
config:
gwId: 1
mnc: 208 # should match with AMF and SMF and gNB information
mcc: 95 # should match with AMF and SMF and gNB information
mcc: 99 # should match with AMF and SMF and gNB information
realm: "3gpp.org"
pidDirectory: "/var/run"
```
......@@ -309,14 +312,14 @@ namespace: "oai"
# NF image
nfimage:
registry: local
repository: rdefosseoai/oai-nrf
version: develop
repository: docker.io/oaisoftwarealliance/oai-nrf
version: v1.4.0
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
tcpdumpimage:
registry: local
repository: corfr/tcpdump
repository: docker.io/corfr/tcpdump
version: latest
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
......
docs/DEPLOY_SA5G_MINI_DEPLOYMENT.md
+ 2
− 2
View file @ 9839cef4
......@@ -101,10 +101,10 @@ To know how to configure the machine with the above requirements vist [pre-requi
| CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) |
| ----------- | ----------- | -------- | ------------ | ----------------|
| AMF | `master` | `v1.3.0` | X | X |
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
- In case readers are interested in using different branch then develop or releases (example v1.4.0) **they have to build images from scratch they can't use the docker-hub images**.
......
docs/DEPLOY_SA5G_SLICING.md
+ 1
− 1
View file @ 9839cef4
......@@ -49,7 +49,7 @@ You can also retrieve the images from `docker-hub`. See [Retrieving images](./RE
| SMF | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| SPGWU | `master` | `v1.3.0` | X | X |
| SPGWU | `master` | `v1.4.0` | X | X |
| UPF-VPP | `master` | `v1.4.0` | X | X |
<br/>
......
docs/DEPLOY_SA5G_VM_COTSUE.md
+ 5
− 0
View file @ 9839cef4
......@@ -11,8 +11,13 @@
</td>
</tr>
</table>
![SA COTSUE Demo](./images/virtual-machine/cots-ue/bupt/overall-architecture.png)
**Caution**: This is a very old tutorial and it is not maintained anymore.
**TABLE OF CONTENTS**
1. [Description](#1-description)
......
docs/DEPLOY_SA5G_WITH_GNBSIM.md
+ 1
− 1
View file @ 9839cef4
......@@ -40,7 +40,7 @@ Note: In case readers are interested in deploying debuggers/developers core netw
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
<br/>
......
docs/DEPLOY_SA5G_WITH_My5g-RANTester.md
+ 1
− 1
View file @ 9839cef4
......@@ -43,7 +43,7 @@ Note: In case readers are interested in deploying debuggers/developers core netw
| SMF | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| SPGWU | `master` | `v1.3.0` | X | X |
| SPGWU | `master` | `v1.4.0` | X | X |
| UPF-VPP | `master` | `v1.4.0` | X | X |
......
docs/DEPLOY_SA5G_WITH_UERANSIM.md
+ 7
− 7
View file @ 9839cef4
......@@ -37,13 +37,13 @@ Note: In case readers are interested in deploying debuggers/developers core netw
| CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) |
| ----------- | ----------- | -------- | ------------ | ----------------|
| AMF | `develop` | `v1.2.0` | X | X |
| SMF | `develop` | `v1.2.0` | X | X |
| NRF | `develop` | `v1.2.0` | X | X |
| VPP-UPF | `develop` | `v1.1.3` | X | X |
| UDR | `develop` | `v1.2.0` | X | X |
| UDM | `develop` | `v1.2.0` | X | X |
| AUSF | `develop` | `v1.2.0` | X | X |
| AMF | `develop` | `v1.4.0` | X | X |
| SMF | `develop` | `v1.4.0` | X | X |
| NRF | `develop` | `v1.4.0` | X | X |
| VPP-UPF | `develop` | `v1.4.0` | X | X |
| UDR | `develop` | `v1.4.0` | X | X |
| UDM | `develop` | `v1.4.0` | X | X |
| AUSF | `develop` | `v1.4.0` | X | X |
<br/>
......
docs/RETRIEVE_OFFICIAL_IMAGES.md
+ 13
− 13
View file @ 9839cef4
......@@ -80,27 +80,27 @@ We will push new versions when new features are validated.
This repository only has tutorials and Continuous Integration scripts.
**At the time of writing (2022/01/17), the release tag is `v1.3.0`.**
**At the time of writing (2022/07), the release tag is `v1.4.0`.**
| CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) |
| ----------- | ----------- | -------- | ------------ | ----------------|
| FED REPO | N/A | `v1.3.0` | | |
| AMF | `master` | `v1.3.0` | X | X |
| SMF | `master` | `v1.3.0` | X | X |
| NRF | `master` | `v1.3.0` | X | X |
| SPGW-U-TINY | `master` | `v1.2.0` | X | X |
| UDR | `master` | `v1.3.0` | X | X |
| UDM | `master` | `v1.3.0` | X | X |
| AUSF | `master` | `v1.3.0` | X | X |
| UPF-VPP | `master` | `v1.3.0` | X | X |
| NSSF | `master` | `v1.3.0` | X | X |
| FED REPO | N/A | `v1.4.0` | | |
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| AUSF | `master` | `v1.4.0` | X | X |
| UPF-VPP | `master` | `v1.4.0` | X | X |
| NSSF | `master` | `v1.4.0` | X | X |
```bash
# Clone directly on the latest release tag
$ git clone --branch v1.3.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
$ git clone --branch v1.4.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
$ cd oai-cn5g-fed
# If you forgot to clone directly to the latest release tag
$ git checkout -f v1.3.0
$ git checkout -f v1.4.0
# Synchronize all git submodules
$ ./scripts/syncComponents.sh
......
openshift/README.md
+ 1
− 3
View file @ 9839cef4
......@@ -60,9 +60,7 @@ $: oc start-bc oai-udm
$: oc start-bc oai-udr
```
For the moment the dockerfiles used in these build configs is based on develop branch which have a new push every week, there are new features all the time.
Just be careful sometimes some functionality can break but you can report back to us in that case.
For the moment the dockerfiles used in these build configs are based on v1.4.0 release tag of all the network functions.
## 2. How to Build UBI Images of gNB and UE?
......
openshift/oai-amf-build-config.yml
+ 2
− 2
View file @ 9839cef4
......@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf.git"
ref: "develop"
ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
......@@ -55,6 +55,6 @@ spec:
output:
to:
kind: "ImageStreamTag"
name: "oai-amf:develop"
name: "oai-amf:v1.4.0"
openshift/oai-ausf-build-config.yml
+ 2
− 2
View file @ 9839cef4
......@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-ausf.git"
ref: "develop"
ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
......@@ -55,6 +55,6 @@ spec:
output:
to:
kind: "ImageStreamTag"
name: "oai-ausf:develop"
name: "oai-ausf:v1.4.0"
openshift/oai-nrf-build-config.yml
+ 2
− 2
View file @ 9839cef4
......@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-nrf.git"
ref: "develop"
ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
......@@ -55,4 +55,4 @@ spec:
output:
to:
kind: "ImageStreamTag"
name: "oai-nrf:develop"
name: "oai-nrf:v1.4.0"
openshift/oai-smf-build-config.yml
+ 2
− 2
View file @ 9839cef4
......@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-smf.git"
ref: "develop"
ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
......@@ -55,5 +55,5 @@ spec:
output:
to:
kind: "ImageStreamTag"
name: "oai-smf:develop"
name: "oai-smf:v1.4.0"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment