From 6c830a488d1a510416e77b4d6e36f7613b297568 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 21 Dec 2023 14:29:23 +0100 Subject: [PATCH] Simplify F1 test and harmonize with complex F1+E1 test - Test only one DU at the CU (3 DUs is tested in F1+E1) - Harmonize IP configuration to make it simpler to reuse in the F1+E1 test - Speed up the test by reducing the number of steps to deploy core/RAN - Add traffic test --- .../conf_files/gnb-cu.sa.band78.106prb.conf | 8 +- .../gnb-du.sa.band78.106prb.rfsim.conf | 7 +- .../xml_files/container_5g_f1_rfsim.xml | 54 ++------- .../5g_f1_rfsimulator/docker-compose.yaml | 109 ++++-------------- 4 files changed, 42 insertions(+), 136 deletions(-) diff --git a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf index 8a33b6dd96..7f975cbcd4 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf @@ -23,8 +23,8 @@ gNBs = tr_s_preference = "f1"; local_s_if_name = "eth0"; - local_s_address = "192.168.71.140"; - remote_s_address = "192.168.71.142"; + local_s_address = "192.168.71.150"; + remote_s_address = "192.168.71.171"; local_s_portc = 501; local_s_portd = 2153; remote_s_portc = 500; @@ -51,9 +51,9 @@ gNBs = { GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; - GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.150"; GNB_INTERFACE_NAME_FOR_NGU = "eth0"; - GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140"; + GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.150"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; } diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf index 75d2beed6d..9d8a3cb57b 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf @@ -15,7 +15,7 @@ gNBs = // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; - plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) }); + plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 } ) }); nr_cellid = 12345678L; @@ -23,7 +23,6 @@ gNBs = ////////// Physical parameters: min_rxtxtime = 6; - force_256qam_off = 1; servingCellConfigCommon = ( { @@ -170,8 +169,8 @@ MACRLCs = ( tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_if_name = "eth0"; - local_n_address = "192.168.71.142"; - remote_n_address = "192.168.71.140"; + local_n_address = "192.168.71.171"; + remote_n_address = "192.168.71.150"; local_n_portc = 500; local_n_portd = 2153; remote_n_portc = 501; diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 6f8f71095c..c6eb681a58 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -27,13 +27,11 @@ 111111 100021 - 000020 000021 000022 - 000023 - 000024 - 000025 020021 + 030021 + 030022 100021 @@ -42,61 +40,29 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb-asan oai-nr-ue-asan - - - - DeployGenObject - Deploy MySql Database - yaml_files/5g_f1_rfsimulator - mysql - 1 + oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan DeployGenObject Deploy OAI 5G CoreNetwork yaml_files/5g_f1_rfsimulator - oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn + mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn 6 DeployGenObject - Deploy OAI 5G CU RF sim SA + Deploy OAI 5G CU+DU+UE RF sim SA yaml_files/5g_f1_rfsimulator - oai-cu - 7 - - - - DeployGenObject - Deploy 3 OAI 5G DUs RF sim SA - yaml_files/5g_f1_rfsimulator - oai-du oai-du2 oai-du3 - 10 - - - - DeployGenObject - Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_f1_rfsimulator - oai-nr-ue oai-nr-ue2 - 12 - - - - DeployGenObject - Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_f1_rfsimulator - oai-nr-ue3 - 13 + oai-cu oai-du oai-nr-ue + 9 Ping Ping ext-dn from all NR-UEs - rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 + rfsim5g_ue -c 20 192.168.72.135 -i0.25 5 @@ -107,7 +73,7 @@ rfsim5g-oai-nr-ue rfsim5g-oai-ext-dn -B 12.1.1.2 -u -i 1 -s - -c 12.1.1.2 -u -i 1 -t 30 -b 3M + -c 12.1.1.2 -u -i 1 -t 10 -b 20M @@ -116,7 +82,7 @@ rfsim5g-oai-ext-dn rfsim5g-oai-nr-ue -u -i 1 -s - -B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M + -B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index 8d62746300..308efdc33b 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -49,8 +49,10 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 - # Only one slice is defined (1, 0xFFFFFF). + # Three slices are defined - SST_0=1 + - SST_1=2 + - SST_2=3 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 # One single SMF instance @@ -101,6 +103,8 @@ services: - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 + - NSSAI_SST1=2 + - NSSAI_SST2=3 - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 @@ -127,10 +131,16 @@ services: - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - NRF_FQDN=oai-nrf - # Only one slice is defined (1, 0xFFFFFF) + # Three slices are defined - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai + - NSSAI_SST_1=2 + - NSSAI_SD_1=0xffffff + - DNN_1=oai + - NSSAI_SST_2=3 + - NSSAI_SD_2=0xffffff + - DNN_2=oai depends_on: - oai-nrf - oai-smf @@ -145,6 +155,7 @@ services: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 + oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn @@ -162,6 +173,7 @@ services: interval: 10s timeout: 5s retries: 5 + oai-cu: image: oaisoftwarealliance/oai-gnb:develop privileged: true @@ -173,7 +185,7 @@ services: - oai-ext-dn networks: public_net: - ipv4_address: 192.168.71.140 + ipv4_address: 192.168.71.150 volumes: - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: @@ -181,56 +193,19 @@ services: interval: 10s timeout: 5s retries: 5 + oai-du: image: oaisoftwarealliance/oai-gnb:develop privileged: true container_name: rfsim5g-oai-du - environment: + environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cu networks: public_net: - ipv4_address: 192.168.71.142 - volumes: - - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf - healthcheck: - test: /bin/bash -c "pgrep nr-softmodem" - interval: 10s - timeout: 5s - retries: 5 - oai-du2: - image: oaisoftwarealliance/oai-gnb:develop - privileged: true - container_name: rfsim5g-oai-du2 - environment: - USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 - depends_on: - - oai-cu - networks: - public_net: - ipv4_address: 192.168.71.143 - volumes: - - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf - healthcheck: - test: /bin/bash -c "pgrep nr-softmodem" - interval: 10s - timeout: 5s - retries: 5 - oai-du3: - image: oaisoftwarealliance/oai-gnb:develop - privileged: true - container_name: rfsim5g-oai-du3 - environment: - USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 - depends_on: - - oai-cu - networks: - public_net: - ipv4_address: 192.168.71.144 + ipv4_address: 192.168.71.171 volumes: - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: @@ -238,56 +213,22 @@ services: interval: 10s timeout: 5s retries: 5 + oai-nr-ue: image: oaisoftwarealliance/oai-nr-ue:develop privileged: true container_name: rfsim5g-oai-nr-ue - environment: - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time + environment: + USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + -r 106 --numerology 1 -C 3619200000 + --uicc0.imsi 208990100001100 + --rfsimulator.serveraddr 192.168.71.171 ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du networks: public_net: - ipv4_address: 192.168.71.150 - volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - healthcheck: - test: /bin/bash -c "pgrep nr-uesoftmodem" - interval: 10s - timeout: 5s - retries: 5 - oai-nr-ue2: - image: oaisoftwarealliance/oai-nr-ue:develop - privileged: true - container_name: rfsim5g-oai-nr-ue2 - environment: - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 - depends_on: - - oai-du2 - networks: - public_net: - ipv4_address: 192.168.71.151 - volumes: - - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - healthcheck: - test: /bin/bash -c "pgrep nr-uesoftmodem" - interval: 10s - timeout: 5s - retries: 5 - oai-nr-ue3: - image: oaisoftwarealliance/oai-nr-ue:develop - privileged: true - container_name: rfsim5g-oai-nr-ue3 - environment: - USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 - depends_on: - - oai-du3 - networks: - public_net: - ipv4_address: 192.168.71.152 + ipv4_address: 192.168.71.181 volumes: - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf healthcheck: