From 2ac6a30cffe8d71b534189af30ac57db54aea5b3 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 12 Jan 2022 11:27:50 +0100
Subject: [PATCH] fix(ci): forcing USRP N3xx reboot on caracal; creating a real
dummy scenario
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/ran.py | 2 +-
ci-scripts/xml_files/gnb_phytest_usrp_run.xml | 25 ++++++++++---------
ci-scripts/xml_files/simple_dummy_build.xml | 8 +++++-
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index f01b85015b1..4caa876719b 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -346,7 +346,7 @@ class RANManagement():
#reboot USRP if requested in xml
if self.USRPIPAddress!='':
- logging.debug('USRP '+ self.USRPIPAddress +'reboot request')
+ logging.debug('USRP '+ self.USRPIPAddress +': reboot request')
mySSH.open(lIpAddr, lUserName, lPassWord)
cmd2usrp='ssh root@'+self.USRPIPAddress+' reboot'
mySSH.command2(cmd2usrp,1)
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
index 9365d7f12ee..f1185c08c96 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
@@ -21,21 +21,22 @@
-->
<testCaseList>
- <htmlTabRef>gNB-PHY-Test</htmlTabRef>
- <htmlTabName>Run-gNB-PHY-Test</htmlTabName>
- <htmlTabIcon>tasks</htmlTabIcon>
+ <htmlTabRef>gNB-PHY-Test</htmlTabRef>
+ <htmlTabName>Run-gNB-PHY-Test</htmlTabName>
+ <htmlTabIcon>tasks</htmlTabIcon>
<repeatCount>3</repeatCount>
<TestCaseRequestedList>
090101 000001 090109
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
-
- <testCase id="090101">
- <class>Initialize_eNB</class>
- <desc>Initialize gNB USRP</desc>
+
+ <testCase id="090101">
+ <class>Initialize_eNB</class>
+ <desc>Initialize gNB USRP</desc>
<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test -q -U 787200 -T 106 -t 28 -D 130175 -m 28 -M 106 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
<air_interface>NR</air_interface>
- </testCase>
+ <USRP_IPAddress>192.168.30.2</USRP_IPAddress>
+ </testCase>
<testCase id="000001">
<class>IdleSleep</class>
@@ -44,10 +45,10 @@
</testCase>
- <testCase id="090109">
- <class>Terminate_eNB</class>
- <desc>Terminate gNB</desc>
+ <testCase id="090109">
+ <class>Terminate_eNB</class>
+ <desc>Terminate gNB</desc>
<air_interface>NR</air_interface>
- </testCase>
+ </testCase>
</testCaseList>
diff --git a/ci-scripts/xml_files/simple_dummy_build.xml b/ci-scripts/xml_files/simple_dummy_build.xml
index 75e5f6339a0..a3649c210c9 100644
--- a/ci-scripts/xml_files/simple_dummy_build.xml
+++ b/ci-scripts/xml_files/simple_dummy_build.xml
@@ -25,7 +25,7 @@
<htmlTabName>Build</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList>
- 010101
+ 000001
</TestCaseRequestedList>
<TestCaseExclusionList>
</TestCaseExclusionList>
@@ -38,4 +38,10 @@
<eNB_serverId>0</eNB_serverId>
</testCase>
+ <testCase id="000001">
+ <class>IdleSleep</class>
+ <desc>Sleep</desc>
+ <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+ </testCase>
+
</testCaseList>
--
GitLab