Merge remote-tracking branch 'origin/develop' into bler_txoptim

# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c

ci-scripts/cls_containerize.py

@@ -342,6 +342,8 @@ class Containerize():
 		if self.ranAllowMerge and forceBaseImageBuild:
 			mySSH.command(self.cli + ' image rm ' + baseImage + ':' + baseTag + ' || true', '\$', 30)
 		mySSH.command(self.cli + ' image rm ran-build:' + imageTag + ' || true','\$', 5)
+		# Cleaning any created tmp volume
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
 		mySSH.close()
 		ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
 
@@ -595,6 +597,8 @@ class Containerize():
 			mySSH.command('docker rm -f ' + containerName, '\$', 30)
 		# Forcing the down now to remove the networks and any artifacts
 		mySSH.command('docker-compose --file ci-docker-compose.yml down', '\$', 5)
+		# Cleaning any created tmp volume
+		mySSH.command('docker volume prune --force || true', '\$', 20)
 
 		mySSH.close()
 
@@ -754,6 +758,11 @@ class Containerize():
 			logging.error('\u001B[1m Undeploying OAI Object(s) FAILED\u001B[0m')
 			return
 
+		# Cleaning any created tmp volume
+		cmd = 'docker volume prune --force || true'
+		logging.debug(cmd)
+		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
+
 		HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
 		logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m')
 

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)

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -37,8 +37,8 @@
  000001
  050000
  050001
- 070000
  070001
+ 070000
  050000
  050001
  010002
@@ -123,15 +123,15 @@
 		<iperf_args>-u -b 40M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
-		<iperf_packetloss_threshold>3</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+		<iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+		<iperf_bitrate_threshold>85</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
 	<testCase id="070001">
 		<class>Iperf</class>
-		<desc>iperf (UL/2Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 2M -t 60</iperf_args>
+		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 3M -t 60</iperf_args>
 		<direction>UL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>1</iperf_packetloss_threshold>

ci-scripts/xml_files/fr1_nsa_quectel.xml

@@ -34,9 +34,8 @@
  050000
  050001
  000001
- 070000
- 000001
- 070001
+ 070003
+ 070002
  000001
  050000
  050001
@@ -114,16 +113,38 @@
 
 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 60M -t 60</iperf_args>
+		<desc>iperf (DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 30M -t 30</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
-		<iperf_packetloss_threshold>3</iperf_packetloss_threshold>
+		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
 	<testCase id="070001">
+		<class>Iperf</class>
+		<desc>iperf (DL/40Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 40M -t 30</iperf_args>
+		<direction>DL</direction>
+		<id>idefix</id>
+		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="070002">
+		<class>Iperf</class>
+		<desc>iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 60M -t 60</iperf_args>
+		<direction>DL</direction>
+		<id>idefix</id>
+		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="070003">
 		<class>Iperf</class>
 		<desc>iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 3M -t 60</iperf_args>

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>

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>