From 335696282d624ca43a9dc94bd2a1ab4996401670 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 12 Jun 2023 14:40:56 +0200 Subject: [PATCH] chore(ci): post MR 1976, resync Signed-off-by: Raphael Defosseux --- ...nd40.tm1.25PRB.FairScheduler.usrpb210.conf | 16 ++++----- ...rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf | 14 ++++---- ci-scripts/conf_files/rru.fdd.band7.conf | 4 +-- ci-scripts/conf_files/rru.tdd.band40.conf | 4 +-- .../docker-compose.yml | 34 ++++-------------- .../docker-compose.yml | 35 +++++++++++++++++++ 6 files changed, 60 insertions(+), 47 deletions(-) create mode 100644 ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml diff --git a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf index c325870035..6ced7573e0 100644 --- a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf @@ -1,4 +1,4 @@ -Active_eNBs = ( "eNB_Eurecom_LTEBox"); +Active_eNBs = ( "rcc-in-docker"); # Asn1_verbosity, choice in: none, info, annoying Asn1_verbosity = "none"; @@ -13,7 +13,7 @@ eNBs = cell_type = "CELL_MACRO_ENB"; - eNB_name = "eNB_Eurecom_LTEBox"; + eNB_name = "rcc-in-docker"; // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; @@ -137,7 +137,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; + mme_ip_address = ( { ipv4 = "172.21.18.48"; ipv6 = "192:168:30::17"; port = 36412 ; active = "yes"; @@ -157,17 +157,17 @@ eNBs = NETWORK_INTERFACES : { ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; ENB_PORT_FOR_X2C = 36422; # Spec 36422 }; log_config : { - global_log_level ="debug"; + global_log_level ="info"; hw_log_level ="info"; phy_log_level ="info"; mac_log_level ="info"; @@ -200,7 +200,7 @@ RUs = ( { local_if_name = "lo"; remote_address = "127.0.0.2"; - local_address = "127.0.0.1"; + local_address = "127.0.0.3"; local_portc = 50000; remote_portc = 50000; local_portd = 50001; diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf index a94a243b89..11bc672958 100644 --- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf @@ -1,4 +1,4 @@ -Active_eNBs = ( "eNB-Eurecom-LTEBox"); +Active_eNBs = ( "rcc-in-docker"); # Asn1_verbosity, choice in: none, info, annoying Asn1_verbosity = "none"; @@ -13,7 +13,7 @@ eNBs = cell_type = "CELL_MACRO_ENB"; - eNB_name = "eNB-Eurecom-LTEBox"; + eNB_name = "rcc-in-docker"; // Tracking area code, 0x0000 and 0xfffe are reserved values tracking_area_code = 1; @@ -174,7 +174,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; + mme_ip_address = ( { ipv4 = "172.21.18.48"; ipv6 = "192:168:30::17"; port = 36412 ; active = "yes"; @@ -194,11 +194,11 @@ eNBs = NETWORK_INTERFACES : { ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; + ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 - ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; + ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; ENB_PORT_FOR_X2C = 36422; # Spec 36422 }; } @@ -226,7 +226,7 @@ RUs = ( { local_if_name = "lo"; remote_address = "127.0.0.2"; - local_address = "127.0.0.1"; + local_address = "127.0.0.3"; local_portc = 50000; remote_portc = 50000; local_portd = 50001; diff --git a/ci-scripts/conf_files/rru.fdd.band7.conf b/ci-scripts/conf_files/rru.fdd.band7.conf index a3b297049d..b8915767b4 100644 --- a/ci-scripts/conf_files/rru.fdd.band7.conf +++ b/ci-scripts/conf_files/rru.fdd.band7.conf @@ -2,7 +2,7 @@ RUs = ( { local_if_name = "lo"; - remote_address = "127.0.0.1" + remote_address = "127.0.0.3" local_address = "127.0.0.2"; local_portc = 50000; remote_portc = 50000; @@ -13,7 +13,7 @@ RUs = nb_tx = 1; nb_rx = 1; max_pdschReferenceSignalPower = -27; - max_rxgain = 115; + max_rxgain = 125; bands = [7]; } ); diff --git a/ci-scripts/conf_files/rru.tdd.band40.conf b/ci-scripts/conf_files/rru.tdd.band40.conf index 40af241cca..9fbadac7c1 100644 --- a/ci-scripts/conf_files/rru.tdd.band40.conf +++ b/ci-scripts/conf_files/rru.tdd.band40.conf @@ -2,7 +2,7 @@ RUs = ( { local_if_name = "lo"; - remote_address = "127.0.0.1" + remote_address = "127.0.0.3" local_address = "127.0.0.2"; local_portc = 50000; remote_portc = 50000; @@ -13,7 +13,7 @@ RUs = nb_tx = 1; nb_rx = 1; max_pdschReferenceSignalPower = -27; - max_rxgain = 115; + max_rxgain = 125; bands = [40]; } ); diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml index 2815afe3ae..5ca6121fca 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml @@ -7,15 +7,10 @@ services: container_name: lte-b200-rru-fdd-05Mhz-tm1 network_mode: "host" environment: - - USE_B2XX='yes' - - USE_FDD_RRU=True - - RRU_IF4P5_IF_NAME=lo - - RCC_REMOTE_IP_ADDRESS=127.0.0.3 - - RRU_LOCAL_IP_ADDRESS=127.0.0.2 - - UTRA_BAND_ID=7 - - THREAD_PARALLEL_CONFIG=PARALLEL_SINGLE_THREAD - - USE_ADDITIONAL_OPTIONS=--RUs.[0].max_rxgain 125 --log_config.global_log_options level,nocolor,time,line_num,function + USE_B2XX: 'yes' + USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: + - ../../conf_files/rru.fdd.band7.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev healthcheck: # pgrep does NOT work @@ -29,26 +24,9 @@ services: container_name: lte-b200-rcc-fdd-05Mhz-tm1 network_mode: "host" environment: - - USE_FDD_IF4P5_RCC=True - - ENB_NAME=rcc-in-docker - - MCC=208 - - MNC=92 - - MNC_LENGTH=2 - - TAC=1 - - UTRA_BAND_ID=7 - - DL_FREQUENCY_IN_MHZ=2680 - - UL_FREQUENCY_OFFSET_IN_MHZ=120 - - NID_CELL=0 - - NB_PRB=25 - - MME_S1C_IP_ADDRESS=172.21.18.48 - - RCC_IF_NAME=eno1 - - RCC_S1C_IP_ADDRESS=172.21.18.46 - - RCC_IP_ADDRESS=172.21.18.46 - - IF4P5_IF_NAME=lo - - IF4P5_RRU_IP_ADDRESS=127.0.0.2 - - IF4P5_RCC_IP_ADDRESS=127.0.0.3 - - THREAD_PARALLEL_CONFIG=PARALLEL_SINGLE_THREAD - - USE_ADDITIONAL_OPTIONS=--log_config.global_log_options level,nocolor,time,line_num,function + USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function + volumes: + - ../../conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf:/opt/oai-enb/etc/enb.conf healthcheck: # pgrep does NOT work test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem" diff --git a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml new file mode 100644 index 0000000000..7fed7dbf18 --- /dev/null +++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml @@ -0,0 +1,35 @@ +version: '3.8' + +services: + rru_tdd: + image: oai-enb:latest + privileged: true + container_name: lte-b200-rru-tdd-05Mhz-tm1 + network_mode: "host" + environment: + USE_B2XX: 'yes' + USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function + volumes: + - ../../conf_files/rru.tdd.band40.conf:/opt/oai-enb/etc/enb.conf + - /dev:/dev + healthcheck: + # pgrep does NOT work + test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem" + interval: 10s + timeout: 5s + retries: 5 + rcc_tdd: + image: oai-enb:latest + privileged: true + container_name: lte-b200-rcc-tdd-05Mhz-tm1 + network_mode: "host" + environment: + USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function + volumes: + - ../../conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf:/opt/oai-enb/etc/enb.conf + healthcheck: + # pgrep does NOT work + test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem" + interval: 10s + timeout: 5s + retries: 5