From 017b362359c5435b54989100baf2330e4abd03ac Mon Sep 17 00:00:00 2001 From: hardy Date: Tue, 27 Jul 2021 11:53:09 +0200 Subject: [PATCH] added reboot control of Eth USRP --- ci-scripts/main.py | 1 + ci-scripts/ran.py | 12 ++++++++++++ ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml | 2 ++ 3 files changed, 15 insertions(+) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 0718ee6396..82fa4757d7 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -155,6 +155,7 @@ def GetParametersFromXML(action): RAN.eNB_Trace=test.findtext('eNB_Trace') RAN.Initialize_eNB_args=test.findtext('Initialize_eNB_args') eNB_instance=test.findtext('eNB_instance') + RAN.USRPIPAddress=test.findtext('USRP_IPAddress') if (eNB_instance is None): RAN.eNB_instance=0 else: diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py index 470572f2ff..258ec48c50 100644 --- a/ci-scripts/ran.py +++ b/ci-scripts/ran.py @@ -94,6 +94,7 @@ class RANManagement(): self.runtime_stats= '' self.datalog_rt_stats={} self.eNB_Trace = '' #if 'yes', Tshark will be launched at initialization + self.USRPIPAddress = '' @@ -341,6 +342,17 @@ class RANManagement(): self.testCase_id = HTML.testCase_id mySSH = SSH.SSHConnection() + #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) diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index da2f81c42e..a8e385b854 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -62,6 +62,7 @@ 0 lte yes + 192.168.18.241 @@ -72,6 +73,7 @@ 1 1 nr + 192.168.18.240