maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/NR_SA_Tutorials' into integration_2024_w21b

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-05-23 12:40:07 +02:00
parent d3acd5d6c0 9278394f3c
commit 841869b0ec
5 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/NR_SA_Tutorial_COTS_UE.md
+1 -1
View File
@@ -21,7 +21,7 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
Minimum hardware requirements: Minimum hardware requirements:
- Laptop/Desktop/Server for OAI CN5G and OAI gNB - 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 - CPU: 8 cores x86_64 @ 3.5 GHz
- RAM: 32 GB - RAM: 32 GB
- Laptop for UE - Laptop for UE
doc/NR_SA_Tutorial_OAI_CN5G.md
+1 -1
View File
@@ -21,7 +21,7 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
Minimum hardware requirements: Minimum hardware requirements:
- Laptop/Desktop/Server for OAI CN5G and OAI gNB - 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 - CPU: 8 cores x86_64 @ 3.5 GHz
- RAM: 32 GB - RAM: 32 GB
doc/NR_SA_Tutorial_OAI_nrUE.md
+2 -2
View File
@@ -21,11 +21,11 @@ In this tutorial we describe how to configure and run a 5G end-to-end setup with
Minimum hardware requirements: Minimum hardware requirements:
- Laptop/Desktop/Server for OAI CN5G and OAI gNB - 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 - CPU: 8 cores x86_64 @ 3.5 GHz
- RAM: 32 GB - RAM: 32 GB
- Laptop for UE - 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 - CPU: 8 cores x86_64 @ 3.5 GHz
- RAM: 8 GB - 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/) - [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/)
doc/tutorial_resources/oai-cn5g/conf/config.yaml
+7 -21
View File
@@ -114,11 +114,7 @@ database:
## general single_nssai configuration ## general single_nssai configuration
## Defines YAML anchors, which are reused in the config file ## Defines YAML anchors, which are reused in the config file
snssais: snssais:
- &embb_slice1 - &embb_slice
sst: 1
- &embb_slice2
sst: 1
- &embb_slice3
sst: 1 sst: 1
############## NF-specific configuration ############## NF-specific configuration
@@ -145,9 +141,7 @@ amf:
mnc: 01 mnc: 01
tac: 0x0001 tac: 0x0001
nssai: nssai:
- *embb_slice1 - *embb_slice
- *embb_slice2
- *embb_slice3
supported_integrity_algorithms: supported_integrity_algorithms:
- "NIA1" - "NIA1"
- "NIA2" - "NIA2"
@@ -178,29 +172,25 @@ smf:
# follows the SmfInfo datatype from 3GPP TS 29.510 # follows the SmfInfo datatype from 3GPP TS 29.510
smf_info: smf_info:
sNssaiSmfInfoList: sNssaiSmfInfoList:
- sNssai: *embb_slice1 - sNssai: *embb_slice
dnnSmfInfoList: dnnSmfInfoList:
- dnn: "oai" - dnn: "oai"
- sNssai: *embb_slice2
dnnSmfInfoList:
- dnn: "openairinterface" - dnn: "openairinterface"
- sNssai: *embb_slice3
dnnSmfInfoList:
- dnn: "ims" - dnn: "ims"
local_subscription_infos: local_subscription_infos:
- single_nssai: *embb_slice1 - single_nssai: *embb_slice
dnn: "oai" dnn: "oai"
qos_profile: qos_profile:
5qi: 9 5qi: 9
session_ambr_ul: "10Gbps" session_ambr_ul: "10Gbps"
session_ambr_dl: "10Gbps" session_ambr_dl: "10Gbps"
- single_nssai: *embb_slice2 - single_nssai: *embb_slice
dnn: "openairinterface" dnn: "openairinterface"
qos_profile: qos_profile:
5qi: 9 5qi: 9
session_ambr_ul: "10Gbps" session_ambr_ul: "10Gbps"
session_ambr_dl: "10Gbps" session_ambr_dl: "10Gbps"
- single_nssai: *embb_slice3 - single_nssai: *embb_slice
dnn: "ims" dnn: "ims"
qos_profile: qos_profile:
5qi: 9 5qi: 9
@@ -216,14 +206,10 @@ upf:
- host: oai-smf # To be used for PFCP association in case of no-NRF - host: oai-smf # To be used for PFCP association in case of no-NRF
upf_info: upf_info:
sNssaiUpfInfoList: sNssaiUpfInfoList:
- sNssai: *embb_slice1 - sNssai: *embb_slice
dnnUpfInfoList: dnnUpfInfoList:
- dnn: "oai" - dnn: "oai"
- sNssai: *embb_slice2
dnnUpfInfoList:
- dnn: "openairinterface" - dnn: "openairinterface"
- sNssai: *embb_slice3
dnnUpfInfoList:
- dnn: "ims" - dnn: "ims"
## DNN configuration ## DNN configuration
doc/tutorial_resources/oai-cn5g/docker-compose.yaml
+2 -5
View File
@@ -167,14 +167,11 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.135 ipv4_address: 192.168.70.135
networks: networks:
# public_net:
# external:
# name: demo-oai-public-net
public_net: public_net:
driver: bridge driver: bridge
name: demo-oai-public-net name: oai-cn5g-public-net
ipam: ipam:
config: config:
- subnet: 192.168.70.128/26 - subnet: 192.168.70.128/26
driver_opts: driver_opts:
com.docker.network.bridge.name: "demo-oai" com.docker.network.bridge.name: "oai-cn5g"