From 818ca5cfaa58082ecf5464287bbc35bd6eb21506 Mon Sep 17 00:00:00 2001 From: luis_pereira87 Date: Tue, 15 Nov 2022 08:32:55 +0000 Subject: [PATCH] Tutorials: upgrade to Ubuntu 22.04, UHD 4.3.0.0, docker-compose v2.12.2 and add more DNNs to docker-compose to avoid duplicated (default) values when parsing the file --- doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md | 8 +++--- .../docker-compose-basic-nrf.yaml | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md index bc6c56834a..fccab23cf8 100644 --- a/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md +++ b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md @@ -21,7 +21,7 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with Minimum hardware requirements: - Laptop/Desktop/Server for OAI CN5G and OAI gNB - - Operating System: [Ubuntu 20.04.5 LTS](https://releases.ubuntu.com/20.04/ubuntu-20.04.5-desktop-amd64.iso) + - Operating System: [Ubuntu 22.04.1 LTS](https://releases.ubuntu.com/22.04.1/ubuntu-22.04.1-desktop-amd64.iso) - CPU: 8 cores x86_64 @ 3.5 GHz - RAM: 32 GB - Laptop for UE @@ -54,7 +54,7 @@ sudo usermod -a -G docker $(whoami) reboot # https://docs.docker.com/compose/install/ -sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +sudo curl -L "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose ``` @@ -114,7 +114,7 @@ sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils p git clone https://github.com/EttusResearch/uhd.git ~/uhd cd ~/uhd -git checkout v4.0.0.0 +git checkout v4.3.0.0 cd host mkdir build cd build @@ -134,7 +134,7 @@ git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterfac cd ~/openairinterface5g git checkout develop -# Install dependencies in Ubuntu 20.04 +# Install OAI dependencies cd ~/openairinterface5g source oaienv cd cmake_targets diff --git a/doc/tutorial_resources/docker-compose-basic-nrf.yaml b/doc/tutorial_resources/docker-compose-basic-nrf.yaml index bd037f23e0..7c2287a3c4 100644 --- a/doc/tutorial_resources/docker-compose-basic-nrf.yaml +++ b/doc/tutorial_resources/docker-compose-basic-nrf.yaml @@ -144,6 +144,10 @@ services: - PLMN_SUPPORT_TAC=0x0001 - SST_0=1 - SD_0=0x1 + - SST_1=1 + - SD_1=0x2 + - SST_2=1 + - SD_2=0x3 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 - SMF_INSTANCE_ID_0=1 @@ -232,6 +236,23 @@ services: - NSSAI_SD0=0x1 - SESSION_AMBR_UL0=10000Mbps - SESSION_AMBR_DL0=10000Mbps + - DNN_NI1=oai2 + - TYPE1=IPv4 + - DNN_RANGE1=12.1.2.2 - 12.1.2.253 + - NSSAI_SST1=1 + - NSSAI_SD1=0x2 + - SESSION_AMBR_UL1=10000Mbps + - SESSION_AMBR_DL1=10000Mbps + - DNN_NI2=oai3 + - TYPE2=IPv4 + - DNN_RANGE2=12.1.3.2 - 12.1.3.253 + - NSSAI_SST2=1 + - NSSAI_SD2=0x3 + - SESSION_AMBR_UL2=10000Mbps + - SESSION_AMBR_DL2=10000Mbps + - DNN_NI3=ims + - TYPE3=IPv4v6 + - DNN_RANGE3=14.1.1.2 - 14.1.1.253 - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 # only needed when ims is being used - ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF depends_on: @@ -276,6 +297,12 @@ services: - NSSAI_SST_0=1 - NSSAI_SD_0=0x1 - DNN_0=oai + - NSSAI_SST_1=1 + - NSSAI_SD_1=0x2 + - DNN_1=oai2 + - NSSAI_SST_2=1 + - NSSAI_SD_2=0x3 + - DNN_2=oai3 depends_on: - oai-nrf - oai-smf