maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: fix in looping attach / ping / detach

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2019-12-23 13:49:16 +01:00
parent 45f71211c0
commit 68dc0d00a1
3 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/main.py
+15 -9
View File
@@ -909,20 +909,26 @@ class SSHConnection():
self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword) self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if not self.ADBCentralized: if not self.ADBCentralized:
# Reboot UE # Reboot UE
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60)
# Wait # Wait
time.sleep(60) #time.sleep(60)
# Put in LTE-Mode only # Put in LTE-Mode only
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60)
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60)
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60)
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60)
# enable data service # enable data service
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
# we need to do radio on/off cycle to make sure of above changes # we need to do radio on/off cycle to make sure of above changes
# airplane mode off // radio on # airplane mode off // radio on
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60) #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
time.sleep(10) #time.sleep(10)
# airplane mode on // radio off
#self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
# normal procedure without reboot
# enable data service
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
# airplane mode on // radio off # airplane mode on // radio off
self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60) self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
self.close() self.close()
ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1_nos1.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef> <htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName> <htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon> <htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>2</repeatCount> <repeatCount>4</repeatCount>
<TestCaseRequestedList> <TestCaseRequestedList>
030201 090109 030201 090109
030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
ci-scripts/xml_files/inria/enb_usrp210_band7_test_05mhz_tm1.xml
+44 -40
View File
@@ -19,7 +19,6 @@
For more information about the OpenAirInterface (OAI) Software Alliance: For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org contact@openairinterface.org
030103 000002 040301 000002 040504 040605 040606 040645 040646 000001 040401 000002 030201
--> -->
<testCaseList> <testCaseList>
<htmlTabRef>test-05-tm1</htmlTabRef> <htmlTabRef>test-05-tm1</htmlTabRef>
@@ -28,44 +27,44 @@
<repeatCount>4</repeatCount> <repeatCount>4</repeatCount>
<TestCaseRequestedList> <TestCaseRequestedList>
030201 040101 030201 040101
030103 000002 040301 030103 000002
000002 040504 000001 040301 000002 040504 000001 040401
000002 040505 000001 040301 000002 040505 000001 040401
000002 040506 000001 040301 000002 040506 000001 040401
000002 040507 000001 040301 000002 040507 000001 040401
000002 040508 000001 040301 000002 040508 000001 040401
000002 040509 000001 040301 000002 040509 000001 040401
000002 040510 000001 040301 000002 040510 000001 040401
000002 040511 000001 040301 000002 040511 000001 040401
000002 040512 000001 040301 000002 040512 000001 040401
000002 040513 000001 040301 000002 040513 000001 040401
000002 040514 000001 040301 000002 040514 000001 040401
000002 040515 000001 040301 000002 040515 000001 040401
000002 040516 000001 040301 000002 040516 000001 040401
000002 040517 000001 040301 000002 040517 000001 040401
000002 040518 000001 040301 000002 040518 000001 040401
000002 040519 000001 040301 000002 040519 000001 040401
000002 040520 000001 040301 000002 040520 000001 040401
000002 040521 000001 040301 000002 040521 000001 040401
000002 040522 000001 040301 000002 040522 000001 040401
000002 040523 000001 040301 000002 040523 000001 040401
000002 040524 000001 040301 000002 040524 000001 040401
000002 040525 000001 040301 000002 040525 000001 040401
000002 040526 000001 040301 000002 040526 000001 040401
000002 040527 000001 040301 000002 040527 000001 040401
000002 040528 000001 040301 000002 040528 000001 040401
000002 040529 000001 040301 000002 040529 000001 040401
000002 040530 000001 040301 000002 040530 000001 040401
000002 040531 000001 040301 000002 040531 000001 040401
000002 040532 000001 040301 000002 040532 000001 040401
000002 040533 000001 040301 000002 040533 000001 040401
000002 040534 000001 040301 000002 040534 000001 040401
000002 040535 000001 040301 000002 040535 000001 040401
000002 040536 000001 040301 000002 040536 000001 040401
000002 040537 000001 040301 000002 040537 000001 040401
000002 040538 000001 040301 000002 040538 000001 040401
000002 040539 000001 040301 000002 040539 000001 040401
040401 000002 030201 040201 000002 030201
</TestCaseRequestedList> </TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList> <TestCaseExclusionList></TestCaseExclusionList>
@@ -74,6 +73,11 @@
<desc>Initialize UE</desc> <desc>Initialize UE</desc>
</testCase> </testCase>
<testCase id="040201">
<class>Terminate_UE</class>
<desc>Terminate UE</desc>
</testCase>
<testCase id="000001"> <testCase id="000001">
<class>IdleSleep</class> <class>IdleSleep</class>
<desc>Sleep for 10 sec</desc> <desc>Sleep for 10 sec</desc>
@@ -86,7 +90,7 @@
<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec> <idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
</testCase> </testCase>
<testCase id="030102"> <testCase id="030103">
<class>Initialize_eNB</class> <class>Initialize_eNB</class>
<desc>Initialize eNB (FDD/Band7/5MHz)</desc> <desc>Initialize eNB (FDD/Band7/5MHz)</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT</Initialize_eNB_args> <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT</Initialize_eNB_args>