diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 77b7fcacb5..b1b147b145 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -851,7 +851,6 @@ class Containerize(): mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2) # Currently support only one - mySSH.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 15) svcName = self.services[self.eNB_instance] if svcName == '': logging.warning('no service name given: starting all services in ci-docker-compose.yml!') diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index 328785f8d1..51e43109a0 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -453,17 +453,6 @@ class OaiCiTest(): UE_prefix = 'NR ' SSH = sshconnection.SSHConnection() SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword) - # b2xx_fx3_utils reset procedure - SSH.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 180) - result = re.search('type: b200', SSH.getBefore()) - if result is not None: - logging.debug('Found a B2xx device --> resetting it') - SSH.command('echo ' + self.UEPassword + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10) - # Reloading FGPA bin firmware - SSH.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 180) - result = re.search('type: n3xx', str(SSH.getBefore())) - if result is not None: - logging.debug('Found a N3xx device --> resetting it') SSH.command('cd ' + self.UESourceCodePath, '\$', 5) # Initialize_OAI_UE_args usually start with -C and followed by the location in repository SSH.command('source oaienv', '\$', 5) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 438f310ca8..fd3f1f773a 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -499,6 +499,9 @@ def GetParametersFromXML(action): string_field = test.findtext('test_svr_id') if (string_field is not None): CONTAINERS.testSvrId = string_field + elif action == 'Custom_Command': + RAN.node = test.findtext('node') + RAN.command = test.findtext('command') else: logging.warning(f"unknown action {action} from option-parsing point-of-view") @@ -880,6 +883,9 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re RAN.BuildeNB(HTML) elif action == 'WaitEndBuild_eNB': RAN.WaitBuildeNBisFinished(HTML) + elif action == 'Custom_Command': + logging.info(f"Executing custom command") + RAN.CustomCommand(HTML) elif action == 'Initialize_eNB': check_eNB = False check_OAI_UE = False diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index fd6a073f21..8628d5f3d8 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -38,6 +38,7 @@ import os import time from multiprocessing import Process, Lock, SimpleQueue import yaml +import cls_cmd #----------------------------------------------------------- @@ -96,6 +97,8 @@ class RANManagement(): #checkers from xml self.ran_checkers={} self.cmd_prefix = '' # prefix before {lte,nr}-softmodem + self.node = '' + self.command = '' #----------------------------------------------------------- @@ -259,6 +262,21 @@ class RANManagement(): mySSH.close() self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML) + def CustomCommand(self, HTML): + if self.node == '' or self.node == "localhost": + cmd = cls_cmd.LocalCmd() + else: + cmd = cls_cmd.RemoteCmd(self.node) + ret = cmd.run(self.command) + cmd.close() + logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode} output: {ret.stdout}') + html_queue = SimpleQueue() + status = 'OK' + if ret.returncode != 0: + html_queue.put(ret.stdout) + status = 'Warning' + HTML.CreateHtmlTestRow(self.command, status, 1, html_queue) + def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId, HTML): HTML.testCase_id=testcaseId @@ -347,17 +365,6 @@ class RANManagement(): cwd = os.getcwd() mySSH.copyout(lIpAddr,lUserName,lPassWord, cwd + "/active_net_interfaces.awk", "/tmp") - #reboot USRP if requested in xml - if self.USRPIPAddress!='': - logging.debug('USRP '+ self.USRPIPAddress +': reboot request') - mySSH.open(lIpAddr, lUserName, lPassWord) - cmd2usrp='ssh root@'+self.USRPIPAddress+' reboot' - mySSH.command2(cmd2usrp,1) - mySSH.close() - logging.debug('Waiting for USRP to be ready') - time.sleep(120) - - if (self.pStatus < 0): HTML.CreateHtmlTestRow(self.air_interface[self.eNB_instance] + ' ' + self.Initialize_eNB_args, 'KO', self.pStatus) HTML.CreateHtmlTabFooter(False) @@ -419,16 +426,6 @@ class RANManagement(): result = re.search('^rru|^rcc|^du.band', str(config_file)) if result is not None: rruCheck = True - # do not reset board twice in IF4.5 case - result = re.search('^rru|^enb|^du.band', str(config_file)) - if result is not None: - mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 180) - result = re.search('type: b200', mySSH.getBefore()) - if result is not None: - logging.debug('Found a B2xx device --> resetting it') - mySSH.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10) - # Reloading FGPA bin firmware - mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 180) # Make a copy and adapt to EPC / eNB IP addresses mySSH.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5) localMmeIpAddr = EPC.MmeIPAddress diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml index b4dabb1654..93e3bc9fb0 100755 --- a/ci-scripts/xml_class_list.yml +++ b/ci-scripts/xml_class_list.yml @@ -51,3 +51,4 @@ - Push_Local_Registry - Pull_Local_Registry - Clean_Test_Server_Images + - Custom_Command diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml index ce9a19fde3..698c620329 100644 --- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml +++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml @@ -27,12 +27,15 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml Test-FDD-05MHz-TM1 tasks +100000 111110 +300000 040101 030101 000001 040301 000001 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201 030201 +200000 @@ -42,7 +45,24 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml 0 oai-enb - + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -E + + + Custom_Command + To reset USRP + hutch + sudo -S b2xx_fx3_utils --reset-device + Deploy_Object Deploy eNB (FDD/Band7/5MHz/B200) in a container 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 8ead87d703..66d0c982ec 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm Test-FDD-05MHz-TM1-RRC-Inactivity tasks +100000 111110 040101 030102 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201 030201 +200000 @@ -41,6 +43,18 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm 0 oai-enb + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -E + Deploy_Object 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 ce3161c94c..07f23ff2f0 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 @@ -28,12 +28,14 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Test-FDD-10MHz-TM1 tasks +100000 111110 040101 030111 000001 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201 030201 +200000 @@ -43,6 +45,18 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 0 oai-enb + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -E + Deploy_Object 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 4d09bada08..caa888e4a8 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Test-FDD-10MHz-CDRX-TM1 tasks +100000 111110 040101 030112 040301 040512 040612 040650 040401 040201 030201 +200000 @@ -41,6 +43,18 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 0 oai-enb + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -E + Deploy_Object 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 092ee208d1..e57e40cb1f 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 @@ -27,12 +27,14 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml Test-FDD-20MHz-TM1 tasks +100000 111110 040101 030121 000001 040301 040521 040623 040624 040625 040662 040401 040201 030201 +200000 @@ -42,6 +44,18 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml 0 oai-enb + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + hutch + sudo cpupower idle-set -E + Deploy_Object 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 fa191cd163..9f3bedba9e 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml Test-TDD-05MHz-TM1 tasks +100000 111110 040101 030104 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201 030201 +200000 @@ -41,6 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml 0 oai-enb + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -E + Deploy_Object 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 69997c5586..d8f87b4741 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml Test-TDD-05MHz-TM2 tasks +100000 111110 040101 030105 040301 040502 040606 040608 040646 040648 040401 040201 030201 +200000 @@ -41,7 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml 0 oai-enb - + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -E + Deploy_Object Deploy eNB (TDD/Band40/5MHz/B200) in a container 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 ada6945aad..fe47e7c958 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml Test-TDD-10MHz-TM1 tasks +100000 111110 040101 030114 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201 030201 +200000 @@ -41,7 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml 0 oai-enb - + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -E + Deploy_Object Deploy eNB (TDD/Band40/10MHz/B200) in a container 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 ec3de1a5ae..51c4f95137 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml Test-TDD-20MHz-TM1 tasks +100000 111110 040101 030124 040301 040521 040622 040621 040623 040662 040401 040201 030201 +200000 @@ -41,7 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml 0 oai-enb - + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -E + Deploy_Object Deploy eNB (TDD/Band40/20MHz/B200) in a container 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 b5ff90e112..57ebb79fac 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 @@ -27,11 +27,13 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml Test-TDD-20MHz-TM1-Default-Scheduler tasks +100000 111110 040101 030125 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201 030201 +200000 @@ -41,7 +43,18 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml 0 oai-enb - + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower + starsky + sudo cpupower idle-set -E + Deploy_Object Deploy eNB (TDD/Band40/20MHz/B200) in a container diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml index 3734c91229..397e6aadbd 100644 --- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml @@ -26,6 +26,9 @@ tasks 1 + 200000 + 100000 + 500000 111110 111111 000001 @@ -47,6 +50,8 @@ 000001 030202 030201 + 300000 + 600000 @@ -69,7 +74,36 @@ Initialize Quectel idefix - + + Custom_Command + To reset USRP + nepes + sudo -S b2xx_fx3_utils --reset-device + + + Custom_Command + To reset cpupower - nepes + nepes + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower - nepes + nepes + sudo cpupower idle-set -E + + + Custom_Command + To reset cpupower - obelix + obelix + sudo cpupower idle-set -D 0 + + + Custom_Command + To reset cpupower - obelix + obelix + sudo cpupower idle-set -E + Terminate_UE diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml index 53cfbf80cb..4f0e01c692 100644 --- a/ci-scripts/xml_files/container_sa_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml @@ -26,6 +26,7 @@ tasks 1 + 100000 111111 010002 030101 @@ -39,6 +40,7 @@ 010002 000001 030201 + 200000