diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 3f034e9b73..6c345480e0 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -842,8 +842,6 @@ class Containerize():
for image in imagesList:
imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2)
- localMmeIpAddr = EPC.MmeIPAddress
- mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)
# Currently support only one
svcName = self.services[self.eNB_instance]
@@ -904,7 +902,7 @@ class Containerize():
cnt = 0
while (cnt < 20):
mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
- result = re.search('got sync|Starting F1AP at CU|Got sync', mySSH.getBefore())
+ result = re.search('got sync|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
if result is None:
time.sleep(6)
cnt += 1
diff --git a/ci-scripts/conf_files/README.md b/ci-scripts/conf_files/README.md
index 31e4129712..c9a2a582d4 100644
--- a/ci-scripts/conf_files/README.md
+++ b/ci-scripts/conf_files/README.md
@@ -29,7 +29,8 @@ Examples:
- standard monolithic gNB, 2x2 configuration, with SDAP: `gnb.sa.band78.162prb.usrpn310.2x2-sdap.conf`
- gNB-CU: `gnb-cu.sa.f1.conf`
- monolithic gNB, L2sim: `gnb.sa.band77.106prb.l2sim.conf`
-- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`
+- monolithic eNB: `enb.band7.25prb.usrpb200.conf`
+- RCC (4G eNB with IF4.5 split): `enb-rcc.band7.25prb.tm1.if4p5.conf`
Notes:
- there is no need for TDD/FDD, this is encoded in the band number
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf
similarity index 94%
rename from ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
rename to ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf
index c325870035..6ced7573e0 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.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/enb-rcc.band7.25prb.tm1.if4p5.conf
similarity index 96%
rename from ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
rename to ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf
index a94a243b89..11bc672958 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.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.tdd.band40.conf b/ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.conf
similarity index 92%
rename from ci-scripts/conf_files/rru.tdd.band40.conf
rename to ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.conf
index 40af241cca..9fbadac7c1 100644
--- a/ci-scripts/conf_files/rru.tdd.band40.conf
+++ b/ci-scripts/conf_files/enb-rru.band40.usrpb210.tm1.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/conf_files/rru.fdd.band7.conf b/ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.conf
similarity index 92%
rename from ci-scripts/conf_files/rru.fdd.band7.conf
rename to ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.conf
index a3b297049d..b8915767b4 100644
--- a/ci-scripts/conf_files/rru.fdd.band7.conf
+++ b/ci-scripts/conf_files/enb-rru.band7.usrpb210.tm1.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/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
deleted file mode 100644
index 094ea88ad1..0000000000
--- a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ /dev/null
@@ -1,225 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- # real_time choice in {hard, rt-preempt, no}
- real_time = "no";
-
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB_Eurecom_LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = 1;
- plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- node_function = "NGFI_RCC_IF4p5";
- node_timing = "synch_to_ext_device";
- node_synch_ref = 0;
- frame_type = "TDD";
- tdd_config = 1;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 40;
- downlink_frequency = 2350000000L;
- uplink_frequency_offset = 0;
- Nid_cell = 0;
- N_RB_DL = 100;
- Nid_cell_mbsfn = 0;
- nb_antenna_ports = 1;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 90;
- rx_gain = 125;
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 1;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 0;
- pdsch_referenceSignalPower =-29;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -96;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -106;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
- /*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
- */
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -108;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
-
- ue_TransmissionMode = 1;
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
- ipv6 = "192:168:30::17";
- port = 36412 ;
- active = "yes";
- preference = "ipv4";
- }
- );
-
- enable_measurement_reports = "no";
-
- ///X2
- enable_x2 = "no";
- t_reloc_prep = 1000; /* unit: millisecond */
- tx2_reloc_overall = 2000; /* unit: millisecond */
- t_dc_prep = 1000; /* unit: millisecond */
- t_dc_overall = 2000; /* unit: millisecond */
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
- ENB_INTERFACE_NAME_FOR_S1U = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_X2C = 36422; # Spec 36422
- };
-
- log_config :
- {
- global_log_level ="debug";
- hw_log_level ="info";
- phy_log_level ="info";
- mac_log_level ="info";
- rlc_log_level ="info";
- pdcp_log_level ="info";
- rrc_log_level ="info";
- };
-
- }
-);
-MACRLCs = (
- {
- num_cc = 1;
- tr_s_preference = "local_L1";
- tr_n_preference = "local_RRC";
- scheduler_mode = "fairRR";
- puSch10xSnr = 200;
- puCch10xSnr = 200;
- }
-);
-
-L1s = (
- {
- num_cc = 1;
- tr_n_preference = "local_mac";
- }
-);
-
-RUs = (
- {
- local_if_name = "lo";
- remote_address = "127.0.0.2";
- local_address = "127.0.0.1";
- local_portc = 50000;
- remote_portc = 50000;
- local_portd = 50001;
- remote_portd = 50001;
- local_rf = "no"
- tr_preference = "udp_if4p5"
- nb_tx = 1
- nb_rx = 1
- att_tx = 0
- att_rx = 0;
- eNB_instances = [0];
- }
-);
-
-THREAD_STRUCT = (
- {
- #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
- parallel_config = "PARALLEL_SINGLE_THREAD";
- #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
- worker_config = "WORKER_ENABLE";
- }
-);
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
deleted file mode 100644
index 41a3c08552..0000000000
--- a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ /dev/null
@@ -1,225 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- # real_time choice in {hard, rt-preempt, no}
- real_time = "no";
-
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB_Eurecom_LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = 1;
- plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- node_function = "NGFI_RCC_IF4p5";
- node_timing = "synch_to_ext_device";
- node_synch_ref = 0;
- frame_type = "TDD";
- tdd_config = 1;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 40;
- downlink_frequency = 2350000000L;
- uplink_frequency_offset = 0;
- Nid_cell = 0;
- N_RB_DL = 50;
- Nid_cell_mbsfn = 0;
- nb_antenna_ports = 1;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 90;
- rx_gain = 125;
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 1;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 0;
- pdsch_referenceSignalPower =-27;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -96;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -106;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
- /*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
- */
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -108;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
-
- ue_TransmissionMode = 1;
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
- ipv6 = "192:168:30::17";
- port = 36412 ;
- active = "yes";
- preference = "ipv4";
- }
- );
-
- enable_measurement_reports = "no";
-
- ///X2
- enable_x2 = "no";
- t_reloc_prep = 1000; /* unit: millisecond */
- tx2_reloc_overall = 2000; /* unit: millisecond */
- t_dc_prep = 1000; /* unit: millisecond */
- t_dc_overall = 2000; /* unit: millisecond */
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
- ENB_INTERFACE_NAME_FOR_S1U = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_X2C = 36422; # Spec 36422
- };
-
- log_config :
- {
- global_log_level ="debug";
- hw_log_level ="info";
- phy_log_level ="info";
- mac_log_level ="info";
- rlc_log_level ="info";
- pdcp_log_level ="info";
- rrc_log_level ="info";
- };
-
- }
-);
-MACRLCs = (
- {
- num_cc = 1;
- tr_s_preference = "local_L1";
- tr_n_preference = "local_RRC";
- scheduler_mode = "fairRR";
- puSch10xSnr = 200;
- puCch10xSnr = 200;
- }
-);
-
-L1s = (
- {
- num_cc = 1;
- tr_n_preference = "local_mac";
- }
-);
-
-RUs = (
- {
- local_if_name = "lo";
- remote_address = "127.0.0.2";
- local_address = "127.0.0.1";
- local_portc = 50000;
- remote_portc = 50000;
- local_portd = 50001;
- remote_portd = 50001;
- local_rf = "no"
- tr_preference = "udp_if4p5"
- nb_tx = 1
- nb_rx = 1
- att_tx = 6
- att_rx = 6;
- eNB_instances = [0];
- }
-);
-
-THREAD_STRUCT = (
- {
- #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
- parallel_config = "PARALLEL_SINGLE_THREAD";
- #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
- worker_config = "WORKER_ENABLE";
- }
-);
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
deleted file mode 100644
index a6829fe215..0000000000
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+++ /dev/null
@@ -1,262 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- # real_time choice in {hard, rt-preempt, no}
- real_time = "no";
-
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB-Eurecom-LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = 1;
- plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-
- tr_s_preference = "local_mac"
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- node_function = "NGFI_RCC_IF4p5";
- node_timing = "synch_to_ext_device";
- node_synch_ref = 0;
- frame_type = "FDD";
- tdd_config = 3;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 7;
- downlink_frequency = 2680000000L;
- uplink_frequency_offset = -120000000;
- Nid_cell = 0;
- N_RB_DL = 100;
- Nid_cell_mbsfn = 0;
- nb_antenna_ports = 1;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 90;
- rx_gain = 125;
- pbch_repetition = "FALSE";
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 0;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 0;
- pdsch_referenceSignalPower = -29;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -96;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -104;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
- /*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
- */
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -108;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
- ue_TransmissionMode = 1;
-
- //Parameters for SIB18
- rxPool_sc_CP_Len = "normal";
- rxPool_sc_Period = "sf40";
- rxPool_data_CP_Len = "normal";
- rxPool_ResourceConfig_prb_Num = 20;
- rxPool_ResourceConfig_prb_Start = 5;
- rxPool_ResourceConfig_prb_End = 44;
- rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
- rxPool_ResourceConfig_offsetIndicator_choice = 0;
- rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
- rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
- rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
- rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/* rxPool_dataHoppingConfig_hoppingParameter = 0;
- rxPool_dataHoppingConfig_numSubbands = "ns1";
- rxPool_dataHoppingConfig_rbOffset = 0;
- rxPool_commTxResourceUC-ReqAllowed = "TRUE";
-*/
- // Parameters for SIB19
- discRxPool_cp_Len = "normal"
- discRxPool_discPeriod = "rf32"
- discRxPool_numRetx = 1;
- discRxPool_numRepetition = 2;
- discRxPool_ResourceConfig_prb_Num = 5;
- discRxPool_ResourceConfig_prb_Start = 3;
- discRxPool_ResourceConfig_prb_End = 21;
- discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
- discRxPool_ResourceConfig_offsetIndicator_choice = 0;
- discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
- discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
- discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
- discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
- ipv6 = "192:168:30::17";
- port = 36412 ;
- active = "yes";
- preference = "ipv4";
- }
- );
-
- enable_measurement_reports = "no";
-
- ///X2
- enable_x2 = "no";
- t_reloc_prep = 1000; /* unit: millisecond */
- tx2_reloc_overall = 2000; /* unit: millisecond */
- t_dc_prep = 1000; /* unit: millisecond */
- t_dc_overall = 2000; /* unit: millisecond */
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
- ENB_INTERFACE_NAME_FOR_S1U = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_X2C = 36422; # Spec 36422
- };
- }
-);
-
-MACRLCs = (
- {
- num_cc = 1;
- tr_s_preference = "local_L1";
- tr_n_preference = "local_RRC";
- phy_test_mode = 0;
- puSch10xSnr = 160;
- puCch10xSnr = 160;
- }
-);
-
-L1s = (
- {
- num_cc = 1;
- tr_n_preference = "local_mac";
- }
-);
-
-RUs = (
- {
- local_if_name = "lo";
- remote_address = "127.0.0.2";
- local_address = "127.0.0.1";
- local_portc = 50000;
- remote_portc = 50000;
- local_portd = 50001;
- remote_portd = 50001;
- local_rf = "no"
- tr_preference = "udp_if4p5"
- nb_tx = 1
- nb_rx = 1
- att_tx = 0
- att_rx = 0;
- eNB_instances = [0];
- }
-);
-
-THREAD_STRUCT = (
- {
- #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
- parallel_config = "PARALLEL_SINGLE_THREAD";
- #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
- worker_config = "WORKER_ENABLE";
- }
-);
-
- log_config :
- {
- global_log_level ="info";
- hw_log_level ="info";
- phy_log_level ="info";
- mac_log_level ="info";
- rlc_log_level ="info";
- pdcp_log_level ="info";
- rrc_log_level ="info";
- };
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
deleted file mode 100644
index 3366e1ee4b..0000000000
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+++ /dev/null
@@ -1,262 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- # real_time choice in {hard, rt-preempt, no}
- real_time = "no";
-
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB-Eurecom-LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = 1;
- plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
-
- tr_s_preference = "local_mac"
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- node_function = "NGFI_RCC_IF4p5";
- node_timing = "synch_to_ext_device";
- node_synch_ref = 0;
- frame_type = "FDD";
- tdd_config = 3;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 7;
- downlink_frequency = 2680000000L;
- uplink_frequency_offset = -120000000;
- Nid_cell = 0;
- N_RB_DL = 50;
- Nid_cell_mbsfn = 0;
- nb_antenna_ports = 1;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 90;
- rx_gain = 125;
- pbch_repetition = "FALSE";
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 0;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 0;
- pdsch_referenceSignalPower = -27;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -96;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -104;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
- /*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
- */
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -108;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
- ue_TransmissionMode = 1;
-
- //Parameters for SIB18
- rxPool_sc_CP_Len = "normal";
- rxPool_sc_Period = "sf40";
- rxPool_data_CP_Len = "normal";
- rxPool_ResourceConfig_prb_Num = 20;
- rxPool_ResourceConfig_prb_Start = 5;
- rxPool_ResourceConfig_prb_End = 44;
- rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
- rxPool_ResourceConfig_offsetIndicator_choice = 0;
- rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
- rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
- rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
- rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/* rxPool_dataHoppingConfig_hoppingParameter = 0;
- rxPool_dataHoppingConfig_numSubbands = "ns1";
- rxPool_dataHoppingConfig_rbOffset = 0;
- rxPool_commTxResourceUC-ReqAllowed = "TRUE";
-*/
- // Parameters for SIB19
- discRxPool_cp_Len = "normal"
- discRxPool_discPeriod = "rf32"
- discRxPool_numRetx = 1;
- discRxPool_numRepetition = 2;
- discRxPool_ResourceConfig_prb_Num = 5;
- discRxPool_ResourceConfig_prb_Start = 3;
- discRxPool_ResourceConfig_prb_End = 21;
- discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
- discRxPool_ResourceConfig_offsetIndicator_choice = 0;
- discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
- discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
- discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
- discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR";
- ipv6 = "192:168:30::17";
- port = 36412 ;
- active = "yes";
- preference = "ipv4";
- }
- );
-
- enable_measurement_reports = "no";
-
- ///X2
- enable_x2 = "no";
- t_reloc_prep = 1000; /* unit: millisecond */
- tx2_reloc_overall = 2000; /* unit: millisecond */
- t_dc_prep = 1000; /* unit: millisecond */
- t_dc_overall = 2000; /* unit: millisecond */
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR";
- ENB_INTERFACE_NAME_FOR_S1U = "eth0";
- ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR";
- ENB_PORT_FOR_X2C = 36422; # Spec 36422
- };
- }
-);
-
-MACRLCs = (
- {
- num_cc = 1;
- tr_s_preference = "local_L1";
- tr_n_preference = "local_RRC";
- phy_test_mode = 0;
- puSch10xSnr = 160;
- puCch10xSnr = 160;
- }
-);
-
-L1s = (
- {
- num_cc = 1;
- tr_n_preference = "local_mac";
- }
-);
-
-RUs = (
- {
- local_if_name = "lo";
- remote_address = "127.0.0.2";
- local_address = "127.0.0.1";
- local_portc = 50000;
- remote_portc = 50000;
- local_portd = 50001;
- remote_portd = 50001;
- local_rf = "no"
- tr_preference = "udp_if4p5"
- nb_tx = 1
- nb_rx = 1
- att_tx = 0
- att_rx = 0;
- eNB_instances = [0];
- }
-);
-
-THREAD_STRUCT = (
- {
- #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
- parallel_config = "PARALLEL_SINGLE_THREAD";
- #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
- worker_config = "WORKER_ENABLE";
- }
-);
-
- log_config :
- {
- global_log_level ="info";
- hw_log_level ="info";
- phy_log_level ="info";
- mac_log_level ="info";
- rlc_log_level ="info";
- pdcp_log_level ="info";
- rrc_log_level ="info";
- };
diff --git a/ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf b/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf
similarity index 100%
rename from ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf
rename to ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
similarity index 100%
rename from ci-scripts/conf_files/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
rename to ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
similarity index 100%
rename from ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
rename to ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
rename to ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
diff --git a/ci-scripts/conf_files/rru.band38.tm1.master.conf b/ci-scripts/conf_files/untested/rru.band38.tm1.master.conf
similarity index 100%
rename from ci-scripts/conf_files/rru.band38.tm1.master.conf
rename to ci-scripts/conf_files/untested/rru.band38.tm1.master.conf
diff --git a/ci-scripts/conf_files/rru.band38.tm1.slave.conf b/ci-scripts/conf_files/untested/rru.band38.tm1.slave.conf
similarity index 100%
rename from ci-scripts/conf_files/rru.band38.tm1.slave.conf
rename to ci-scripts/conf_files/untested/rru.band38.tm1.slave.conf
diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py
index 30a9fc87a4..3505e9bdc2 100644
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -166,6 +166,8 @@ class EPCManagement():
mySSH.command('echo ' + self.Password + ' | sudo -S ./run_mme 2>&1 | stdbuf -o0 tee -a mme_' + self.testCase_id + '.log &', 'MME app initialization complete', 100)
elif re.match('ltebox', self.Type, re.IGNORECASE):
mySSH.command('cd /opt/ltebox/tools', '\$', 5)
+ # Clean-up the logs from previous runs
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f ../var/log/*.0', '\$', 5)
mySSH.command('echo ' + self.Password + ' | sudo -S ./start_mme', '\$', 5)
else:
logging.error('This option should not occur!')
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index fff204a018..ba618d3b01 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -895,7 +895,7 @@ class RANManagement():
htmleNBFailureMsg += ' Command line option(s) correctly applied ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
else:
htmleNBFailureMsg += ' Command line option(s) NOT applied ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
- result = re.search('Exiting OAI softmodem', str(line))
+ result = re.search('Exiting OAI softmodem|Caught SIGTERM, shutting down', str(line))
if result is not None:
exitSignalReceived = True
result = re.search('[Ss]egmentation [Ff]ault', str(line))
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
new file mode 100644
index 0000000000..df544ab529
--- /dev/null
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
@@ -0,0 +1,184 @@
+
+
+ test-fdd-05-tm1-if4-5
+ Test-FDD-05MHz-TM1-IF4.5
+ tasks
+
+100000
+111110
+300000
+040101
+030131 030132
+040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
+030231
+200000
+
+
+
+
+ Pull_Local_Registry
+ Pull Images from Local Registry
+ 0
+ oai-enb
+
+
+
+ Custom_Command
+ Disable Sleep States
+ hutch
+ sudo cpupower idle-set -D 0
+
+
+ Custom_Command
+ Enable Sleep States
+ hutch
+ sudo cpupower idle-set -E
+
+
+ Custom_Command
+ Reset USRP
+ hutch
+ sudo -S b2xx_fx3_utils --reset-device
+
+
+
+ Deploy_Object
+ Deploy RRU (FDD/Band7/5MHz/B200) in a container
+ ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5
+ rru_fdd
+ 0
+ 0
+
+
+
+ Deploy_Object
+ Deploy RCC (FDD/Band7/5MHz) in a container
+ ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5
+ rcc_fdd
+ 0
+ 0
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ Undeploy_Object
+ Undeploy RCC/RRU
+ ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5
+ 0
+ 0
+
+
+
+ Initialize_UE
+ Initialize UE
+ adb_ue_1 adb_ue_2
+
+
+ Terminate_UE
+ Terminate UE
+ adb_ue_1 adb_ue_2
+
+
+ Attach_UE
+ Attach UEs
+ adb_ue_1 adb_ue_2
+
+
+ Detach_UE
+ Detach UEs
+ adb_ue_1 adb_ue_2
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20 %cn_ip%
+ 5
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ DL
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 15M -t 30 -i 1
+ 50
+ DL
+ adb_ue_1
+
+
+
+ Iperf
+ iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+ DL
+ adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)
+ -u -b 9M -t 30 -i 1
+ 50
+ balanced
+ UL
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 9M -t 30 -i 1
+ 50
+ single-ue
+ UL
+ adb_ue_1
+
+
+
+ Iperf
+ iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+ UL
+ adb_ue_1
+
+
+
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
index 34bee784a4..b305f56a2f 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
040101
030102
000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
-030201
+030202
200000
@@ -64,7 +64,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
0
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
index 040211347b..f8e7d5ab12 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -34,7 +34,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
030111
000001
040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
-030201
+030211
200000
@@ -72,7 +72,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
index dc6df2da57..66ee0ffb42 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
030112
040301 040302 040512 040612 040650 040401
040201
-030201
+030212
200000
@@ -65,7 +65,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
0
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
index 8015a54f43..1c6cf4b647 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
030121
000001
040301 040521 040623 040624 040625 040662 040401 040201
-030201
+030221
200000
@@ -71,7 +71,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
index 1aaa731b93..f926d1a056 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -33,7 +33,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
040101
030104
040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201
-030201
+030204
200000
@@ -79,7 +79,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
new file mode 100644
index 0000000000..b71cc555e6
--- /dev/null
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
@@ -0,0 +1,205 @@
+
+
+ test-tdd-05-if4-5
+ Test-TDD-05MHz-TM1-IF4.5
+ tasks
+
+300000
+100000
+111110
+030134 030135
+040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
+030231
+040101
+200000
+
+
+
+
+ Pull_Local_Registry
+ Pull Images from Local Registry
+ 0
+ oai-enb
+
+
+
+ Custom_Command
+ Disable Sleep States
+ starsky
+ sudo cpupower idle-set -D 0
+
+
+ Custom_Command
+ Enable Sleep States
+ starsky
+ sudo cpupower idle-set -E
+
+
+
+ Custom_Command
+ Reset USRP
+ starsky
+ sudo -S b2xx_fx3_utils --reset-device
+
+
+
+ Deploy_Object
+ Deploy RRU (TDD/Band40/5MHz/B200) in a container
+ ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5
+ rru_tdd
+ 0
+ 0
+
+
+
+ Deploy_Object
+ Deploy RCC (TDD/Band40/5MHz) in a container
+ ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5
+ rcc_tdd
+ 0
+ 0
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ Undeploy_Object
+ Undeploy RRU/RCC
+ ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5
+ 0
+ 0
+
+
+
+ Initialize_UE
+ Initialize UE
+ adb_ue_1 adb_ue_2
+
+
+ Terminate_UE
+ Terminate UE
+ adb_ue_1 adb_ue_2
+
+
+ Attach_UE
+ Attach UE
+ adb_ue_1 adb_ue_2
+
+
+ Detach_UE
+ Detach UE
+ adb_ue_1 adb_ue_2
+
+
+
+ Ping
+ ping (5MHz - 20 sec)
+ -c 20 %cn_ip%
+ 25
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)
+ -u -b 6.5M -t 30 -i 1
+ 50
+ balanced
+ DL
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)
+ -u -b 6.5M -t 30 -i 1
+ 50
+ single-ue
+ DL
+ adb_ue_1
+
+
+
+ Iperf
+ iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+ DL
+ adb_ue_1
+
+
+
+ Iperf
+ iperf (5MHz - DL/TCP)(30 sec)
+ -t 30 -i 1 -fm
+ 50
+ DL
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)
+ -u -b 2M -t 30 -i 1
+ 50
+ balanced
+ UL
+ adb_ue_1 adb_ue_2
+
+
+
+ Iperf
+ iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
+ -u -b 2M -t 30 -i 1
+ 50
+ single-ue
+ UL
+ adb_ue_1
+
+
+
+ Iperf
+ iperf (5MHz - UL/TCP)(30 sec)(single-ue)
+ -t 30 -i 1 -fm
+ 50
+ single-ue
+ UL
+ adb_ue_1
+
+
+
+ Iperf
+ iperf (5MHz - UL/TCP)(30 sec)
+ -t 30 -i 1 -fm
+ 50
+ UL
+ adb_ue_1 adb_ue_2
+
+
+
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
index c3a0b2ef89..7222215932 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
040101
030105
040301 040502 040606 040608 040646 040648 040401 040201
-030201
+030205
200000
@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
index e82564338f..93e51242fc 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
040101
030114
040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
-030201
+030214
200000
@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
index 3e558f0ac3..d853b56855 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
040101
030124
040301 040521 040622 040621 040623 040662 040401 040201
-030201
+030224
200000
@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
index 645de59565..d229be48b5 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -32,7 +32,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
040101
030125
040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
-030201
+030225
200000
@@ -71,7 +71,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
5
-
+
Undeploy_Object
Undeploy eNB
ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml
deleted file mode 100644
index 715dc0e315..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band40_test_05mhz.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- test-05
- Test-05MHz
- tasks
-
- 030201
- 040101
- 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
-
-
-
-
-
- Initialize_eNB
- Initialize RRU (TDD/Band40)
- -O ci-scripts/conf_files/rru.tdd.band40.conf --RUs.[0].max_rxgain 125 --log_config.global_log_options level,nocolor,time
- 0
-
-
-
- Initialize_eNB
- Initialize RCC (TDD/Band40/5MHz)
- -O ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf --log_config.global_log_options level,nocolor,time
- 1
-
-
-
- Terminate_eNB
- Terminate RCC
- 1
-
-
-
- Terminate_eNB
- Terminate RRU
- 0
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 25
-
-
-
- Iperf
- iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 6.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
deleted file mode 100644
index b7c2622283..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band40_test_10mhz.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
- test-10
- Test-10MHz
- tasks
- 1
- True
- 040612
-
- 030201
- 040101
- 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
-
-
-
-
-
- Initialize_eNB
- Initialize RRU (TDD/Band40)
- -O ci-scripts/conf_files/rru.tdd.band40.conf --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time
- 0
-
-
-
- Initialize_eNB
- Initialize RCC (TDD/Band40/10MHz/info)
- -O ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf --log_config.global_log_options level,nocolor,time
- 1
-
-
-
- Terminate_eNB
- Terminate RCC
- 1
-
-
-
- Terminate_eNB
- Terminate RRU
- 0
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (10MHz - 20 sec)
- -c 20
- 25
-
-
-
- Iperf
- iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 13.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 60
- single-ue
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml
deleted file mode 100644
index 287f75c59f..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
- test-20
- Test-20MHz
- tasks
- 1
-
- 030201
- 040101
- 030124 030125 040301 040521 040622 040662 040401 040201 030201 030202
-
-
-
-
-
- Initialize_eNB
- Initialize RRU (TDD/Band40)
- -O ci-scripts/conf_files/rru.tdd.band40.conf --log_config.global_log_options level,nocolor,time
- 0
-
-
-
- Initialize_eNB
- Initialize RCC (TDD/Band40/20MHz/info)
- -O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time
- 1
-
-
-
- Terminate_eNB
- Terminate RCC
- 1
-
-
-
- Terminate_eNB
- Terminate RRU
- 0
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (20MHz - 20 sec)
- -c 20
- 25
-
-
-
- Iperf
- iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)
- -u -b 13.5M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)
- -u -b 2M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
deleted file mode 100644
index fc3fe29992..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_05mhz.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- test-if4p5-05
- Test-IF4.5-05MHz
- tasks
-
- 030201
- 040101
- 030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
-
-
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf --RUs.[0].max_rxgain 125 --log_config.global_log_options level,nocolor,time
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/5MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time
- 0
-
-
-
- Terminate_eNB
- Terminate RCC
- 0
-
-
-
- Terminate_eNB
- Terminate RRU
- 1
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (5MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 15M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 9M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
deleted file mode 100644
index 8aa07a1c43..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_10mhz.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- test-if4p5-10
- Test-IF4.5-10MHz
- tasks
-
- 030201
- 040101
- 030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
-
-
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/10MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time
- 0
-
-
-
- Terminate_eNB
- Terminate RCC
- 0
-
-
-
- Terminate_eNB
- Terminate RRU
- 1
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (10MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 32M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (10MHz - UL/5Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 5M -t 30 -i 1 -R
- 60
- single-ue
-
-
-
diff --git a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
deleted file mode 100644
index 01f26bdf0f..0000000000
--- a/ci-scripts/xml_files/if4p5_usrp210_band7_test_20mhz.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- test-if4p5-20
- Test-IF4.5-20MHz
- tasks
-
- 030201
- 040101
- 030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
-
-
-
-
-
- Initialize_eNB
- Initialize RRU (FDD/Band7)
- -O ci-scripts/conf_files/rru.fdd.band7.conf --log_config.global_log_options level,nocolor,time
- 1
-
-
-
- Initialize_eNB
- Initialize RCC (FDD/Band7/20MHz)
- -O ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time
- 0
-
-
-
- Terminate_eNB
- Terminate RCC
- 0
-
-
-
- Terminate_eNB
- Terminate RRU
- 1
-
-
-
- Initialize_UE
- Initialize UE
-
-
-
- Terminate_UE
- Terminate UE
-
-
-
- Attach_UE
- Attach UE
-
-
-
- Detach_UE
- Detach UE
-
-
-
- Ping
- ping (20MHz - 20 sec)
- -c 20
- 5
-
-
-
- Iperf
- iperf (20MHz - DL/50Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 50M -t 30 -i 1
- 50
- single-ue
-
-
-
- Iperf
- iperf (20MHz - UL/10Mbps/UDP)(30 sec)(single-ue profile)
- -u -b 10M -t 30 -i 1 -R
- 50
- single-ue
-
-
-
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..518a39de23 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/enb-rru.band7.usrpb210.tm1.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/enb-rcc.band7.25prb.tm1.if4p5.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..7867ccc1ff
--- /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/enb-rru.band40.usrpb210.tm1.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/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.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