diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf index f7ca1ef0b6..c895151981 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf @@ -243,7 +243,7 @@ THREAD_STRUCT = ( NETWORK_CONTROLLER : { - FLEXRAN_ENABLED = "yes"; + FLEXRAN_ENABLED = "no"; FLEXRAN_INTERFACE_NAME = "eth0"; FLEXRAN_IPV4_ADDRESS = "CI_MME_IP_ADDR"; FLEXRAN_PORT = 2210; diff --git a/ci-scripts/main.py b/ci-scripts/main.py index ab2ffc6606..89c022e772 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -535,7 +535,9 @@ class SSHConnection(): self.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5) self.command('sed -i -e \'s/CI_MME_IP_ADDR/' + self.EPCIPAddress + '/\' ' + ci_full_config_file, '\$', 2); self.command('sed -i -e \'s/CI_ENB_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2); - if self.flexranCtrlInstalled == False or self.flexranCtrlStarted == False: + if self.flexranCtrlInstalled and self.flexranCtrlStarted: + self.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED = "yes";/\' ' + ci_full_config_file, '\$', 2); + else: self.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED = "no";/\' ' + ci_full_config_file, '\$', 2); # Launch eNB with the modified config file self.command('source oaienv', '\$', 5) @@ -1281,6 +1283,7 @@ class SSHConnection(): htmlOptions = 'N/A' self.close() else: + passStatus = True htmlOptions = 'N/A' if (status_queue.empty()): diff --git a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml index 63b96d7744..c9dd913309 100644 --- a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml +++ b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1.xml @@ -27,8 +27,9 @@ 040101 030101 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201 - 050102 030102 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 030201 + 050102 + 030102 000020 040301 040504 000021 040302 000001 000022 040303 000002 040504 000023 040401 040201 030201 050202 @@ -41,8 +42,8 @@ IdleSleep - Waiting for 5 seconds - 5 + Waiting for 10 seconds + 10 @@ -69,6 +70,30 @@ 2 + + CheckStatusUE + Check UE(s) status before attachment + 0 + + + + CheckStatusUE + Check UE(s) status before data disabling + 2 + + + + CheckStatusUE + Check UE(s) status after data disabling + 0 + + + + CheckStatusUE + Check UE(s) status after data re-enabling + 2 + + Initialize_FlexranCtrl Starting Flexran Controller @@ -91,6 +116,12 @@ -O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf + + Initialize_eNB + Initialize eNB (FDD/Band7/5MHz) + -O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf + + Terminate_eNB Terminate eNB @@ -147,6 +178,20 @@ 5 + + Ping + ping (5MHz - 20 sec) + -c 20 + 5 + + + + Ping + ping (5MHz - 20 sec) + -c 20 + 5 + + Iperf iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)