Skip to content

O
OpenXG-RAN
Commit 6c830a48 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

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
parent 28411652
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 136 deletions
ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
View file @ 6c830a48
...@@ -23,8 +23,8 @@ gNBs = ...@@ -23,8 +23,8 @@ gNBs =
tr_s_preference = "f1"; tr_s_preference = "f1";
local_s_if_name = "eth0"; local_s_if_name = "eth0";
local_s_address = "192.168.71.140"; local_s_address = "192.168.71.150";
remote_s_address = "192.168.71.142"; remote_s_address = "192.168.71.171";
local_s_portc = 501; local_s_portc = 501;
local_s_portd = 2153; local_s_portd = 2153;
remote_s_portc = 500; remote_s_portc = 500;
...@@ -51,9 +51,9 @@ gNBs = ...@@ -51,9 +51,9 @@ gNBs =
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; 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_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 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
} }
......
ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
View file @ 6c830a48
...@@ -15,7 +15,7 @@ gNBs = ...@@ -15,7 +15,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; 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; nr_cellid = 12345678L;
...@@ -23,7 +23,6 @@ gNBs = ...@@ -23,7 +23,6 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
min_rxtxtime = 6; min_rxtxtime = 6;
force_256qam_off = 1;
servingCellConfigCommon = ( servingCellConfigCommon = (
{ {
...@@ -170,8 +169,8 @@ MACRLCs = ( ...@@ -170,8 +169,8 @@ MACRLCs = (
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_if_name = "eth0"; local_n_if_name = "eth0";
local_n_address = "192.168.71.142"; local_n_address = "192.168.71.171";
remote_n_address = "192.168.71.140"; remote_n_address = "192.168.71.150";
local_n_portc = 500; local_n_portc = 500;
local_n_portd = 2153; local_n_portd = 2153;
remote_n_portc = 501; remote_n_portc = 501;
......
ci-scripts/xml_files/container_5g_f1_rfsim.xml
View file @ 6c830a48
...@@ -27,13 +27,11 @@ ...@@ -27,13 +27,11 @@
<TestCaseRequestedList> <TestCaseRequestedList>
111111 111111
100021 100021
000020
000021 000021
000022 000022
000023
000024
000025
020021 020021
030021
030022
100021 100021
</TestCaseRequestedList> </TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList> <TestCaseExclusionList></TestCaseExclusionList>
...@@ -42,61 +40,29 @@ ...@@ -42,61 +40,29 @@
<class>Pull_Local_Registry</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Local Registry</desc> <desc>Pull Images from Local Registry</desc>
<test_svr_id>0</test_svr_id> <test_svr_id>0</test_svr_id>
<images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull> <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
</testCase>
<testCase id="000020">
<class>DeployGenObject</class>
<desc>Deploy MySql Database</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
<services>mysql</services>
<nb_healthy>1</nb_healthy>
</testCase> </testCase>
<testCase id="000021"> <testCase id="000021">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI 5G CoreNetwork</desc> <desc>Deploy OAI 5G CoreNetwork</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path> <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
<services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services> <services>mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
<nb_healthy>6</nb_healthy> <nb_healthy>6</nb_healthy>
</testCase> </testCase>
<testCase id="000022"> <testCase id="000022">
<class>DeployGenObject</class> <class>DeployGenObject</class>
<desc>Deploy OAI 5G CU RF sim SA</desc> <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
<services>oai-cu</services>
<nb_healthy>7</nb_healthy>
</testCase>
<testCase id="000023">
<class>DeployGenObject</class>
<desc>Deploy 3 OAI 5G DUs RF sim SA</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
<services>oai-du oai-du2 oai-du3</services>
<nb_healthy>10</nb_healthy>
</testCase>
<testCase id="000024">
<class>DeployGenObject</class>
<desc>Deploy OAI 5G NR-UE RF sim SA</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
<services>oai-nr-ue oai-nr-ue2</services>
<nb_healthy>12</nb_healthy>
</testCase>
<testCase id="000025">
<class>DeployGenObject</class>
<desc>Deploy OAI 5G NR-UE RF sim SA</desc>
<yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path> <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
<services>oai-nr-ue3</services> <services>oai-cu oai-du oai-nr-ue</services>
<nb_healthy>13</nb_healthy> <nb_healthy>9</nb_healthy>
</testCase> </testCase>
<testCase id="020021"> <testCase id="020021">
<class>Ping</class> <class>Ping</class>
<desc>Ping ext-dn from all NR-UEs</desc> <desc>Ping ext-dn from all NR-UEs</desc>
<id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id> <id>rfsim5g_ue</id>
<ping_args> -c 20 192.168.72.135 -i0.25</ping_args> <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
<ping_packetloss_threshold>5</ping_packetloss_threshold> <ping_packetloss_threshold>5</ping_packetloss_threshold>
</testCase> </testCase>
...@@ -107,7 +73,7 @@ ...@@ -107,7 +73,7 @@
<server_container_name>rfsim5g-oai-nr-ue</server_container_name> <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
<client_container_name>rfsim5g-oai-ext-dn</client_container_name> <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
<server_options>-B 12.1.1.2 -u -i 1 -s</server_options> <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
<client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options> <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 20M</client_options>
</testCase> </testCase>
<testCase id="030022"> <testCase id="030022">
...@@ -116,7 +82,7 @@ ...@@ -116,7 +82,7 @@
<server_container_name>rfsim5g-oai-ext-dn</server_container_name> <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
<client_container_name>rfsim5g-oai-nr-ue</client_container_name> <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
<server_options>-u -i 1 -s</server_options> <server_options>-u -i 1 -s</server_options>
<client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options> <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M</client_options>
</testCase> </testCase>
<testCase id="100021"> <testCase id="100021">
......
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
View file @ 6c830a48
...@@ -49,8 +49,10 @@ services: ...@@ -49,8 +49,10 @@ services:
- PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_MNC=99
- PLMN_SUPPORT_TAC=0x0001 - PLMN_SUPPORT_TAC=0x0001
# Only one slice is defined (1, 0xFFFFFF). # Three slices are defined
- SST_0=1 - SST_0=1
- SST_1=2
- SST_2=3
- AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_NGAP=eth0
- AMF_INTERFACE_NAME_FOR_N11=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0
# One single SMF instance # One single SMF instance
...@@ -101,6 +103,8 @@ services: ...@@ -101,6 +103,8 @@ services:
- TYPE0=IPv4 - TYPE0=IPv4
- DNN_RANGE0=12.1.1.2 - 12.1.1.127 - DNN_RANGE0=12.1.1.2 - 12.1.1.127
- NSSAI_SST0=1 - NSSAI_SST0=1
- NSSAI_SST1=2
- NSSAI_SST2=3
- SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps - SESSION_AMBR_DL0=400Mbps
- DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
...@@ -127,10 +131,16 @@ services: ...@@ -127,10 +131,16 @@ services:
- UPF_FQDN_5G=oai-spgwu - UPF_FQDN_5G=oai-spgwu
- NRF_IPV4_ADDRESS=192.168.71.130 - NRF_IPV4_ADDRESS=192.168.71.130
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
# Only one slice is defined (1, 0xFFFFFF) # Three slices are defined
- NSSAI_SST_0=1 - NSSAI_SST_0=1
- NSSAI_SD_0=0xffffff - NSSAI_SD_0=0xffffff
- DNN_0=oai - 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: depends_on:
- oai-nrf - oai-nrf
- oai-smf - oai-smf
...@@ -145,6 +155,7 @@ services: ...@@ -145,6 +155,7 @@ services:
ipv4_address: 192.168.71.134 ipv4_address: 192.168.71.134
traffic_net: traffic_net:
ipv4_address: 192.168.72.134 ipv4_address: 192.168.72.134
oai-ext-dn: oai-ext-dn:
privileged: true privileged: true
container_name: rfsim5g-oai-ext-dn container_name: rfsim5g-oai-ext-dn
...@@ -162,6 +173,7 @@ services: ...@@ -162,6 +173,7 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-cu: oai-cu:
image: oaisoftwarealliance/oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
...@@ -173,7 +185,7 @@ services: ...@@ -173,7 +185,7 @@ services:
- oai-ext-dn - oai-ext-dn
networks: networks:
public_net: public_net:
ipv4_address: 192.168.71.140 ipv4_address: 192.168.71.150
volumes: volumes:
- ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
healthcheck: healthcheck:
...@@ -181,56 +193,19 @@ services: ...@@ -181,56 +193,19 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-du: oai-du:
image: oaisoftwarealliance/oai-gnb:develop image: oaisoftwarealliance/oai-gnb:develop
privileged: true privileged: true
container_name: rfsim5g-oai-du container_name: rfsim5g-oai-du
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: 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 USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
ASAN_OPTIONS: detect_leaks=0 ASAN_OPTIONS: detect_leaks=0
depends_on: depends_on:
- oai-cu - oai-cu
networks: networks:
public_net: public_net:
ipv4_address: 192.168.71.144 ipv4_address: 192.168.71.171
volumes: volumes:
- ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
healthcheck: healthcheck:
...@@ -238,56 +213,22 @@ services: ...@@ -238,56 +213,22 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-nr-ue: oai-nr-ue:
image: oaisoftwarealliance/oai-nr-ue:develop image: oaisoftwarealliance/oai-nr-ue:develop
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue 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
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: 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 USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
ASAN_OPTIONS: detect_leaks=0 -r 106 --numerology 1 -C 3619200000
depends_on: --uicc0.imsi 208990100001100
- oai-du2 --rfsimulator.serveraddr 192.168.71.171
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 ASAN_OPTIONS: detect_leaks=0
depends_on: depends_on:
- oai-du3 - oai-du
networks: networks:
public_net: public_net:
ipv4_address: 192.168.71.152 ipv4_address: 192.168.71.181
volumes: volumes:
- ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
healthcheck: healthcheck:
......
Markdown is supported
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