diff --git a/doc/NR_SA_Tutorial_COTS_UE.md b/doc/NR_SA_Tutorial_COTS_UE.md index 7b7e235600..0924eee1b0 100644 --- a/doc/NR_SA_Tutorial_COTS_UE.md +++ b/doc/NR_SA_Tutorial_COTS_UE.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 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.3-desktop-amd64.iso) + - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.4-desktop-amd64.iso) - CPU: 8 cores x86_64 @ 3.5 GHz - RAM: 32 GB - Laptop for UE diff --git a/doc/NR_SA_Tutorial_OAI_CN5G.md b/doc/NR_SA_Tutorial_OAI_CN5G.md index a07cf85631..07914b417a 100644 --- a/doc/NR_SA_Tutorial_OAI_CN5G.md +++ b/doc/NR_SA_Tutorial_OAI_CN5G.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 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.3-desktop-amd64.iso) + - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.4-desktop-amd64.iso) - CPU: 8 cores x86_64 @ 3.5 GHz - RAM: 32 GB diff --git a/doc/NR_SA_Tutorial_OAI_nrUE.md b/doc/NR_SA_Tutorial_OAI_nrUE.md index be21f71097..30a8b52419 100644 --- a/doc/NR_SA_Tutorial_OAI_nrUE.md +++ b/doc/NR_SA_Tutorial_OAI_nrUE.md @@ -21,11 +21,11 @@ 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 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.3-desktop-amd64.iso) + - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.4-desktop-amd64.iso) - CPU: 8 cores x86_64 @ 3.5 GHz - RAM: 32 GB - Laptop for UE - - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.3-desktop-amd64.iso) + - Operating System: [Ubuntu 22.04 LTS](https://releases.ubuntu.com/22.04/ubuntu-22.04.4-desktop-amd64.iso) - CPU: 8 cores x86_64 @ 3.5 GHz - RAM: 8 GB - [USRP B210](https://www.ettus.com/all-products/ub210-kit/), [USRP N300](https://www.ettus.com/all-products/USRP-N300/) or [USRP X300](https://www.ettus.com/all-products/x300-kit/) diff --git a/doc/tutorial_resources/oai-cn5g/conf/config.yaml b/doc/tutorial_resources/oai-cn5g/conf/config.yaml index 4bdec06407..2a7002afe6 100644 --- a/doc/tutorial_resources/oai-cn5g/conf/config.yaml +++ b/doc/tutorial_resources/oai-cn5g/conf/config.yaml @@ -114,11 +114,7 @@ database: ## general single_nssai configuration ## Defines YAML anchors, which are reused in the config file snssais: - - &embb_slice1 - sst: 1 - - &embb_slice2 - sst: 1 - - &embb_slice3 + - &embb_slice sst: 1 ############## NF-specific configuration @@ -145,9 +141,7 @@ amf: mnc: 01 tac: 0x0001 nssai: - - *embb_slice1 - - *embb_slice2 - - *embb_slice3 + - *embb_slice supported_integrity_algorithms: - "NIA1" - "NIA2" @@ -178,29 +172,25 @@ smf: # follows the SmfInfo datatype from 3GPP TS 29.510 smf_info: sNssaiSmfInfoList: - - sNssai: *embb_slice1 + - sNssai: *embb_slice dnnSmfInfoList: - dnn: "oai" - - sNssai: *embb_slice2 - dnnSmfInfoList: - dnn: "openairinterface" - - sNssai: *embb_slice3 - dnnSmfInfoList: - dnn: "ims" local_subscription_infos: - - single_nssai: *embb_slice1 + - single_nssai: *embb_slice dnn: "oai" qos_profile: 5qi: 9 session_ambr_ul: "10Gbps" session_ambr_dl: "10Gbps" - - single_nssai: *embb_slice2 + - single_nssai: *embb_slice dnn: "openairinterface" qos_profile: 5qi: 9 session_ambr_ul: "10Gbps" session_ambr_dl: "10Gbps" - - single_nssai: *embb_slice3 + - single_nssai: *embb_slice dnn: "ims" qos_profile: 5qi: 9 @@ -216,14 +206,10 @@ upf: - host: oai-smf # To be used for PFCP association in case of no-NRF upf_info: sNssaiUpfInfoList: - - sNssai: *embb_slice1 + - sNssai: *embb_slice dnnUpfInfoList: - dnn: "oai" - - sNssai: *embb_slice2 - dnnUpfInfoList: - dnn: "openairinterface" - - sNssai: *embb_slice3 - dnnUpfInfoList: - dnn: "ims" ## DNN configuration diff --git a/doc/tutorial_resources/oai-cn5g/docker-compose.yaml b/doc/tutorial_resources/oai-cn5g/docker-compose.yaml index 83c871fb87..0baf032fbb 100644 --- a/doc/tutorial_resources/oai-cn5g/docker-compose.yaml +++ b/doc/tutorial_resources/oai-cn5g/docker-compose.yaml @@ -167,14 +167,11 @@ services: public_net: ipv4_address: 192.168.70.135 networks: - # public_net: - # external: - # name: demo-oai-public-net public_net: driver: bridge - name: demo-oai-public-net + name: oai-cn5g-public-net ipam: config: - subnet: 192.168.70.128/26 driver_opts: - com.docker.network.bridge.name: "demo-oai" + com.docker.network.bridge.name: "oai-cn5g"