Merge branch 'integration_2026_w03' into 'develop'

Integration: `2026.w03`

* !3818 Update threadCreate
* !3845 Update physim timing thresholds in gNB-N300-Timing-Phytest-LDPC
* !3849 Make gpd config utility global
* !3812 Fix reestablishment after handover
* !3826 Define speed of light
* !3799 Fix for threadpool abort function
* !3791 fix array lenght errors, k variable wrapping threshold. Make the code smaller and more efficient
* !3718 Introduce SRS physical simulator and improvements
* !3857 Fix bug "no AMF for UE"
* !3858 remove function decode_cellGroupConfig
* !3668 Support beam index for LiteON FR2 RU that needs per symbol section in CP packets
* !3844 CI: Remove testcase ids from XML files
* !3620 update multi-RU 7.2 documentation for DAS scenario
* !3788 Fix handover documentation and configuration files for event configuration

See merge request oai/openairinterface5g!3854

CMakeLists.txt

@@ -2037,6 +2037,19 @@ target_link_libraries(nr_ulsim PRIVATE
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
+add_executable(nr_srssim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/srssim.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
+  )
+
+target_link_libraries(nr_srssim PRIVATE
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc L2_NR -lz -Wl,--end-group
+  m pthread ITTI dl nr_ue_phy_meas physim_common
+  )
+
 # these simulators do not compile:
 # dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
 foreach(myExe dlsim ulsim)
@@ -2085,7 +2098,7 @@ if (${T_TRACER})
         nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
         ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
         syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
-        nr_ulschsim ldpctest polartest smallblocktest
+        nr_ulschsim ldpctest polartest smallblocktest nr_srssim
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
         params_libconfig

ci-scripts/cls_ci_helper.py

@@ -24,15 +24,14 @@ from typing import NamedTuple
 import logging
 
 class TestCaseCtx(NamedTuple):
-    count: int
-    test_id: int
+    test_idx: int
     logPath: str
 
     def Default(logPath):
-        return TestCaseCtx(123, 112233, logPath)
+        return TestCaseCtx(112233, logPath)
     def baseFilename(self):
         # typically, the test ID is of form 001234 (6 digits)
-        return f"{self.logPath}/{self.count}-{self.test_id:06d}"
+        return f"{self.logPath}/{self.test_idx:06d}"
 
 def archiveArtifact(cmd, ctx, remote_path):
     base = os.path.basename(remote_path)

ci-scripts/cls_cluster.py

@@ -164,7 +164,6 @@ class Cluster:
 
 	def PullClusterImage(self, HTML, node, images, tag_prefix):
 		logging.debug(f'Pull OC image {images} to server {node}')
-		self.testCase_id = HTML.testCase_id
 		with cls_cmd.getConnection(node) as cmd:
 			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
 			if not succeeded:
@@ -211,8 +210,6 @@ class Cluster:
 		logging.debug(f'Building on cluster triggered from server: {node}')
 		self.cmd = cls_cmd.RemoteCmd(node)
 
-		self.testCase_id = HTML.testCase_id
-
 		# Workaround for some servers, we need to erase completely the workspace
 		self.cmd.cd(lSourcePath)
 		# to reduce the amount of data send to OpenShift, we
@@ -412,7 +409,7 @@ class Cluster:
 		# the groovy scripts expects all logs in
 		# <jenkins-workspace>/<pipeline>/ci-scripts, so copy it there
 		with cls_cmd.LocalCmd() as c:
-			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_id}/')
-			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_id}/')
+			c.run(f'mkdir -p {os.getcwd()}/test_log_{ctx.test_idx}/')
+			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_idx}/')
 
 		return status

ci-scripts/cls_native.py

@@ -34,9 +34,8 @@ DPDK_PATH = '/opt/dpdk-t2-22.11.0'
 
 class Native():
 
-	def Build(ctx, node, test_case, HTML, directory, options):
+	def Build(ctx, node, HTML, directory, options):
 		logging.debug(f'Building on server: {node}')
-		HTML.testCase_id = test_case
 
 		with cls_cmd.getConnection(node) as ssh:
 			base = f"{directory}/cmake_targets"

ci-scripts/cls_oai_html.py

@@ -67,7 +67,7 @@ class HTMLManagement():
 		self.htmlUEFailureMsg = ''
 
 		self.startTime = int(round(time.time() * 1000))
-		self.testCase_id = ''
+		self.testCaseIdx = ''
 		self.desc = ''
 
 #-----------------------------------------------------------
@@ -191,7 +191,7 @@ class HTMLManagement():
 			self.htmlFile.write('  <table class="table" border = "1">\n')
 			self.htmlFile.write('      <tr bgcolor = "#33CCFF" >\n')
 			self.htmlFile.write('        <th style="width:5%">Relative Time (s)</th>\n')
-			self.htmlFile.write('        <th style="width:5%">Test Id</th>\n')
+			self.htmlFile.write('        <th style="width:5%">Test Index</th>\n')
 			self.htmlFile.write('        <th>Test Desc</th>\n')
 			self.htmlFile.write('        <th>Test Options</th>\n')
 			self.htmlFile.write('        <th style="width:5%">Test Status</th>\n')
@@ -259,7 +259,7 @@ class HTMLManagement():
 		currentTime = int(round(time.time() * 1000)) - self.startTime
 		self.htmlFile.write('      <tr>\n')
 		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
+		self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCaseIdx  + '</td>\n')
 		self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 		self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 		if (str(status) == 'OK'):
@@ -374,7 +374,7 @@ class HTMLManagement():
 			addOrangeBK = False
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
-			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCase_id  + '</td>\n')
+			self.htmlFile.write('        <td bgcolor = "lightcyan" >' + self.testCaseIdx  + '</td>\n')
 			self.htmlFile.write('        <td>' + self.desc  + '</td>\n')
 			self.htmlFile.write('        <td>' + str(options)  + '</td>\n')
 			if (str(status) == 'OK'):

ci-scripts/cls_static_code_analysis.py

@@ -88,7 +88,6 @@ class StaticCodeAnalysis():
 			raise ValueError(f"{lSourcePath=} {node=}")
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
-		self.testCase_id = HTML.testCase_id
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
@@ -187,8 +186,6 @@ class StaticCodeAnalysis():
 			raise ValueError(f"{lSourcePath=} {node=}")
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
-		self.testCase_id = HTML.testCase_id
-
 		check_options = ''
 		if self.ranAllowMerge:
 			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'

ci-scripts/conf_files/neighbour-config-ho.conf

@@ -42,13 +42,13 @@ nr_measurement_configuration = {
   A2 = {
     enable = 1;
     threshold = 110;
-    timeToTrigger = 1;
+    time_to_trigger = 1;
   };
 
   A3 = ({
-    cell_id = -1; #Default
+    physCellId = -1; #Default
     offset = 10;
     hysteresis = 0;
-    timeToTrigger = 1
+    time_to_trigger = 1
   })
 };

ci-scripts/conf_files/neighbour-config.conf

@@ -57,19 +57,19 @@ nr_measurement_configuration = {
   A2 = {
     enable = 1;
     threshold = 60;
-    timeToTrigger = 1;
+    time_to_trigger = 1;
   };
 
   A3 = ({
     physCellId = -1; #Default
     offset = 10;
     hysteresis = 0;
-    timeToTrigger = 1
+    time_to_trigger = 1
   }, {
     physCellId = 2;
     offset = 5;
     hysteresis = 1;
-    timeToTrigger = 2
+    time_to_trigger = 2
   })
 };
 

ci-scripts/docker/Dockerfile.physim.ubuntu

@@ -44,4 +44,4 @@ RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
         -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
         .. && \
-    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim

ci-scripts/main.py

@@ -58,7 +58,7 @@ import re		# reg
 import time		# sleep
 import os
 import subprocess
-import xml.etree.ElementTree as ET
+import lxml.etree as ET
 import logging
 import signal
 import traceback
@@ -98,7 +98,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(ctx, node, HTML.testCase_id, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(ctx, node, HTML)
 		elif action == 'Build_Proxy':
@@ -306,9 +306,9 @@ def receive_signal(signum, frame):
         logging.warning("received signal again, exiting")
         sys.exit(1)
 
-def ShowTestID(ctx, desc):
+def ShowTestID(ctx, desc, file, line):
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
-    logging.info(f'\u001B[1m Test ID: {ctx.test_id} (#{ctx.count}) \u001B[0m')
+    logging.info(f'\u001B[1m Test #{ctx.test_idx} ({file}:{line})   \u001B[0m')
     logging.info(f'\u001B[1m {desc}                                 \u001B[0m')
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
 
@@ -455,46 +455,11 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	xmlTree = ET.parse(xml_test_file)
 	xmlRoot = xmlTree.getroot()
 
-	exclusion_tests=xmlRoot.findtext('TestCaseExclusionList',default='')
-	requested_tests=xmlRoot.findtext('TestCaseRequestedList',default='')
 	if (HTML.nbTestXMLfiles == 1):
 		HTML.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-0'))
 		HTML.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-0'))
 	all_tests=xmlRoot.findall('testCase')
 
-	exclusion_tests=exclusion_tests.split()
-	requested_tests=requested_tests.split()
-
-	#check that exclusion tests are well formatted
-	#(6 digits or less than 6 digits followed by +)
-	for test in exclusion_tests:
-		if     (not re.match('^[0-9]{6}$', test) and
-				not re.match('^[0-9]{1,5}\\+$', test)):
-			logging.error('exclusion test is invalidly formatted: ' + test)
-			sys.exit(1)
-		else:
-			logging.info(test)
-
-	#check that requested tests are well formatted
-	#(6 digits or less than 6 digits followed by +)
-	#be verbose
-	for test in requested_tests:
-		if     (re.match('^[0-9]{6}$', test) or
-				re.match('^[0-9]{1,5}\\+$', test)):
-			logging.info('test group/case requested: ' + test)
-		else:
-			logging.error('requested test is invalidly formatted: ' + test)
-			sys.exit(1)
-
-	#get the list of tests to be done
-	todo_tests=[]
-	for test in requested_tests:
-		if    (test_in_list(test, exclusion_tests)):
-			logging.info('test will be skipped: ' + test)
-		else:
-			#logging.info('test will be run: ' + test)
-			todo_tests.append(test)
-
 	signal.signal(signal.SIGINT, receive_signal)
 
 	HTML.CreateHtmlTabHeader()
@@ -502,46 +467,42 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	task_set_succeeded = True
 	HTML.startTime=int(round(time.time() * 1000))
 
-	i = 0
-	for test_case_id in todo_tests:
-		for test in all_tests:
+	for index, test in enumerate(all_tests, start=1):
 		if test_runner_abort:
 			task_set_succeeded = False
-			id = test.get('id')
-			if test_case_id != id:
-				continue
-			i += 1
-			CiTestObj.testCase_id = id
-			ctx = TestCaseCtx(i, int(id), logPath)
-			HTML.testCase_id=CiTestObj.testCase_id
+		test_case_idx = f"{index:06d}"
+		ctx = TestCaseCtx(int(test_case_idx), logPath)
+		HTML.testCaseIdx = test_case_idx
 		desc = test.findtext('desc')
 		node = test.findtext('node') if not force_local else 'localhost'
 		always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
 		may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
 		HTML.desc = desc
 		action = test.findtext('class')
-			if (CheckClassValidity(xml_class_list, action, id) == False):
+		if not CheckClassValidity(xml_class_list, action, test_case_idx):
 			task_set_succeeded = False
 			continue
-			ShowTestID(ctx, desc)
+		file = os.path.basename(xml_test_file)
+		line = test.find('class').sourceline
+		ShowTestID(ctx, desc, file, line)
 		if not task_set_succeeded and not always_exec:
 			msg = f"skipping test due to prior error"
 			logging.warning(msg)
 			HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
-				break
+			continue
 		try:
 			test_succeeded = ExecuteActionWithParam(action, ctx, node)
 			if not test_succeeded and may_fail:
-					logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
+				logging.warning(f"test ID {test_case_idx} action {action} may or may not fail, proceeding despite error")
 			elif not test_succeeded:
-					logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests")
+				logging.error(f"test ID {test_case_idx} action {action} failed ({test_succeeded}), skipping next tests")
 				task_set_succeeded = False
 		except Exception as e:
 			s = traceback.format_exc()
 			logging.error(f'while running CI, an exception occurred:\n{s}')
 			HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
 			task_set_succeeded = False
-				break
+			continue
 
 	if not task_set_succeeded:
 		logging.error('\u001B[1;37;41mScenario failed\u001B[0m')

ci-scripts/ran.py

@@ -67,7 +67,6 @@ class RANManagement():
 		self.eNBOptions = ['', '', '']
 		self.eNBmbmsEnables = [False, False, False]
 		self.eNBstatuses = [-1, -1, -1]
-		self.testCase_id = ''
 		self.runtime_stats= ''
 		self.datalog_rt_stats={}
 		self.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -88,7 +87,6 @@ class RANManagement():
 			raise ValueError(f"{node=}")
 		logging.debug('Starting eNB/gNB on server: ' + node)
 
-		self.testCase_id = HTML.testCase_id
 		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
 		

ci-scripts/tests/build.py

@@ -17,7 +17,7 @@ import cls_cmd
 class TestBuild(unittest.TestCase):
 	def setUp(self):
 		self.html = cls_oai_html.HTMLManagement()
-		self.html.testCase_id = "000000"
+		self.html.testCaseIdx = "000000"
 		self.cont = cls_containerize.Containerize()
 		self._d = tempfile.mkdtemp()
 		logging.warning(f"temporary directory: {self._d}")

ci-scripts/tests/test-runner/test.xml

@@ -25,24 +25,14 @@
   <htmlTabRef>test</htmlTabRef>
   <htmlTabName>Manual testing</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 000001
- 000011
- 000012
- 000002
- 000003
- 000004
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="000001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>This should succeed</desc>
     <node>localhost</node>
     <command>true</command>
   </testCase>
 
-        <testCase id="000011">
+  <testCase>
     <class>Custom_Command</class>
     <desc>This may fail</desc>
     <may_fail>true</may_fail>
@@ -50,32 +40,33 @@
     <command>false</command>
   </testCase>
 
-        <testCase id="000012">
+  <testCase>
     <class>Custom_Command</class>
     <desc>This is still executed</desc>
     <node>localhost</node>
     <command>true</command>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>This should fail</desc>
     <node>localhost</node>
     <command>false</command>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Custom_Command</class>
     <desc>This should be skipped</desc>
     <node>localhost</node>
     <command>true</command>
   </testCase>
 
-        <testCase id="000004">
+  <testCase>
     <class>Custom_Command</class>
     <desc>This should be executed because marked so</desc>
     <always_exec>true</always_exec>
     <node>localhost</node>
     <command>true</command>
   </testCase>
+
 </testCaseList>

ci-scripts/xml_files/cluster_image_build.xml

@@ -24,17 +24,14 @@
   <htmlTabRef>build-tab</htmlTabRef>
   <htmlTabName>Build Images on Cluster</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-	000002
-	000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-	<testCase id="000002">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>poseidon</node>
   </testCase>
-	<testCase id="000001">
+
+  <testCase>
     <class>Build_Cluster_Image</class>
     <desc>Build Images on OpenShift Cluster</desc>
     <node>poseidon</node>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -24,35 +24,21 @@
   <htmlTabRef>l2sim-4glte-tdd</htmlTabRef>
   <htmlTabName>Testing 4G LTE L2 sim - FDD eNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000000
- 000001
- 000002
- 000003
- 000004
- 020001
- 020002
- 030011
- 030012
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb oai-lte-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000000">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Cassandra Database</desc>
     <node>localhost</node>
@@ -60,7 +46,7 @@
     <services>cassandra db_init</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G CoreNetwork</desc>
     <node>localhost</node>
@@ -68,7 +54,7 @@
     <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB L2 sim</desc>
     <node>localhost</node>
@@ -76,7 +62,7 @@
     <services>oai_enb</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI L2 sim 4G LTE-UE 1 and Proxy</desc>
     <node>localhost</node>
@@ -84,14 +70,14 @@
     <services>proxy oai_ue1</services>
   </testCase>
 
-        <testCase id="000004">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE</desc>
     <id>l2sim4g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping trf-gen from LTE-UE 1</desc>
     <id>l2sim4g_ue</id>
@@ -102,7 +88,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping LTE-UE 1 from trf-gen</desc>
     <id>l2sim4g_ext_dn</id>
@@ -113,7 +99,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP Downlink</desc>
     <id>l2sim4g_ue</id>
@@ -125,7 +111,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP Uplink</desc>
     <id>l2sim4g_ue</id>
@@ -137,7 +123,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <node>localhost</node>
@@ -145,7 +131,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -24,38 +24,21 @@
   <htmlTabRef>rfsim-4glte-fdd05mhz</htmlTabRef>
   <htmlTabName>Monolithic eNB - FDD 05MHz</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000015
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="111111">
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb-asan oai-lte-ue-asan</images>
   </testCase>
 
-        <testCase id="000011">
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Cassandra Database</desc>
     <node>localhost</node>
@@ -63,19 +46,13 @@
     <services>cassandra db_init</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G CoreNetwork</desc>
     <node>localhost</node>
@@ -83,7 +60,13 @@
     <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
     <node>localhost</node>
@@ -91,7 +74,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
     <node>localhost</node>
@@ -99,14 +88,14 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="000015">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim4g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping Traffic-Gen from LTE-UE</desc>
     <id>rfsim4g_ue</id>
@@ -117,7 +106,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping LTE-UE from Traffic-Gen</desc>
     <id>rfsim4g_ext_dn</id>
@@ -128,19 +117,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <node>localhost</node>
-                <svr_node>localhost</svr_node>
-        </testCase>
-
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP UL</desc>
     <id>rfsim4g_ue</id>
@@ -152,7 +129,19 @@
     <svr_node>localhost</svr_node>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf UDP DL</desc>
+    <id>rfsim4g_ue</id>
+    <svr_id>rfsim4g_ext_dn</svr_id>
+    <iperf_args>-u -t 30 -b 2M -R</iperf_args>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <node>localhost</node>
+    <svr_node>localhost</svr_node>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -160,7 +149,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -24,46 +24,21 @@
   <htmlTabRef>rfsim-4glte-fdd05mhz-noS1</htmlTabRef>
   <htmlTabName>Monolithic eNB - FDD 05MHz - noS1</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
-800813
- 000013
- 000002
- 000014
- 000001
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb-asan oai-lte-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000013">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
     <node>localhost</node>
@@ -71,7 +46,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
     <node>localhost</node>
@@ -79,7 +60,13 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping Traffic-Gen from LTE-UE</desc>
     <id>rfsim4g_ue</id>
@@ -90,7 +77,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping LTE-UE from eNB</desc>
     <id>rfsim4g_enb_nos1</id>
@@ -101,7 +88,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP DL</desc>
     <id>rfsim4g_ue</id>
@@ -113,7 +100,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP UL</desc>
     <id>rfsim4g_ue</id>
@@ -125,7 +112,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -133,7 +120,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -24,38 +24,21 @@
   <htmlTabRef>rfsim-4glte-fdd10mhz</htmlTabRef>
   <htmlTabName>Monolithic eNB - FDD 10MHz</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000015
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb-asan oai-lte-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000011">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Cassandra Database</desc>
     <node>localhost</node>
@@ -63,19 +46,13 @@
     <services>cassandra db_init</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G CoreNetwork</desc>
     <node>localhost</node>
@@ -83,7 +60,13 @@
     <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (FDD 10MHz)</desc>
     <node>localhost</node>
@@ -91,7 +74,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (FDD 10MHz)</desc>
     <node>localhost</node>
@@ -99,14 +88,14 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="000015">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim4g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping Traffic-Gen from LTE-UE</desc>
     <id>rfsim4g_ue</id>
@@ -117,7 +106,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping LTE-UE from Traffic-Gen</desc>
     <id>rfsim4g_ext_dn</id>
@@ -128,7 +117,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP DL</desc>
     <id>rfsim4g_ue</id>
@@ -140,7 +129,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP UL</desc>
     <id>rfsim4g_ue</id>
@@ -152,7 +141,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -160,7 +149,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -24,38 +24,21 @@
   <htmlTabRef>rfsim-4glte-fdd20mhz</htmlTabRef>
   <htmlTabName>Monolithic eNB - FDD 20MHz</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000015
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb-asan oai-lte-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000011">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Cassandra Database</desc>
     <node>localhost</node>
@@ -63,19 +46,13 @@
     <services>cassandra db_init</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G CoreNetwork</desc>
     <node>localhost</node>
@@ -83,7 +60,13 @@
     <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (FDD 20MHz)</desc>
     <node>localhost</node>
@@ -91,7 +74,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (FDD 20MHz)</desc>
     <node>localhost</node>
@@ -99,14 +88,14 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="000015">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim4g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping Traffic-Gen from LTE-UE</desc>
     <id>rfsim4g_ue</id>
@@ -117,7 +106,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping LTE-UE from Traffic-Gen</desc>
     <id>rfsim4g_ext_dn</id>
@@ -128,7 +117,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP DL</desc>
     <id>rfsim4g_ue</id>
@@ -140,7 +129,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP UL</desc>
     <id>rfsim4g_ue</id>
@@ -152,7 +141,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -160,7 +149,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -24,43 +24,21 @@
   <htmlTabRef>rfsim-4glte-fembms</htmlTabRef>
   <htmlTabName>Monolithic eNB - FeMBMS</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000013
- 000002
- 000014
- 000001
- 030011
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb-asan oai-lte-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000013">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (FeMBMS)</desc>
     <node>localhost</node>
@@ -68,7 +46,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (FeMBMS)</desc>
     <node>localhost</node>
@@ -76,7 +60,13 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Iperf2_Unidir</class>
     <desc>Iperf2 UDP DL</desc>
     <id>rfsim4g_ue_fembms</id>
@@ -88,7 +78,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -96,7 +86,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -24,43 +24,21 @@
   <htmlTabRef>rfsim-4glte-mbms</htmlTabRef>
   <htmlTabName>Monolithic eNB - MBMS</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000013
- 000002
- 000014
- 000001
- 030011
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb-asan oai-lte-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
-        </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000013">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (MBMS)</desc>
     <node>localhost</node>
@@ -68,7 +46,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (MBMS)</desc>
     <node>localhost</node>
@@ -76,7 +60,13 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP DL</desc>
     <id>rfsim4g_ue</id>
@@ -88,7 +78,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -96,7 +86,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -24,38 +24,21 @@
   <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
   <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000001
- 000012
- 000002
- 000013
- 000001
- 000014
- 000002
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-enb oai-lte-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000011">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Cassandra Database</desc>
     <node>localhost</node>
@@ -63,19 +46,13 @@
     <services>cassandra db_init</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="000002">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G CoreNetwork</desc>
     <node>localhost</node>
@@ -83,7 +60,13 @@
     <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G eNB RF sim (TDD 05MHz)</desc>
     <node>localhost</node>
@@ -91,7 +74,13 @@
     <services>oai_enb0</services>
   </testCase>
 
-        <testCase id="000014">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 4G LTE-UE RF sim (TDD 05MHz)</desc>
     <node>localhost</node>
@@ -99,7 +88,13 @@
     <services>oai_ue0</services>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping Traffic-Gen from LTE-UE</desc>
     <id>rfsim4g_ue</id>
@@ -110,7 +105,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping LTE-UE from Traffic-Gen</desc>
     <id>rfsim4g_ext_dn</id>
@@ -121,7 +116,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP DL</desc>
     <id>rfsim4g_ue</id>
@@ -133,7 +128,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf UDP UL</desc>
     <id>rfsim4g_ue</id>
@@ -145,7 +140,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 4G stack</desc>
@@ -153,7 +148,7 @@
     <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -24,31 +24,21 @@
   <htmlTabRef>rfsim-5gnr-e1</htmlTabRef>
   <htmlTabName>CUCP-CUUP-DU E1+F1 split</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000021
- 000022
- 000023
- 000024
- 020021
- 100021
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000021">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -56,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf</services>
   </testCase>
 
-        <testCase id="000022">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
     <node>localhost</node>
@@ -64,7 +54,7 @@
     <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
   </testCase>
 
-        <testCase id="000023">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
     <node>localhost</node>
@@ -72,14 +62,14 @@
     <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
   </testCase>
 
-        <testCase id="000024">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020021">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from all NR-UEs</desc>
     <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
@@ -90,7 +80,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="100021">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <node>localhost</node>
@@ -100,7 +90,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -24,58 +24,21 @@
   <htmlTabRef>rfsim-5gnr-f1</htmlTabRef>
   <htmlTabName>CU-DU F1 split</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000021
- 000022
- 000023
- 020021
- 030020
- 030021
- 030022
- 040001
- 020022
- 040002
- 030021
- 030022
- 040021
- 000030
- 040022
- 040023
- 020022
- 040024
- 000024
- 000030
- 040025
- 000031
- 030021
- 040027
- 040025
- 000031
- 020022
- 040026
- 040025
- 000031
- 020022
- 040027
- 100021
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000021">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -83,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000022">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CU + DU-PCI0 + UE RF sim SA</desc>
     <node>localhost</node>
@@ -91,34 +54,14 @@
     <services>oai-cu oai-du-pci0 oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000030">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000031">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="000023">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000024">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G (target) DU-PCI1 RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-du-pci1</services>
-        </testCase>
-
-        <testCase id="020021">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from all NR-UEs</desc>
     <id>rfsim5g_ue</id>
@@ -129,14 +72,14 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030020">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Simulate a DL radio channel with noise (3 dB)</desc>
     <node>localhost</node>
     <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
   </testCase>
 
-        <testCase id="030021">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -148,7 +91,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030022">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20</iperf_args>
@@ -160,14 +103,14 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="040001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>localhost</node>
     <command>echo ci force_reestab | ncat 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
   </testCase>
 
-        <testCase id="020022">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -178,63 +121,191 @@
     <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="040002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>localhost</node>
     <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
   </testCase>
 
-        <testCase id="040021">
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
     <node>localhost</node>
     <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
   </testCase>
 
-        <testCase id="040022">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Get UE sync state (UE ID 0)</desc>
     <node>localhost</node>
     <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
   </testCase>
 
-        <testCase id="040023">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
     <node>localhost</node>
     <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
   </testCase>
 
-        <testCase id="040024">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Get UE sync state (UE ID 0)</desc>
     <node>localhost</node>
     <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
   </testCase>
 
-        <testCase id="040025">
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G (target) DU-PCI1 RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+    <services>oai-du-pci1</services>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Handover</desc>
     <node>localhost</node>
     <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
   </testCase>
 
-        <testCase id="040026">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="040027">
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
-        <testCase id="100021">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 0?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -244,7 +315,7 @@
     <u_retx_th>30,100,100,100</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -24,33 +24,21 @@
   <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
   <htmlTabName>Monolithic FDD gNB with SDAP</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000012
- 000013
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb oai-nr-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000011">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -58,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
     <node>localhost</node>
@@ -66,14 +54,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -84,7 +72,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -95,7 +83,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 3M -t 30 -R</iperf_args>
@@ -107,7 +95,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 3M -t 30</iperf_args>
@@ -119,7 +107,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -129,7 +117,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -24,75 +24,29 @@
   <htmlTabRef>rfsim-5gnr-flexric</htmlTabRef>
   <htmlTabName>Monolithic SA TDD gNB and FlexRic Integration</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>1</repeatCount>
-        <TestCaseRequestedList>
- 111110
- 111111
- 111112
- 000001
- 000002
- 000003
- 010000
- 000004
- 333333
- 010001
- 010002
- 010003
- 020005
- 002006
- 444444
- 100002
- 100003
- 100004
- 100005
- 100006
- 100007
- 100008
- 100009
- 100001
- 222221
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111110">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb oai-nr-ue</images>
   </testCase>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-flexric</images>
   </testCase>
 
-        <testCase id="222221">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb oai-nr-ue</images>
-                <always_exec>true</always_exec>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-flexric</images>
-                <always_exec>true</always_exec>
-        </testCase>
-
-        <testCase id="111112">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Updating CN5G images</desc>
     <node>localhost</node>
     <command>docker compose -f ../doc/tutorial_resources/oai-cn5g/docker-compose.yaml pull</command>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -100,7 +54,7 @@
     <services>mysql oai-nrf oai-udr oai-udm oai-ausf oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI nearRT-RIC</desc>
     <node>localhost</node>
@@ -108,7 +62,7 @@
     <services>nearRT-RIC</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB in RF sim SA</desc>
     <node>localhost</node>
@@ -116,7 +70,15 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="000004">
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy RC monitoring</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-rc-moni</services>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy 2 OAI 5G NR-UEs in RF sim SA</desc>
     <node>localhost</node>
@@ -124,7 +86,38 @@
     <services>oai-nr-ue oai-nr-ue2</services>
   </testCase>
 
-        <testCase id="020005">
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>carabe</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy KPM monitoring</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-kpm-moni</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy KPM monitoring and RC control</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-kpm-rc</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy custom SMs monitoring</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+    <services>xapp-gtp-mac-rlc-pdcp-moni</services>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from both UEs</desc>
     <id>rfsim5g_ue rfsim5g_ue2</id>
@@ -135,29 +128,14 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="333333">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
-        </testCase>
-
-        <testCase id="444444">
+  <testCase>
     <class>Detach_UE</class>
     <desc>Detach OAI UE 1 and 2</desc>
     <id>rfsim5g_ue rfsim5g_ue2</id>
     <node>carabe</node>
   </testCase>
 
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy Core Network</desc>
-                <node>localhost</node>
-                <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
-                <always_exec>true</always_exec>
-        </testCase>
-
-        <testCase id="100002">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop RC monitoring xApp</desc>
     <node>localhost</node>
@@ -165,7 +143,7 @@
     <services>xapp-rc-moni</services>
   </testCase>
 
-        <testCase id="100003">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop KPM monitoring xApp</desc>
     <node>localhost</node>
@@ -173,7 +151,7 @@
     <services>xapp-kpm-moni</services>
   </testCase>
 
-        <testCase id="100004">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop KPM monitoring and RC control xApp</desc>
     <node>localhost</node>
@@ -181,7 +159,7 @@
     <services>xapp-kpm-rc</services>
   </testCase>
 
-        <testCase id="100005">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop custom SMs monitoring xApp</desc>
     <node>localhost</node>
@@ -189,7 +167,7 @@
     <services>xapp-gtp-mac-rlc-pdcp-moni</services>
   </testCase>
 
-        <testCase id="100006">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop OAI UEs</desc>
     <node>localhost</node>
@@ -197,7 +175,7 @@
     <services>oai-nr-ue oai-nr-ue2</services>
   </testCase>
 
-        <testCase id="100007">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop OAI gNB</desc>
     <node>localhost</node>
@@ -205,7 +183,7 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="100008">
+  <testCase>
     <class>Stop_Object</class>
     <desc>Stop nearRT-RIC</desc>
     <node>localhost</node>
@@ -213,7 +191,7 @@
     <services>nearRT-RIC</services>
   </testCase>
 
-        <testCase id="100009">
+  <testCase>
     <class>Undeploy_Object</class>
     <desc>Undeploy RAN and FlexRIC</desc>
     <node>localhost</node>
@@ -221,36 +199,28 @@
     <always_exec>true</always_exec>
   </testCase>
 
-        <testCase id="010000">
-                <class>Deploy_Object</class>
-                <desc>Deploy RC monitoring</desc>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <desc>Undeploy Core Network</desc>
     <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
+    <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
+    <always_exec>true</always_exec>
   </testCase>
 
-        <testCase id="010001">
-                <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring</desc>
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
     <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
+    <images>oai-gnb oai-nr-ue</images>
+    <always_exec>true</always_exec>
   </testCase>
 
-        <testCase id="010002">
-                <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring and RC control</desc>
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
     <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-        </testCase>
-
-        <testCase id="010003">
-                <class>Deploy_Object</class>
-                <desc>Deploy custom SMs monitoring</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
+    <images>oai-flexric</images>
+    <always_exec>true</always_exec>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -24,48 +24,21 @@
   <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 000004
- 000005
- 000006
- 000007
- 000008
- 020001
- 020002
- 020003
- 020004
- 020105
- 444445
- 030001
- 030002
- 444444
- 333333
- 020005
- 444444
- 333333
- 020005
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -73,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB RF sim SA</desc>
     <node>localhost</node>
@@ -81,7 +54,7 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
     <node>localhost</node>
@@ -89,7 +62,7 @@
     <services>oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000004">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
     <node>localhost</node>
@@ -97,7 +70,7 @@
     <services>oai-nr-ue2</services>
   </testCase>
 
-        <testCase id="000005">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
     <node>localhost</node>
@@ -105,7 +78,7 @@
     <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
   </testCase>
 
-        <testCase id="000006">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
     <node>localhost</node>
@@ -113,7 +86,7 @@
     <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
   </testCase>
 
-        <testCase id="000007">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
     <node>localhost</node>
@@ -121,14 +94,14 @@
     <services>oai-nr-ue9 oai-nr-ue10</services>
   </testCase>
 
-        <testCase id="000008">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -139,7 +112,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -150,7 +123,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020003">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from Second NR-UE</desc>
     <id>rfsim5g_ue2</id>
@@ -161,7 +134,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020004">
+  <testCase>
     <class>Ping</class>
     <desc>Ping Second NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -172,18 +145,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020105">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from all UEs</desc>
     <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
@@ -194,7 +156,14 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030001">
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UE 3 to 10</desc>
+    <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -206,7 +175,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030002">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 1M -t 20</iperf_args>
@@ -218,28 +187,57 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="333333">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE 1 and 2</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
-        </testCase>
-
-        <testCase id="444444">
+  <testCase>
     <class>Detach_UE</class>
     <desc>Detach OAI UE 1 and 2</desc>
     <id>rfsim5g_ue rfsim5g_ue2</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="444445">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 3 to 10</desc>
-                <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from both UEs</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <desc>Detach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE 1 and 2</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from both UEs</desc>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -249,7 +247,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -24,51 +24,21 @@
   <htmlTabRef>rfsim-24prb-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic SA TDD gNB 24PRB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 030001
- 030002
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040002
- 000004
- 020001
- 040001
- 000004
- 020001
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -76,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
     <node>localhost</node>
@@ -84,31 +54,25 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000004">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
     <svr_id>rfsim5g_ext_dn</svr_id>
     <svr_node>localhost</svr_node>
-                <ping_args> -c 20 -i0.5</ping_args>
+    <ping_args>-c 20 -i0.5</ping_args>
     <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -119,7 +83,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030001">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -131,7 +95,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030002">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 1M -t 20</iperf_args>
@@ -143,21 +107,151 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="040001">
-                <class>Custom_Command</class>
-                <desc>Force Msg3 C-RNTI RA</desc>
-                <node>localhost</node>
-                <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
-        </testCase>
-
-        <testCase id="040002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Force RRC_IDLE (UE ID 0)</desc>
     <node>localhost</node>
     <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force RRC_IDLE (UE ID 0)</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Force Msg3 C-RNTI RA</desc>
+    <node>localhost</node>
+    <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i0.5</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -165,7 +259,7 @@
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -24,33 +24,21 @@
   <htmlTabRef>rfsim-5gnr-tdd-2x2</htmlTabRef>
   <htmlTabName>Monolithic SA TDD 2x2 gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 030001
- 030002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -58,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
     <node>localhost</node>
@@ -66,14 +54,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -84,7 +72,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -95,7 +83,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030001">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 10M -t 20 -R</iperf_args>
@@ -107,7 +95,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030002">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20</iperf_args>
@@ -119,7 +107,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -129,7 +117,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -24,40 +24,28 @@
   <htmlTabRef>rfsim-5gnr-fdd-phytest</htmlTabRef>
   <htmlTabName>Monolithic FDD phytest gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 004000
- 000010
- 000011
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="004000">
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Clean-Up any residual volume</desc>
     <node>localhost</node>
     <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
   </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000010">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB RF sim SA</desc>
     <node>localhost</node>
@@ -65,7 +53,7 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="000011">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
     <node>localhost</node>
@@ -73,7 +61,7 @@
     <services>oai-nr-ue</services>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping gNB from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -84,7 +72,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from gNB</desc>
     <id>rfsim5g_gnb_nos1</id>
@@ -95,7 +83,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
@@ -107,7 +95,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
@@ -119,17 +107,17 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
     <node>localhost</node>
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
-                <d_retx_th>10,100,100,100</d_retx_th> <!-- phytest: will fail at start! -->
-                <u_retx_th>10,100,100,100</u_retx_th> <!-- phytest: will fail at start! -->
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -24,33 +24,21 @@
   <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic FR2 gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000000
- 000001
- 000013
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000000">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI gNB</desc>
     <node>localhost</node>
@@ -58,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI NR-UE</desc>
     <node>localhost</node>
@@ -66,14 +54,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -84,7 +72,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -95,7 +83,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -105,7 +93,7 @@
     <u_retx_th>10,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_multiue.xml

@@ -24,39 +24,21 @@
   <htmlTabRef>rfsim-5gnr-tdd-multiue</htmlTabRef>
   <htmlTabName>Monolithic SA TDD gNB multiue</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 000008
- 020001
- 020002
- 020003
- 020004
- 020105
- 444445
- 030001
- 030002
- 444444
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -64,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB RF sim SA</desc>
     <node>localhost</node>
@@ -72,7 +54,7 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
     <node>localhost</node>
@@ -80,14 +62,14 @@
     <services>oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000008">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_multiue1</id>
@@ -98,7 +80,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -109,7 +91,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020003">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from Second NR-UE</desc>
     <id>rfsim5g_multiue2</id>
@@ -120,7 +102,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020004">
+  <testCase>
     <class>Ping</class>
     <desc>Ping Second NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -131,18 +113,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2</id>
-                <node>localhost</node>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020105">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from all UEs</desc>
     <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
@@ -153,7 +124,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030001">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -165,7 +136,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030002">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 1M -t 20</iperf_args>
@@ -177,14 +148,14 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="444444">
+  <testCase>
     <class>Detach_UE</class>
     <desc>Detach OAI UEs</desc>
     <id>rfsim5g_multiue1</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -194,7 +165,7 @@
     <node>localhost</node>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -24,48 +24,21 @@
   <htmlTabRef>rfsim-5gnr-f1-n2-ho</htmlTabRef>
   <htmlTabName>F1 SA TDD N2 Handover</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 000004
- 040001
- 050001
- 020001
- 020002
- 050002
- 030001
- 030002
- 050003
- 020001
- 020002
- 050004
- 050001
- 020001
- 020002
- 050002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -73,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
     <node>localhost</node>
@@ -81,22 +54,14 @@
     <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000004">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
-        </testCase>
-
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -107,7 +72,40 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+    <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger N2 Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -118,7 +116,14 @@
     <ping_packetloss_threshold>10</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030001">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -130,7 +135,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030002">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 1M -t 20</iperf_args>
@@ -142,28 +147,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="040001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="050001">
-                <class>Custom_Command</class>
-                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
-                <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
-        <testCase id="050002">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
-        </testCase>
-
-        <testCase id="050003">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger N2 Handover</desc>
     <node>localhost</node>
@@ -171,14 +155,73 @@
     <command_fail>yes</command_fail>
   </testCase>
 
-        <testCase id="050004">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>10</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger N2 Handover</desc>
+    <node>localhost</node>
+    <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 50 -i 0.25</ping_args>
+    <ping_packetloss_threshold>10</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>UE (1) connected to DU-PCI 1?</desc>
+    <node>localhost</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -188,7 +231,7 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -24,37 +24,21 @@
   <htmlTabRef>rfsim-5gnr-ntn-geo</htmlTabRef>
   <htmlTabName>Monolithic SA NTN GEO gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 040001
- 020022
- 040002
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -62,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
     <node>localhost</node>
@@ -70,14 +54,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -88,7 +72,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -99,7 +83,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="040001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>localhost</node>
@@ -107,7 +91,7 @@
     <command_fail>yes</command_fail>
   </testCase>
 
-        <testCase id="020022">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -118,7 +102,7 @@
     <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="040002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>localhost</node>
@@ -126,7 +110,29 @@
     <command_fail>yes</command_fail>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -134,7 +140,7 @@
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -24,37 +24,21 @@
   <htmlTabRef>rfsim-5gnr-ntn-Leo</htmlTabRef>
   <htmlTabName>Monolithic SA NTN LEO gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 040001
- 020022
- 040002
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -62,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
     <node>localhost</node>
@@ -70,14 +54,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -88,7 +72,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -99,7 +83,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="040001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>localhost</node>
@@ -107,7 +91,7 @@
     <command_fail>yes</command_fail>
   </testCase>
 
-        <testCase id="020022">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -118,7 +102,7 @@
     <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="040002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>localhost</node>
@@ -126,7 +110,29 @@
     <command_fail>yes</command_fail>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -134,7 +140,7 @@
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_leo</yaml_path>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_prs.xml

@@ -24,32 +24,21 @@
   <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
   <htmlTabName>Monolithic gNB with PRS</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000012
- 000013
- 040001
- 040023
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
     <node>localhost</node>
@@ -57,20 +46,20 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="040001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
   </testCase>
 
-	<testCase id="040023">
+  <testCase>
     <class>Custom_Script</class>
     <always_exec>true</always_exec>
     <desc>Set and verify distance at 50, 100, 150 m</desc>
@@ -79,7 +68,7 @@
     <args>50 100 150</args>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -89,7 +78,7 @@
     <u_retx_th>30,100,100,100</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -24,32 +24,21 @@
   <htmlTabRef>rfsim-5gnr-sidelink</htmlTabRef>
   <htmlTabName>Sidelink test</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000002
- 000003
- 000004
- 000005
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G UE 1</desc>
     <node>localhost</node>
@@ -57,7 +46,7 @@
     <services>oai-nr-ue-1</services>
   </testCase>
 
-        <testCase id="000003"> 
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G UE 2</desc>
     <node>localhost</node>
@@ -65,20 +54,20 @@
     <services>oai-nr-ue-2</services>
   </testCase>
 
-        <testCase id="000004">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="000005">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Check that UE synched</desc>
     <node>localhost</node>
     <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -88,7 +77,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_simple.xml

@@ -24,18 +24,8 @@
   <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 000001
- 000002
- 000003
- 000008
- 020001
- 444444
- 100001
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="000001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -43,7 +33,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB RF sim SA</desc>
     <node>localhost</node>
@@ -51,7 +41,7 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
     <node>localhost</node>
@@ -59,14 +49,14 @@
     <services>oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000008">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -77,14 +67,14 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="444444">
+  <testCase>
     <class>Detach_UE</class>
     <desc>Detach OAI UE 1</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -24,40 +24,28 @@
   <htmlTabRef>rfsim-tdd-dora-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic do-ra TDD gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 004000
- 000000
- 000001
- 000030		
- 020001
- 020002
- 100001
- 004000
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
 
-        <testCase id="004000">
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Clean-Up any residual volume</desc>
     <node>localhost</node>
     <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
   </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000000">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI gNB</desc>
     <node>localhost</node>
@@ -65,7 +53,7 @@
     <services>oai-gnb</services>
   </testCase>
 
-        <testCase id="000001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI NR-UE</desc>
     <node>localhost</node>
@@ -73,13 +61,13 @@
     <services>oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000030">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping gNB from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -90,7 +78,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from gNB</desc>
     <id>rfsim5g_gnb_nos1</id>
@@ -101,7 +89,7 @@
     <ping_packetloss_threshold>0</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -111,7 +99,14 @@
     <u_retx_th>0,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Clean-Up any residual volume</desc>
+    <node>localhost</node>
+    <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -24,40 +24,21 @@
   <htmlTabRef>rfsim-5gnr-fdd-u0-25prb</htmlTabRef>
   <htmlTabName>VNF-PNF nFAPI FDD u0 25PRB gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 020002
- 000004
- 020003
- 030001
- 030002
- 050001
- 050002
- 050003
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb-asan oai-nr-ue-asan</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -65,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000002">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G VNF+PNF+nrUE RF sim SA</desc>
     <node>localhost</node>
@@ -73,14 +54,14 @@
     <services>oai-vnf oai-pnf oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -91,7 +72,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -102,14 +83,14 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="000004">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Verify 2nd PDU session is up</desc>
     <id>rfsim5g_ue_pdu_2</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020003">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
     <id>rfsim5g_ue_pdu_2</id>
@@ -120,7 +101,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030001">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -132,7 +113,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030002">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 1M -t 20</iperf_args>
@@ -144,28 +125,50 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="050001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger PDU Session Release via gNB telnet</desc>
     <node>acamas</node>
     <command>echo ci pdu_session_release 2 | ncat 192.168.71.140 9090</command>
   </testCase>
 
-        <testCase id="050002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Add PDU Session via UE telnet</desc>
     <node>acamas</node>
     <command>echo ci add_pdu_session 6,7 | ncat 192.168.71.150 8091</command>
   </testCase>
 
-        <testCase id="050003">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger PDU Session Release via gNB telnet</desc>
     <node>acamas</node>
     <command>echo ci pdu_session_release 6 | ncat 192.168.71.140 9090</command>
   </testCase>
 
-        <testCase id="100001">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -175,7 +178,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_vrtsim_chanmod.xml

@@ -24,33 +24,21 @@
   <htmlTabRef>vrtsim-5gnr-chanmod</htmlTabRef>
   <htmlTabName>Monolithic gNB vrtsim + chanmod</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000012
- 000013
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb oai-nr-ue</images>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000011">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -58,7 +46,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
     <node>localhost</node>
@@ -66,14 +54,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -84,7 +72,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -95,7 +83,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 3M -t 20 -R</iperf_args>
@@ -107,7 +95,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
     <iperf_args>-u -b 1M -t 20</iperf_args>
@@ -119,7 +107,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -129,7 +117,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_vrtsim_chanmod_gh.xml

@@ -24,34 +24,22 @@
   <htmlTabRef>vrtsim-5gnr-chanmod-gh</htmlTabRef>
   <htmlTabName>Monolithic gNB vrtsim + chanmod</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000011
- 000012
- 000013
- 020011
- 020012
- 030011
- 030012
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>localhost</node>
     <images>oai-gnb oai-nr-ue</images>
     <tag_prefix>arm_</tag_prefix>
   </testCase>
-        <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>localhost</node>
   </testCase>
-        <testCase id="000011">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
@@ -59,7 +47,7 @@
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
-        <testCase id="000012">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
     <node>localhost</node>
@@ -67,14 +55,14 @@
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
-        <testCase id="000013">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAI UE (Wait for IP)</desc>
     <id>rfsim5g_ue</id>
     <node>localhost</node>
   </testCase>
 
-        <testCase id="020011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping ext-dn from NR-UE</desc>
     <id>rfsim5g_ue</id>
@@ -85,7 +73,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="020012">
+  <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>
     <id>rfsim5g_ext_dn</id>
@@ -96,7 +84,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="030011">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 3M -t 30 -R</iperf_args>
@@ -108,7 +96,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="030012">
+  <testCase>
     <class>Iperf</class>
     <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 1M -t 30</iperf_args>
@@ -120,7 +108,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="100011">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
@@ -130,7 +118,7 @@
     <u_retx_th>1,0,0,0</u_retx_th>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_build_run_tests.xml

@@ -24,12 +24,8 @@
   <htmlTabRef>build-run-test-tab</htmlTabRef>
   <htmlTabName>Build and Run Unit Tests</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="030201">
+  <testCase>
     <class>Build_Run_Tests</class>
     <desc>Build and Run UnitTests</desc>
     <node>obelix</node>

ci-scripts/xml_files/container_image_build.xml

@@ -24,26 +24,21 @@
   <htmlTabRef>build-tab</htmlTabRef>
   <htmlTabName>Build Container Images</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 800813
- 000001
- 000010
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>obelix</node>
   </testCase>
-	<testCase id="000001">
+
+  <testCase>
     <class>Build_Image</class>
     <desc>Build all Images</desc>
     <node>obelix</node>
     <kind>all</kind>
   </testCase>
 
-	<testCase id="000010">
+  <testCase>
     <class>Push_Local_Registry</class>
     <desc>Push Images to Local Registry</desc>
     <node>obelix</node>

ci-scripts/xml_files/container_image_build_arm.xml

@@ -24,26 +24,21 @@
   <htmlTabRef>build-tab</htmlTabRef>
   <htmlTabName>Build Container Images for ARM</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 800813
- 000001
- 000010
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>gracehopper3-oai</node>
   </testCase>
-	<testCase id="000001">
+
+  <testCase>
     <class>Build_Image</class>
     <desc>Build all Images</desc>
     <node>gracehopper3-oai</node>
     <kind>native_armv9</kind>
   </testCase>
 
-        <testCase id="000010">
+  <testCase>
     <class>Push_Local_Registry</class>
     <desc>Push Images to Local Registry</desc>
     <node>gracehopper3-oai</node>

ci-scripts/xml_files/container_image_build_cross.xml

@@ -24,17 +24,14 @@
   <htmlTabRef>build-tab</htmlTabRef>
   <htmlTabName>Build Container Images</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 100001
- 000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-	<testCase id="100001">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>alambix</node>
   </testCase>
-	<testCase id="000001">
+
+  <testCase>
     <class>Build_Image</class>
     <desc>Cross-Compile for ARM64</desc>
     <kind>build_cross_arm64</kind>

ci-scripts/xml_files/container_image_build_jetson.xml

@@ -24,26 +24,21 @@
   <htmlTabRef>build-tab</htmlTabRef>
   <htmlTabName>Build Container Images for ARM</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 800813
- 000001
- 000010
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>jetson3-oai</node>
   </testCase>
-        <testCase id="000001">
+
+  <testCase>
     <class>Build_Image</class>
     <desc>Build all Images</desc>
     <node>jetson3-oai</node>
     <kind>native_armv8</kind>
   </testCase>
 
-        <testCase id="000010">
+  <testCase>
     <class>Push_Local_Registry</class>
     <desc>Push Images to Local Registry</desc>
     <node>jetson3-oai</node>

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -24,12 +24,8 @@
   <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
   <htmlTabName>Build L2sim proxy image</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 000001
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
 
-        <testCase id="000001">
+  <testCase>
     <class>Build_Proxy</class>
     <desc>Build L2sim Proxy Image</desc>
     <node>localhost</node>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -26,96 +26,54 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
   <htmlTabRef>test-fdd-05-tm1</htmlTabRef>
   <htmlTabName>Test-FDD-05MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-300000
-040101 
-800813
-030101
-040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
-030201
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
     <images>oai-enb</images>
   </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="300000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Reset USRP</desc>
     <node>hutch</node>
     <command>sudo -S b2xx_fx3_utils --reset-device</command>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
     <node>hutch</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030201">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UEs</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040501">
+  <testCase>
     <class>Ping</class>
     <desc>ping (5MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -124,7 +82,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040603">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 15M -t 30 -R</iperf_args>
@@ -134,7 +92,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040604">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 15M -t 30 -R</iperf_args>
@@ -143,7 +101,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040605">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
     <iperf_args>-u -b 15M -t 30 -R</iperf_args>
@@ -153,7 +111,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040606">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -161,7 +119,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040607">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -169,7 +127,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040641">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 9M -t 30</iperf_args>
@@ -179,7 +137,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040642">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 9M -t 30</iperf_args>
@@ -189,7 +147,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040643">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -197,7 +155,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040644">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -205,7 +163,37 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UEs</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -214,4 +202,3 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -24,60 +24,49 @@
   <htmlTabRef>test-fdd-05-tm1-if4-5</htmlTabRef>
   <htmlTabName>Test-FDD-05MHz-TM1-IF4.5</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-300000
-040101
-800813
-030131
-030132
-040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
-030231
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
     <images>oai-enb</images>
   </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="300000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Reset USRP</desc>
     <node>hutch</node>
     <command>sudo -S b2xx_fx3_utils --reset-device</command>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030131">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
     <node>hutch</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
     <services>rru_fdd</services>
   </testCase>
-    <testCase id="030132">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>
     <node>hutch</node>
@@ -85,44 +74,13 @@
     <services>rcc_fdd</services>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030231">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy RCC/RRU</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UEs</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UEs</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040531">
+  <testCase>
     <class>Ping</class>
     <desc>ping (5MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -131,7 +89,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040633">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 15M -t 30 -R</iperf_args>
@@ -141,7 +99,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040634">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 15M -t 30 -R</iperf_args>
@@ -150,7 +108,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040636">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -158,7 +116,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040671">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 9M -t 30</iperf_args>
@@ -169,7 +127,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040672">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 9M -t 30</iperf_args>
@@ -179,7 +137,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040673">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -187,7 +145,37 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UEs</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy RCC/RRU</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -26,51 +26,131 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
   <htmlTabRef>test-fdd-05-rrc-inactivity</htmlTabRef>
   <htmlTabName>Test-FDD-05MHz-TM1-RRC-Inactivity</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030102
-000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
-030202
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>hutch</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030102">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
     <node>hutch</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
   </testCase>
 
-    <testCase id="030202">
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status before attachment</desc>
+    <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status before data disabling</desc>
+    <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>DataDisable_UE</class>
+    <desc>Disabling Data Service on UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Waiting for 55 seconds</desc>
+    <idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status after data disabling</desc>
+    <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>DataEnable_UE</class>
+    <desc>Enabling Data Service on UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Waiting for 10 seconds</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>CheckStatusUE</class>
+    <desc>Check UE(s) status after data re-enabling</desc>
+    <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>ping (5MHz - 20 sec)</desc>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <id>adb_ue_1 adb_ue_2</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy eNB</desc>
@@ -78,100 +158,15 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity</yaml_path>
   </testCase>
 
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
+  <testCase>
+    <class>Custom_Command</class>
     <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
-        <class>Attach_UE</class>
-        <desc>Attach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Waiting for 55 seconds</desc>
-        <idle_sleep_time_in_sec>55</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="000002">
-        <class>IdleSleep</class>
-        <desc>Waiting for 10 seconds</desc>
-        <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="000010">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status before attachment</desc>
-        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="000011">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status before data disabling</desc>
-        <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="000012">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status after data disabling</desc>
-        <expectedNbOfConnectedUEs>0</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="000013">
-        <class>CheckStatusUE</class>
-        <desc>Check UE(s) status after data re-enabling</desc>
-        <expectedNbOfConnectedUEs>2</expectedNbOfConnectedUEs>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040302">
-        <class>DataDisable_UE</class>
-        <desc>Disabling Data Service on UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040303">
-        <class>DataEnable_UE</class>
-        <desc>Enabling Data Service on UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-
-    <testCase id="040502">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040503">
-        <class>Ping</class>
-        <desc>ping (5MHz - 20 sec)</desc>
-        <ping_args>-c 20</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="222222">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -180,4 +175,3 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -27,89 +27,53 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
   <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
   <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030111
-000001
-040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
-030211
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>hutch</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030111">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
     <node>hutch</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
   </testCase>
 
-    <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-    <testCase id="030211">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040511">
+  <testCase>
     <class>Ping</class>
     <desc>ping (10MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -118,7 +82,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040613">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 30M -t 30 -R</iperf_args>
@@ -129,7 +93,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040614">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 30M -t 30 -R</iperf_args>
@@ -138,7 +102,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040615">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
     <iperf_args>-u -b 30M -t 30 -R</iperf_args>
@@ -148,23 +112,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040616">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040617">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040651">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 18M -t 30</iperf_args>
@@ -174,7 +122,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040652">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 18M -t 30</iperf_args>
@@ -183,7 +131,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040653">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -191,7 +139,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040654">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -200,7 +148,37 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -209,4 +187,3 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -26,83 +26,47 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
   <htmlTabRef>test-fdd-10-cdrx-tm1</htmlTabRef>
   <htmlTabName>Test-FDD-10MHz-CDRX-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030112
-040301 040302 040512 040612 040650 040401
-040201
-030212
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>hutch</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-            <class>Custom_Command</class>
-            <always_exec>true</always_exec>
-            <desc>Enable Sleep States</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
-            <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030112">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
     <node>hutch</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
   </testCase>
 
-    <testCase id="030212">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040512">
+  <testCase>
     <class>Ping</class>
     <desc>ping (10MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -111,7 +75,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040612">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 30M -t 30 -R</iperf_args>
@@ -122,7 +86,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040650">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 20M -t 30</iperf_args>
@@ -132,7 +96,37 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -141,4 +135,3 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -24,118 +24,74 @@
   <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
   <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-100001
-111110
-111111
-800813
-030111
-000001
-800814
-030311
-000002
-040511 040613 040616 040651
-030411
-000001
-030211
-200000
-200001
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="111111">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>carabe</node>
-        <images>oai-lte-ue</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States (hutch)</desc>
     <node>hutch</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="100001">
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States (carabe)</desc>
     <node>carabe</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States (hutch)</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="200001">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States (carabe)</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>carabe</node>
-        <command>sudo cpupower idle-set -E</command>
+    <images>oai-lte-ue</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030111">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
     <node>hutch</node>
   </testCase>
-    <testCase id="800814">
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 1</desc>
     <node>carabe</node>
   </testCase>
-    <testCase id="030311">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>
     <node>carabe</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="000002">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
   </testCase>
 
-    <testCase id="030211">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-    </testCase>
-
-    <testCase id="030411">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy LTE-UE</desc>
-        <node>carabe</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-    </testCase>
-
-    <testCase id="040511">
+  <testCase>
     <class>Ping</class>
     <desc>ping (10MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -144,7 +100,7 @@
     <svr_id>nano-cn4g</svr_id>
   </testCase>
 
-    <testCase id="040613">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 10M -t 30 -R</iperf_args>
@@ -153,7 +109,7 @@
     <svr_id>nano-cn4g</svr_id>
   </testCase>
 
-    <testCase id="040616">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -162,7 +118,7 @@
     <svr_id>nano-cn4g</svr_id>
   </testCase>
 
-    <testCase id="040651">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 10M -t 30</iperf_args>
@@ -171,17 +127,45 @@
     <svr_id>nano-cn4g</svr_id>
   </testCase>
 
-    <testCase id="040654">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy LTE-UE</desc>
+    <node>carabe</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (hutch)</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (carabe)</desc>
+    <node>carabe</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on eNB Test Server</desc>
@@ -189,7 +173,7 @@
     <images>oai-enb</images>
   </testCase>
 
-    <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on LTE-UE Test Server</desc>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -26,89 +26,53 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
   <htmlTabRef>test-fdd-20-tm1</htmlTabRef>
   <htmlTabName>Test-FDD-20MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030121
-000001
-040301 040521 040623 040624 040625 040662 040401 040201
-030221
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>hutch</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>hutch</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-            <class>Custom_Command</class>
-            <always_exec>true</always_exec>
-            <desc>Enable Sleep States</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>hutch</node>
-            <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
-    <testCase id="030121">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/20MHz/B200) in a container</desc>
     <node>hutch</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
   </testCase>
 
-    <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-    <testCase id="030221">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>hutch</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040521">
+  <testCase>
     <class>Ping</class>
     <desc>ping (20MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -117,7 +81,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040623">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
     <iperf_args>-u -b 70M -t 30 -R</iperf_args>
@@ -128,7 +92,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040624">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 70M -t 30 -R</iperf_args>
@@ -137,7 +101,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040625">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
     <iperf_args>-u -b 70M -t 30 -R</iperf_args>
@@ -147,34 +111,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040626">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040627">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040661">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 12M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040662">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 17M -t 30</iperf_args>
@@ -183,24 +120,37 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040663">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040664">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <iperf_profile>balanced</iperf_profile>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>hutch</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>hutch</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -209,4 +159,3 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -26,97 +26,54 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
   <htmlTabRef>test-tdd-05-tm1</htmlTabRef>
   <htmlTabName>Test-TDD-05MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-300000
-100000
-111110
-040101
-800813
-030104
-040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201
-030204
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Reset USRP</desc>
+    <node>starsky</node>
+    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>starsky</node>
     <images>oai-enb</images>
   </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
   </testCase>
 
-    <testCase id="300000">
-        <class>Custom_Command</class>
-        <desc>Reset USRP</desc>
-        <node>starsky</node>
-        <command>sudo -S b2xx_fx3_utils --reset-device</command>
-    </testCase>
-    <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
-    <testCase id="030104">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>
     <node>starsky</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1</yaml_path>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030204">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040501">
+  <testCase>
     <class>Ping</class>
     <desc>ping (5MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -125,7 +82,16 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040601">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
@@ -136,16 +102,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040602">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040603">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
@@ -155,7 +112,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040604">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -163,7 +120,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040605">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -171,7 +128,16 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040641">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 2M -t 30</iperf_args>
@@ -181,16 +147,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040642">
-        <class>Iperf</class>
-        <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040643">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 2M -t 30</iperf_args>
@@ -200,7 +157,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040644">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -208,7 +165,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040645">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -217,7 +174,37 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -24,60 +24,43 @@
   <htmlTabRef>test-tdd-05-if4-5</htmlTabRef>
   <htmlTabName>Test-TDD-05MHz-TM1-IF4.5</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-300000
-100000
-111110
-800813
-030134
-030135
-040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
-030231
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Reset USRP</desc>
+    <node>starsky</node>
+    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>starsky</node>
     <images>oai-enb</images>
   </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-
-    <testCase id="300000">
-        <class>Custom_Command</class>
-        <desc>Reset USRP</desc>
-        <node>starsky</node>
-        <command>sudo -S b2xx_fx3_utils --reset-device</command>
-    </testCase>
-    <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
-    <testCase id="030134">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy RRU (TDD/Band40/5MHz/B200) in a container</desc>
     <node>starsky</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
     <services>rru_tdd</services>
   </testCase>
-    <testCase id="030135">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy RCC (TDD/Band40/5MHz) in a container</desc>
     <node>starsky</node>
@@ -85,44 +68,13 @@
     <services>rcc_tdd</services>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030231">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy RRU/RCC</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040532">
+  <testCase>
     <class>Ping</class>
     <desc>ping (5MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -131,7 +83,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040631">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
@@ -142,7 +94,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040632">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
     <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
@@ -151,7 +103,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040634">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -159,7 +111,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040635">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -167,7 +119,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040681">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 2M -t 30</iperf_args>
@@ -177,7 +129,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040682">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
     <iperf_args>-u -b 2M -t 30</iperf_args>
@@ -186,7 +138,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040684">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -194,7 +146,7 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040685">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -202,7 +154,37 @@
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy RRU/RCC</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -26,88 +26,47 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
   <htmlTabRef>test-tdd-10-tm1</htmlTabRef>
   <htmlTabName>Test-TDD-10MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030114
-040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
-030214
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>starsky</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
-    <testCase id="030114">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band40/10MHz/B200) in a container</desc>
     <node>starsky</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030214">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040511">
+  <testCase>
     <class>Ping</class>
     <desc>ping (10MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -116,7 +75,16 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040611">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
@@ -127,16 +95,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040612">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040613">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
@@ -146,7 +105,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040614">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -154,7 +113,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040615">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -163,7 +122,16 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040651">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 2M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 2M -t 30</iperf_args>
@@ -173,16 +141,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040652">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040653">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 2M -t 30</iperf_args>
@@ -192,7 +151,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040654">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -200,7 +159,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040655">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -208,7 +167,37 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -26,88 +26,47 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
   <htmlTabRef>test-tdd-20-tm1</htmlTabRef>
   <htmlTabName>Test-TDD-20MHz-TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030124
-040301 040521 040622 040621 040623 040662 040401 040201
-030224
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <node>starsky</node>
-        <images>oai-enb</images>
-    </testCase>
-    <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>starsky</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-    <testCase id="200000">
-            <class>Custom_Command</class>
-            <always_exec>true</always_exec>
-            <desc>Enable Sleep States</desc>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
     <node>starsky</node>
-            <command>sudo cpupower idle-set -E</command>
+    <images>oai-enb</images>
   </testCase>
-    <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
-    <testCase id="030124">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
     <node>starsky</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030224">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040521">
+  <testCase>
     <class>Ping</class>
     <desc>ping (20MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -116,7 +75,16 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040621">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
@@ -126,16 +94,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040622">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040623">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
@@ -145,33 +104,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040624">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040625">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040661">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040662">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
     <iperf_args>-u -b 2M -t 30 -R</iperf_args>
@@ -180,33 +113,37 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040663">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>unbalanced</iperf_profile>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040664">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040665">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -26,89 +26,47 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
   <htmlTabRef>test-tdd-20-tm1-def-sched</htmlTabRef>
   <htmlTabName>Test-TDD-20MHz-TM1-Default-Scheduler</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-111110
-040101
-800813
-030125
-040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
-030225
-200000
-222222
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="111110">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>starsky</node>
     <images>oai-enb</images>
   </testCase>
 
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -D 0</command>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <always_exec>true</always_exec>
-        <desc>Enable Sleep States</desc>
-        <node>starsky</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
-    <testCase id="030125">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
     <node>starsky</node>
     <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
   </testCase>
 
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030225">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>starsky</node>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
-    </testCase>
-
-    <testCase id="040101">
-        <class>Initialize_UE</class>
-        <desc>Initialize UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040201">
-        <class>Terminate_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Terminate UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
-    <testCase id="040301">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>adb_ue_1 adb_ue_2</id>
   </testCase>
-    <testCase id="040401">
-        <class>Detach_UE</class>
-        <always_exec>true</always_exec>
-        <desc>Detach UE</desc>
-        <id>adb_ue_1 adb_ue_2</id>
-    </testCase>
 
-    <testCase id="040522">
+  <testCase>
     <class>Ping</class>
     <desc>ping (20MHz - 20 sec)</desc>
     <ping_args>-c 20</ping_args>
@@ -117,7 +75,17 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040626">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
@@ -128,17 +96,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040627">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040628">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
@@ -149,7 +107,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040629">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -157,7 +115,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040630">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -166,7 +124,16 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040666">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
+    <iperf_args>-u -b 7M -t 30</iperf_args>
+    <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+    <id>adb_ue_1</id>
+    <svr_id>ltebox-nano</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
     <iperf_args>-u -b 7M -t 30</iperf_args>
@@ -176,16 +143,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040667">
-        <class>Iperf</class>
-        <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
-    </testCase>
-
-    <testCase id="040668">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
     <iperf_args>-u -b 7M -t 30</iperf_args>
@@ -195,7 +153,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040669">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -203,7 +161,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="040670">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -211,7 +169,37 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <svr_id>ltebox-nano</svr_id>
   </testCase>
 
-    <testCase id="222222">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate UE</desc>
+    <id>adb_ue_1 adb_ue_2</id>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>starsky</node>
+    <yaml_path>ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>starsky</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml

@@ -25,71 +25,54 @@
   <htmlTabRef>TEST-LTE-2x2-N3XX-TM1</htmlTabRef>
   <htmlTabName>2.6 Ghz TDD LTE 2x2 TM1</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
 
-111111
-100000
-010010
-800833
-030101
-010001
-000001
-050000
-050001
-070000
-070001
-010010
-030201
-333333
-
-</TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>obelix</node>
     <images>oai-enb</images>
   </testCase>
 
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>obelix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>obelix</node>
-    <command>sudo cpupower idle-set -E</command>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
   </testCase>
-  <testCase id="800833">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>obelix</node>
   </testCase>
-  <testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="010001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="050000">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
     <id>up2</id>
@@ -99,7 +82,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
- <testCase id="050001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
     <id>up2</id>
@@ -109,7 +92,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="070000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 26M -t 60 -R</iperf_args>
@@ -119,7 +102,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-   <testCase id="070001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
@@ -129,26 +112,22 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="030201">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
-    <!-- <d_retx_th>1,100,100,100</d_retx_th>
-	    <u_retx_th>1,100,100,100</u_retx_th>
-		    ?
-    -->
   </testCase>
 
-    <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images</desc>
@@ -157,4 +136,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml

@@ -25,71 +25,54 @@
   <htmlTabRef>TEST-LTE-2x2-N3XXi-TM2</htmlTabRef>
   <htmlTabName>2.6 Ghz TDD LTE 2x2 TM2</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
 
-111111
-100000
-010010
-800833
-031101
-010001
-000001
-051000
-051001
-071000
-071001
-010010
-031201
-333333
-
-</TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>obelix</node>
     <images>oai-enb</images>
   </testCase>
 
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>obelix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>obelix</node>
-    <command>sudo cpupower idle-set -E</command>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
   </testCase>
-  <testCase id="800833">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>obelix</node>
   </testCase>
-  <testCase id="031101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="010001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="051000">
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
     <id>up2</id>
@@ -99,7 +82,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
- <testCase id="051001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
     <id>up2</id>
@@ -109,7 +92,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="071000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 1M -t 60 -R</iperf_args>
@@ -119,7 +102,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-   <testCase id="071001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
@@ -129,26 +112,22 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
 
-  <testCase id="031201">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
     <node>obelix</node>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
-    <!-- <d_retx_th>1,100,100,100</d_retx_th>
-	    <u_retx_th>1,100,100,100</u_retx_th>
-		    ?
-    -->
   </testCase>
 
-    <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images</desc>
@@ -156,6 +135,4 @@
     <images>oai-enb</images>
   </testCase>
 
-
 </testCaseList>
-

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -24,151 +24,87 @@
   <htmlTabRef>TEST-NSA-FR1-TM1-B200</htmlTabRef>
   <htmlTabName>NSA SanityCheck with QUECTEL</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 200000
- 100000
- 500000
- 111110
- 111111
- 000100
- 010000
- 800833
- 030101
- 800834
- 030102
- 010001
- 050000
- 050001
- 070001
- 070000
- 070002
- 050002
- 050003
- 010010
- 010002
- 030202
- 030201
- 060000
- 300000
- 600000
- 222220
- 222221
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="111110">
-		<class>Pull_Local_Registry</class>
-		<desc>Pull Images from Local Registry</desc>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States (nepes)</desc>
     <node>nepes</node>
-		<images>oai-enb</images>
+    <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-	<testCase id="111111">
-		<class>Pull_Local_Registry</class>
-		<desc>Pull Images from Local Registry</desc>
-		<node>ofqot</node>
-		<images>oai-gnb</images>
-	</testCase>
-
-	<testCase id = "100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Reset USRP on nepes</desc>
     <node>nepes</node>
     <command>sudo -S /usr/local/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
   </testCase>
 
-	<testCase id="200000">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States (nepes)</desc>
-		<node>nepes</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-	<testCase id="300000">
-		<class>Custom_Command</class>
-    <always_exec>true</always_exec>
-		<desc>Enable Sleep States (nepes)</desc>
-		<node>nepes</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
-	<testCase id="500000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States (ofqot)</desc>
     <node>ofqot</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-	<testCase id="600000">
-		<class>Custom_Command</class>
-    <always_exec>true</always_exec>
-		<desc>Enable Sleep States (ofqot)</desc>
-		<node>ofqot</node>
-		<command>sudo cpupower idle-set -E</command>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>nepes</node>
+    <images>oai-enb</images>
   </testCase>
 
-	<testCase id="000100">
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>ofqot</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Start EPC</desc>
     <cn_id>ltebox-nepes</cn_id>
   </testCase>
 
-	<testCase id="010000">
+  <testCase>
     <class>Initialize_UE</class>
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-	<testCase id="010002">
-		<class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-		<desc>Terminate Quectel</desc>
-		<id>idefix</id>
-	</testCase>
-	<testCase id="010001">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-		<id>idefix</id>
-  	</testCase>
-	<testCase id= "010010">
-		<class>Detach_UE</class>
-    <always_exec>true</always_exec>
-		<desc>Detach UE</desc>
-		<id>idefix</id>
-	</testCase>
-	<testCase id="800833">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>nepes</node>
   </testCase>
-	<testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
     <node>nepes</node>
     <yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
   </testCase>
-	<testCase id="800834">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>ofqot</node>
   </testCase>
-	<testCase id="030102">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
     <node>ofqot</node>
     <yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
   </testCase>
 
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>idefix</id>
   </testCase>
 
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050000">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
@@ -178,7 +114,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-	<testCase id="050001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
@@ -188,37 +124,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-	<testCase id="050002">
-		<class>Ping</class>
-		<desc>Ping: 20pings in 20sec</desc>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>15</ping_rttavg_threshold>
-	</testCase>
-
-	<testCase id="050003">
-		<class>Ping</class>
-		<desc>Ping: 100pings in 20sec</desc>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>15</ping_rttavg_threshold>
-	</testCase>
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 60 -R</iperf_args>
-		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
-		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-	</testCase>
-
-	<testCase id="070001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/8Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 8M -t 60</iperf_args>
@@ -228,7 +134,17 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-    <testCase id="070002">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 70M -t 60 -R</iperf_args>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 10 --bidir</iperf_args>
@@ -236,22 +152,41 @@
     <svr_id>ltebox-nepes</svr_id>
   </testCase>
 
-    <testCase id="030201">
-        <class>Undeploy_Object</class>
-        <always_exec>true</always_exec>
-        <desc>Undeploy eNB</desc>
-        <node>nepes</node>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-    <testCase id="060000">
-      <class>UndeployCoreNetwork</class>
-      <desc>Terminate EPC</desc>
-      <always_exec>true</always_exec>
-      <cn_id>ltebox-nepes</cn_id>
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>ltebox-nepes</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-    <testCase id="030202">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -261,7 +196,38 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-	<testCase id="222220">
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy eNB</desc>
+    <node>nepes</node>
+    <yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <desc>Terminate EPC</desc>
+    <always_exec>true</always_exec>
+    <cn_id>ltebox-nepes</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (nepes)</desc>
+    <node>nepes</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States (ofqot)</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -269,7 +235,7 @@
     <images>oai-enb</images>
   </testCase>
 
-	<testCase id="222221">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -278,4 +244,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_aerial_cn_start.xml

@@ -24,14 +24,11 @@
   <htmlTabRef>TEST-AERIAL-SA-CN-START</htmlTabRef>
   <htmlTabName>Deploy 5GC</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                555000
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="555000">
+
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
     <cn_id>oc-cn5g-20897-aerial</cn_id>
   </testCase>
-</testCaseList>
 
+</testCaseList>

ci-scripts/xml_files/container_sa_aerial_cn_stop.xml

@@ -24,15 +24,12 @@
   <htmlTabRef>TEST-AERIAL-SA-CN-STOP</htmlTabRef>
   <htmlTabName>Undeploy 5GC</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                000555
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="000555">
+
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <always_exec>true</always_exec>
     <desc>Terminate 5G Core</desc>
     <cn_id>oc-cn5g-20897-aerial</cn_id>
   </testCase>
-</testCaseList>
 
+</testCaseList>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -24,24 +24,8 @@
   <htmlTabRef>TEST-AERIAL-SA</htmlTabRef>
   <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                111111
-                000222
-                800813
-                002222
-                002223
-                000111
-                000011
-                000022
-                000033
-                200022
-                300033
-                000222
-                222222
-                333333
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="111111">
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>gracehopper1-oai</node>
@@ -49,13 +33,20 @@
     <tag_prefix>arm_</tag_prefix>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>up2-aerial</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>gracehopper1-oai</node>
   </testCase>
 
-        <testCase id="002222">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy PNF/Nvidia CUBB in a container</desc>
     <node>gracehopper1-oai</node>
@@ -63,7 +54,7 @@
     <services>nv-cubb</services>
   </testCase>
 
-        <testCase id="002223">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy VNF in a container</desc>
     <node>gracehopper1-oai</node>
@@ -71,13 +62,13 @@
     <services>oai-gnb-aerial</services>
   </testCase>
 
-        <testCase id="000111">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach Quectel</desc>
     <id>up2-aerial</id>
   </testCase>
 
-        <testCase id="000011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>up2-aerial</id>
@@ -86,7 +77,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="000022">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/UDP/800M)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 800M -t 30 -R</iperf_args>
@@ -96,7 +87,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="000033">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/UDP/150M)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 150M -t 30 -l 1428</iperf_args>
@@ -106,7 +97,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-       <testCase id="200022">
+  <testCase>
     <class>Iperf</class>
     <desc>Optional iperf (DL/UDP/1000M)(30 sec)(single-ue profile)</desc>
     <may_fail>true</may_fail>
@@ -117,7 +108,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="300033">
+  <testCase>
     <class>Iperf</class>
     <desc>Optional iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
     <may_fail>true</may_fail>
@@ -128,14 +119,14 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="000222">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach Quectel</desc>
     <id>up2-aerial</id>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -145,12 +136,12 @@
     <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>
 
-        <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
     <node>gracehopper1-oai</node>
     <images>oai-gnb-aerial</images>
   </testCase>
-</testCaseList>
 
+</testCaseList>

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -24,23 +24,8 @@
   <htmlTabRef>TEST-AERIAL-SA-UL-Heavy</htmlTabRef>
   <htmlTabName>AERIAL 100 MHz DSUUU SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                111111
-                000222
-                800813
-                002222
-                002223
-                000111
-                000011
-                000032
-                000033
-                000022
-                000222
-                222222
-                333333
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="111111">
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>gracehopper1-oai</node>
@@ -48,13 +33,20 @@
     <tag_prefix>arm_</tag_prefix>
   </testCase>
 
-        <testCase id="800813">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>up2-aerial</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>gracehopper1-oai</node>
   </testCase>
 
-        <testCase id="002222">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy PNF/Nvidia CUBB in a container</desc>
     <node>gracehopper1-oai</node>
@@ -62,7 +54,7 @@
     <services>nv-cubb</services>
   </testCase>
 
-        <testCase id="002223">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy VNF in a container</desc>
     <node>gracehopper1-oai</node>
@@ -70,13 +62,13 @@
     <services>oai-gnb-aerial</services>
   </testCase>
 
-        <testCase id="000111">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach Quectel</desc>
     <id>up2-aerial</id>
   </testCase>
 
-        <testCase id="000011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>up2-aerial</id>
@@ -85,17 +77,7 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-        <testCase id="000022">
-                <class>Iperf</class>
-                <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 200M -t 30 -R</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000032">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/UDP/300M)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 300M -t 30 -l 1428</iperf_args>
@@ -105,7 +87,7 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="000033">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/UDP/380M)(30 sec)(single-ue profile)</desc>
     <may_fail>true</may_fail>
@@ -116,14 +98,24 @@
     <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
   </testCase>
 
-        <testCase id="000222">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 200M -t 30 -R</iperf_args>
+    <svr_id>oc-cn5g-20897-aerial</svr_id>
+    <id>up2-aerial</id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach Quectel</desc>
     <id>up2-aerial</id>
   </testCase>
 
-        <testCase id="222222">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -133,12 +125,12 @@
     <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>
 
-        <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
     <node>gracehopper1-oai</node>
     <images>oai-gnb-aerial</images>
   </testCase>
-</testCaseList>
 
+</testCaseList>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -24,34 +24,8 @@
   <htmlTabRef>TEST-5G-AW2S</htmlTabRef>
   <htmlTabName>20 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-    110000
-    101000
-    100813
-    120000
-    102000
-    102001
-    302001
-    102002
-    302002
-    102003
-    100100
-    100010
-    100020
-    100030
-    100040
-    102016
-    100200
-    103000
-    104000
-    100002
-    130000
-    444444
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="110000">
+  <testCase>
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
     <oc_project>oaicicd-ran</oc_project>
@@ -59,58 +33,68 @@
     <node>avra</node>
   </testCase>
 
-  <testCase id="101000">
+  <testCase>
     <class>Initialize_UE</class>
     <desc>Initialize Amarisoft UE</desc>
     <id>amarisoft_ue</id>
   </testCase>
 
-  <testCase id="100813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Creating new Workspace</desc>
     <node>avra</node>
   </testCase>
 
-  <testCase id="120000">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>
     <node>avra</node>
     <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
   </testCase>
 
-  <testCase id="102001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE 1</desc>
     <id>amarisoft_ue_1</id>
   </testCase>
 
-  <testCase id="302001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify UE 1 is normal (no RedCap)</desc>
     <node>avra</node>
     <command>[ $(docker logs oai-gnb-aw2s | grep -E "UE with RNTI [0-9a-f]{4} is RedCap" | wc -l) -eq 0 ]</command>
   </testCase>
 
-  <testCase id="102002">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach (RedCap) UE 2</desc>
     <id>amarisoft_ue_2</id>
   </testCase>
 
-  <testCase id="302002">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify UE 2 is RedCap</desc>
     <node>avra</node>
     <command>[ $(docker logs oai-gnb-aw2s | grep -m1 -E "UE with RNTI [0-9a-f]{4} is RedCap" | wc -l) -eq 1 ]</command>
   </testCase>
 
-  <testCase id="102003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE 3 - 15</desc>
     <id>amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
   </testCase>
 
-  <testCase id="100010">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 50 pings in 10sec, multi-ue</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 50 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/3Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 45M -t 30 -R</iperf_args>
@@ -121,16 +105,7 @@
     <svr_id>oc-cn5g</svr_id>
   </testCase>
 
-  <testCase id="100030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
-    <iperf_tcp_rate_target>2</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g</svr_id>
-  </testCase>
-
-  <testCase id="100020">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/1Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 15M -t 30</iperf_args>
@@ -141,7 +116,16 @@
     <svr_id>oc-cn5g</svr_id>
   </testCase>
 
-  <testCase id="100040">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <iperf_tcp_rate_target>2</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -151,23 +135,13 @@
     <svr_id>oc-cn5g</svr_id>
   </testCase>
 
-  <testCase id="100100">
-    <class>Ping</class>
-    <desc>Ping: 50 pings in 10sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
-    <svr_id>oc-cn5g</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-    <ping_rttavg_threshold>25</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="102016">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach (RedCap) UE 16</desc>
     <id>amarisoft_ue_16</id>
   </testCase>
 
-  <testCase id="100200">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec, multi-ue</desc>
     <id>amarisoft_ue_16</id>
@@ -177,27 +151,27 @@
     <ping_rttavg_threshold>30</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="103000">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 amarisoft_ue_16</id>
   </testCase>
 
-  <testCase id="104000">
+  <testCase>
     <class>Terminate_UE</class>
     <always_exec>true</always_exec>
     <desc>Terminate UE</desc>
     <id>amarisoft_ue</id>
   </testCase>
 
-  <testCase id="100002">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="130000">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -205,7 +179,7 @@
     <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
   </testCase>
 
-  <testCase id="444444">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml

@@ -24,158 +24,135 @@
   <htmlTabRef>TEST-5G-2x2-AW2S</htmlTabRef>
   <htmlTabName>20 MHz TDD 2x2 SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    010000
-    001000
-    800813
-    020000
-    002000
-    002001
-    002002
-    002003
-    002004
-    002005
-    002006
-    002007
-    002008
-    002009
-    002010
-    002011
-    002012
-    002013
-    002014
-    002015
-    000100
-    000010
-    000020
-    000030
-    000040
-    002016
-    000200
-    003000
-    004000
-    000002
-    030000
-    333333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="010000">
+  <testCase>
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
     <oc_project>oaicicd-ran</oc_project>
     <images>oai-gnb-aw2s</images>
     <node>avra</node>
   </testCase>
-  <testCase id="800813">
+
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize Amarisoft UE</desc>
+    <id>amarisoft_ue_2x2</id>
+  </testCase>
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>avra</node>
   </testCase>
-  <testCase id="020000">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>
     <node>avra</node>
     <yaml_path>ci-scripts/yaml_files/sa_aw2s_2x2_gnb</yaml_path>
   </testCase>
 
-  <testCase id="001000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_ue_2x2</id>
-  </testCase>
-
-  <testCase id="002001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_1</id>
   </testCase>
 
-  <testCase id="002002">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_2</id>
   </testCase>
 
-  <testCase id="002003">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_3</id>
   </testCase>
 
-  <testCase id="002004">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_4</id>
   </testCase>
 
-  <testCase id="002005">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_5</id>
   </testCase>
 
-  <testCase id="002006">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_6</id>
   </testCase>
 
-  <testCase id="002007">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_7</id>
   </testCase>
 
-  <testCase id="002008">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_8</id>
   </testCase>
 
-  <testCase id="002009">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_9</id>
   </testCase>
 
-  <testCase id="002010">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_10</id>
   </testCase>
 
-  <testCase id="002011">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_11</id>
   </testCase>
 
-  <testCase id="002012">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_12</id>
   </testCase>
 
-  <testCase id="002013">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_13</id>
   </testCase>
 
-  <testCase id="002014">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_14</id>
   </testCase>
 
-  <testCase id="002015">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_15</id>
   </testCase>
 
-  <testCase id="000010">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec, multi-ue</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/4Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 60M -t 30 -R</iperf_args>
@@ -186,16 +163,7 @@
     <svr_id>oc-cn5g</svr_id>
   </testCase>
 
-  <testCase id="000030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
-    <iperf_tcp_rate_target>3.9</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g</svr_id>
-  </testCase>
-
-  <testCase id="000020">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/1.5Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 22.5M -t 30</iperf_args>
@@ -206,7 +174,16 @@
     <svr_id>oc-cn5g</svr_id>
   </testCase>
 
-  <testCase id="000040">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <iperf_tcp_rate_target>3.9</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -216,23 +193,13 @@
     <svr_id>oc-cn5g</svr_id>
   </testCase>
 
-  <testCase id="000100">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
-    <svr_id>oc-cn5g</svr_id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-    <ping_rttavg_threshold>25</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="002016">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>amarisoft_ue_16</id>
   </testCase>
 
-  <testCase id="000200">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec, multi-ue</desc>
     <id>amarisoft_ue_16</id>
@@ -242,27 +209,27 @@
     <ping_rttavg_threshold>30</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="003000">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 amarisoft_ue_16</id>
   </testCase>
 
-  <testCase id="004000">
+  <testCase>
     <class>Terminate_UE</class>
     <always_exec>true</always_exec>
     <desc>Terminate UE</desc>
     <id>amarisoft_ue_2x2</id>
   </testCase>
 
-  <testCase id="000002">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="030000">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -270,7 +237,7 @@
     <yaml_path>ci-scripts/yaml_files/sa_aw2s_2x2_gnb</yaml_path>
   </testCase>
 
-  <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -24,110 +24,47 @@
   <htmlTabRef>TEST-SA-FR1-B200</htmlTabRef>
   <htmlTabName>20 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    100000
-    111111
-    010000
-    800813
-    030101
-    010001
-    050000
-    050001
-    070000
-    070001
-    070002
-    070003
-    070004
-    060001
-    000002
-    060002
-    050000
-    010010
-    010001
-    050001
-    010010
-    010001
-    050000
-    010010
-    010002
-    030201
-    200000
-    222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="111111">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>ofqot</node>
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="100000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
-  <testCase id="010000">
+  <testCase>
     <class>Initialize_UE</class>
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010010">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>ofqot</node>
   </testCase>
-  <testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
     <node>ofqot</node>
     <yaml_path>ci-scripts/yaml_files/sa_b200_gnb</yaml_path>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="000002">
-    <class>Ping</class>
-    <desc>Ping: 20pings</desc>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <ping_args>-c 20 -i0.5 -w25</ping_args>
-    <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-
-  <testCase id="050000">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
@@ -137,7 +74,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="050001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
@@ -147,7 +84,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="070000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 30M -t 30 -R</iperf_args>
@@ -157,7 +94,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="070001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/3.5Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 3.5M -t 30</iperf_args>
@@ -167,7 +104,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="070002">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 10 --bidir</iperf_args>
@@ -175,7 +112,7 @@
     <svr_id>sabox-nepes</svr_id>
   </testCase>
 
-  <testCase id="070003">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -184,7 +121,7 @@
     <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="070004">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -193,20 +130,100 @@
     <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="060001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
   </testCase>
-  <testCase id="060002">
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
   </testCase>
 
-  <testCase id="030201">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -216,7 +233,15 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="222222">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -225,4 +250,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -24,77 +24,34 @@
   <htmlTabRef>TEST-SA-FR1-F1-E1-B200</htmlTabRef>
   <htmlTabName>40 MHz TDD F1+E1 SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    333333
-    300000
-    310000
-    800813
-    330101
-    310001
-    400001
-    350000
-    370003
-    370004
-    370002
-    360001
-    100002
-    360002
-    350000
-    410002
-    370012
-    400002
-    410003
-    370013
-    400003
-    410000
-    350000
-    400000
-    410001
-    350000
-    400001
-    310011
-    310002
-    330201
-    200000
-    222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="333333">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>ofqot</node>
     <images>oai-gnb oai-nr-cuup</images>
   </testCase>
 
-  <testCase id="310000">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Initialize_UE</class>
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-  <testCase id="310002">
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="310001">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="310011">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>ofqot</node>
   </testCase>
-  <testCase id="330101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU-CP/gNB-CU-UP/gNB-DU (TDD/n76/40MHz/B200)</desc>
     <node>ofqot</node>
@@ -102,21 +59,20 @@
     <services>gnb_cucp gnb_cuup gnb_du_tdd</services>
   </testCase>
 
-  <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>idefix</id>
   </testCase>
 
-  <testCase id="350000">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check UE is on dedicated BWP ID 1</desc>
+    <node>ofqot</node>
+    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 1 (dedicated) UL BWP ID 1 (dedicated)'</command>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>idefix</id>
@@ -126,89 +82,7 @@
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="400001">
-    <class>Custom_Command</class>
-    <desc>Check UE is on dedicated BWP ID 1</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 1 (dedicated) UL BWP ID 1 (dedicated)'</command>
-  </testCase>
-
-  <testCase id="410001">
-    <class>Custom_Command</class>
-    <desc>Switch to dedicated BWP ID 1</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 1 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 1 for UE'</command>
-  </testCase>
-
-  <testCase id="400000">
-    <class>Custom_Command</class>
-    <desc>Check UE is on initial BWP ID 0</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 0 (initial) UL BWP ID 0 (initial)'</command>
-  </testCase>
-
-  <testCase id="410002">
-    <class>Custom_Command</class>
-    <desc>Switch to dedicated BWP ID 2</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 2 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 2 for UE'</command>
-  </testCase>
-
-  <testCase id="370012">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(10 sec)(single-ue profile)</desc>
-    <iperf_args>-t 10 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>35</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="400002">
-    <class>Custom_Command</class>
-    <desc>Check UE is on dedicated BWP ID 2</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 2 (dedicated) UL BWP ID 2 (dedicated)'</command>
-  </testCase>
-
-  <testCase id="410003">
-    <class>Custom_Command</class>
-    <desc>Switch to dedicated BWP ID 3</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 3 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 3 for UE'</command>
-  </testCase>
-
-  <testCase id="370013">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(10 sec)(single-ue profile)</desc>
-    <iperf_args>-t 10 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>65</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="400003">
-    <class>Custom_Command</class>
-    <desc>Check UE is on dedicated BWP ID 3</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 3 (dedicated) UL BWP ID 3 (dedicated)'</command>
-  </testCase>
-
-  <testCase id="410000">
-    <class>Custom_Command</class>
-    <desc>Switch to initial BWP ID 0</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 0 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 0 for UE'</command>
-  </testCase>
-
-  <testCase id="370002">
-    <class>Iperf</class>
-    <desc>iperf (BIDIR TCP)(20 sec)(single-ue profile)</desc>
-    <iperf_args>-t 20 --bidir</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-  </testCase>
-
-  <testCase id="370003">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/TCP)(20 sec)(single-ue profile)</desc>
     <iperf_args>-t 20 -R</iperf_args>
@@ -217,7 +91,7 @@
     <iperf_tcp_rate_target>140</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="370004">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(20 sec)(single-ue profile)</desc>
     <iperf_args>-t 20</iperf_args>
@@ -226,20 +100,22 @@
     <iperf_tcp_rate_target>15</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="360001">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (BIDIR TCP)(20 sec)(single-ue profile)</desc>
+    <iperf_args>-t 20 --bidir</iperf_args>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment (on DU)</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
   </testCase>
-  <testCase id="360002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-  </testCase>
 
-  <testCase id="100002">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings</desc>
     <id>idefix</id>
@@ -248,7 +124,132 @@
     <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="330201">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment (on CU)</desc>
+    <node>ofqot</node>
+    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Switch to dedicated BWP ID 2</desc>
+    <node>ofqot</node>
+    <command>echo ci trigger_bwp_switch 2 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 2 for UE'</command>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(10 sec)(single-ue profile)</desc>
+    <iperf_args>-t 10 -R</iperf_args>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <iperf_tcp_rate_target>35</iperf_tcp_rate_target>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check UE is on dedicated BWP ID 2</desc>
+    <node>ofqot</node>
+    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 2 (dedicated) UL BWP ID 2 (dedicated)'</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Switch to dedicated BWP ID 3</desc>
+    <node>ofqot</node>
+    <command>echo ci trigger_bwp_switch 3 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 3 for UE'</command>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(10 sec)(single-ue profile)</desc>
+    <iperf_args>-t 10 -R</iperf_args>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <iperf_tcp_rate_target>65</iperf_tcp_rate_target>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check UE is on dedicated BWP ID 3</desc>
+    <node>ofqot</node>
+    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 3 (dedicated) UL BWP ID 3 (dedicated)'</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Switch to initial BWP ID 0</desc>
+    <node>ofqot</node>
+    <command>echo ci trigger_bwp_switch 0 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 0 for UE'</command>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check UE is on initial BWP ID 0</desc>
+    <node>ofqot</node>
+    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 0 (initial) UL BWP ID 0 (initial)'</command>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Switch to dedicated BWP ID 1</desc>
+    <node>ofqot</node>
+    <command>echo ci trigger_bwp_switch 1 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 1 for UE'</command>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Check UE is on dedicated BWP ID 1</desc>
+    <node>ofqot</node>
+    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 1 (dedicated) UL BWP ID 1 (dedicated)'</command>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy CUCP/CU-UP/DU</desc>
@@ -258,7 +259,15 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="222222">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -267,4 +276,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -24,85 +24,43 @@
   <htmlTabRef>TEST-SA-FR1-F1-B200</htmlTabRef>
   <htmlTabName>10 MHz FDD F1 SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    111111
-    100000
-    110002
-    800813
-    130101
-    130102
-    100001
-    110000
-    110001
-    100001
-    150000
-    150001
-    110011
-    110001
-    150001
-    160001
-    100002
-    160002
-    150001
-    110011
-    110001
-    150000
-    170001
-    170000
-    170002
-    170003
-    170004
-    110011
-    110002
-    100001
-    130201
-    200000
-    222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="111111">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>ofqot</node>
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="110000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>idefix</id>
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-  <testCase id="110002">
+
+  <testCase>
     <class>Terminate_UE</class>
     <always_exec>true</always_exec>
     <desc>Terminate Quectel</desc>
     <id>idefix</id>
   </testCase>
-  <testCase id="110001">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="110011">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>ofqot</node>
   </testCase>
-  <testCase id="130101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU in a container</desc>
     <node>ofqot</node>
     <yaml_path>ci-scripts/yaml_files/sa_f1_b200_gnb</yaml_path>
     <services>gnb_cu</services>
   </testCase>
-  <testCase id="130102">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU (FDD/Band1/10MHz/B200) in a container</desc>
     <node>ofqot</node>
@@ -110,36 +68,31 @@
     <services>gnb_du_fdd</services>
   </testCase>
 
-  <testCase id="100000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
-  <testCase id="100001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="100002">
-    <class>Ping</class>
-    <desc>Ping: 20pings</desc>
+  <testCase>
+    <class>Initialize_UE</class>
+    <desc>Initialize Quectel</desc>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <ping_args>-c 20 -i0.5 -w25</ping_args>
-    <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="150000">
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
@@ -149,7 +102,7 @@
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="150001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
@@ -159,37 +112,86 @@
     <ping_rttavg_threshold>110</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="150002">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>110</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment (on DU)</desc>
+    <node>ofqot</node>
+    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment (on CU)</desc>
+    <node>ofqot</node>
+    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>110</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 20</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>110</ping_rttavg_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="150003">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <ping_args>-c 100 -i 0.2</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>110</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="170000">
-    <class>Iperf</class>
-    <desc>iperf (DL/50Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 50M -t 30 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="170001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/25Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 25M -t 30</iperf_args>
@@ -199,7 +201,17 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="170002">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/50Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 50M -t 30 -R</iperf_args>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-t 60 --bidir</iperf_args>
@@ -207,7 +219,7 @@
     <svr_id>sabox-nepes</svr_id>
   </testCase>
 
-  <testCase id="170003">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -216,7 +228,7 @@
     <iperf_tcp_rate_target>45</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="170004">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -225,20 +237,27 @@
     <iperf_tcp_rate_target>25</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="160001">
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment (on DU)</desc>
-    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-  </testCase>
-  <testCase id="160002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>idefix</id>
   </testCase>
 
-  <testCase id="130201">
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy CU-DU</desc>
@@ -248,7 +267,15 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="222222">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -257,4 +284,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml

@@ -24,79 +24,47 @@
   <htmlTabRef>TEST-F1-HO-B210</htmlTabRef>
   <htmlTabName>F1 Handover 20 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    000001
-    000002
-    000003
-    000004
-    000005
-    000006
-    000007
-    000008
-    000009
-    000010
-    000011
-    000012
-    000013
-    000014
-    000015
-    000016
-    000017
-    000018
-    000019
-    000020
-    000021
-    000022
-    000023
-    000024
-    000025
-    000026
-    000027
-    000028
 
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-	
-  <testCase id="000001">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
     <cn_id>oc-cn5g-00103-ho</cn_id>
   </testCase>
 
-  <testCase id="000002">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <images>oai-gnb</images>
     <node>groot</node>
   </testCase>
 
-  <testCase id="000003">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <images>oai-gnb</images>
     <node>rocket</node>
   </testCase>
 
-  <testCase id="000004">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for groot</desc>
     <node>groot</node>
   </testCase>
 
-  <testCase id="000005">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace on rocket</desc>
     <node>rocket</node>
   </testCase>
 
-  <testCase id="000006">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Set attenuator to 0 for DU0 and 17 for DU1</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
   </testCase>
 
-  <testCase id="000007">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
@@ -104,7 +72,7 @@
     <services>oai-cu</services>
   </testCase>
 
-  <testCase id="000008">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
@@ -112,7 +80,7 @@
     <node>groot</node>
   </testCase>
 
-  <testCase id="000009">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
@@ -120,13 +88,13 @@
     <services>oai-du1</services>
   </testCase>
 
-  <testCase id="000010">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach Quectel</desc>
     <id>raspix</id>
   </testCase>
 
-  <testCase id="000011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>raspix</id>
@@ -135,20 +103,20 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000012">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="000013">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
-  <testCase id="000014">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
@@ -157,21 +125,21 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000015">
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
-  <testCase id="000016">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Attenuate DU1 by 17dB and remove attenuation on DU0 to trigger Handover</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
   </testCase>
 
-  <testCase id="000017">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
@@ -180,21 +148,21 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000018">
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE connected to DU0?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
-  <testCase id="000019">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
-  <testCase id="000020">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
@@ -203,21 +171,21 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000021">
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
-  <testCase id="000022">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach Quectel</desc>
     <id>raspix</id>
   </testCase>
 
-  <testCase id="000023">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy CU-DU0</desc>
@@ -225,15 +193,15 @@
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
   </testCase>
 
-  <testCase id="000024">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
-    <desc>Undeploy DU1 </desc>
+    <desc>Undeploy DU1</desc>
     <node>rocket</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
   </testCase>
 
-  <testCase id="000025">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Reset all channels on the attenuator to 0</desc>
     <node>rocket</node>
@@ -241,7 +209,7 @@
     <always_exec>true</always_exec>
   </testCase>
 
-  <testCase id="000026">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -249,7 +217,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="000027">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -257,7 +225,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="000028">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <always_exec>true</always_exec>
     <desc>Terminate 5G Core</desc>
@@ -265,4 +233,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml

@@ -24,60 +24,41 @@
   <htmlTabRef>test-5g-fhi72-metanoia-2x2</htmlTabRef>
   <htmlTabName>100 MHz TDD SA METANOIA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    200000
-    110000
-    800813
-    120000
-    102000
-    102001
-    100100
-    100010
-    100020
-    100030
-    100040
-    103000
-    100002
-    130000
-    777777
-    888888
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="200000">
+  <testCase>
     <class>Custom_Script</class>
     <desc>Setup sriov and network interfaces Metanoia</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh</script>
   </testCase>
 
-  <testCase id="110000">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>cacofonix</node>
     <images>oai-gnb-fhi72</images>
   </testCase>
 
-  <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>cacofonix</node>
   </testCase>
 
-  <testCase id="120000">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/100MHz/Metanoia) in a container</desc>
     <node>cacofonix</node>
     <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb</yaml_path>
   </testCase>
 
-  <testCase id="102001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>up2-fhi72</id>
   </testCase>
 
-  <testCase id="100100">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100 pings in 10 sec</desc>
     <id>up2-fhi72</id>
@@ -87,7 +68,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="100010">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/570Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 570M -t 30 -R</iperf_args>
@@ -98,16 +79,7 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="100030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100020">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 100M -t 30</iperf_args>
@@ -118,7 +90,16 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="100040">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -127,20 +108,20 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="103000">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2-fhi72</id>
   </testCase>
 
-  <testCase id="100002">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="130000">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -148,7 +129,7 @@
     <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb</yaml_path>
   </testCase>
 
-  <testCase id="777777">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -156,7 +137,7 @@
     <images>oai-gnb-fhi72</images>
   </testCase>
 
-  <testCase id="888888">
+  <testCase>
     <class>Custom_Script</class>
     <always_exec>true</always_exec>
     <desc>Set CPU to idle state, set kernel parameters to default values</desc>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -24,59 +24,41 @@
   <htmlTabRef>test-5g-fhi72-vvdn</htmlTabRef>
   <htmlTabName>100 MHz TDD SA VVDN</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    200000
-    110000
-    800813
-    120000
-    102000
-    102001
-    100100
-    100010
-    100020
-    100030
-    100040
-    100011
-    103000
-    100002
-    130000
-    777777
-    888888
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="200000">
+  <testCase>
     <class>Custom_Script</class>
     <desc>Setup sriov and network interfaces VVDN</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_sriov_vvdn.sh</script>
   </testCase>
 
-  <testCase id="110000">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>cacofonix</node>
     <images>oai-gnb-fhi72</images>
   </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
     <node>cacofonix</node>
   </testCase>
-  <testCase id="120000">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/100MHz/VVDN) in a container</desc>
     <node>cacofonix</node>
     <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
   </testCase>
 
-  <testCase id="102001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
     <id>up2-fhi72</id>
   </testCase>
 
-  <testCase id="100100">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100 pings in 10 sec</desc>
     <id>up2-fhi72</id>
@@ -86,7 +68,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="100010">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/600Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 600M -t 30 -R</iperf_args>
@@ -97,27 +79,7 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="100011">
-    <class>Iperf</class>
-    <desc>Optional iperf (DL/700Mbps/UDP)(30 sec)</desc>
-    <may_fail>true</may_fail>
-    <iperf_args>-u -b 700M -t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100020">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/80Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 80M -t 30</iperf_args>
@@ -128,7 +90,16 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="100040">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -137,20 +108,31 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="103000">
+  <testCase>
+    <class>Iperf</class>
+    <desc>Optional iperf (DL/700Mbps/UDP)(30 sec)</desc>
+    <may_fail>true</may_fail>
+    <iperf_args>-u -b 700M -t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2-fhi72</id>
   </testCase>
 
-  <testCase id="100002">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="130000">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -158,7 +140,7 @@
     <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
   </testCase>
 
-  <testCase id="777777">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -166,7 +148,7 @@
     <images>oai-gnb-fhi72</images>
   </testCase>
 
-  <testCase id="888888">
+  <testCase>
     <class>Custom_Script</class>
     <always_exec>true</always_exec>
     <desc>Set CPU to idle state, set kernel parameters to default values</desc>
@@ -174,5 +156,4 @@
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
   </testCase>
 
-
 </testCaseList>

ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml

@@ -24,73 +24,47 @@
   <htmlTabRef>TEST-MONO-N2-HO-B210</htmlTabRef>
   <htmlTabName>Monolithic N2 Handover 20 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    000001
-    000002
-    000023
-    000003
-    000004
-    000005
-    000006
-    000007
-    000008
-    000009
-    000010
-    000011
-    000012
-    000013
-    000014
-    000015
-    000017
-    000018
-    000019
-    000016
-    000020
-    000021
-    000022
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="000001">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
     <cn_id>oc-cn5g-00103-ho</cn_id>
   </testCase>
 
-  <testCase id="000002">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <images>oai-gnb</images>
     <node>groot</node>
   </testCase>
 
-  <testCase id="000023">
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <images>oai-gnb</images>
     <node>rocket</node>
   </testCase>
 
-  <testCase id="000003">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for groot</desc>
     <node>groot</node>
   </testCase>
 
-  <testCase id="000005">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace on rocket</desc>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000004">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Set initial attenuation on target gNB</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
   </testCase>
 
-  <testCase id="000005">
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for rocket</desc>
+    <node>rocket</node>
+  </testCase>
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Monolithic gNB-PCI0 (TDD/Band77/20MHz/B210) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
@@ -98,7 +72,7 @@
     <services>oai-gnb-pci0</services>
   </testCase>
 
-  <testCase id="000006">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy Monolithic gNB-PCI1 (TDD/Band77/20MHz/B210) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
@@ -106,13 +80,13 @@
     <services>oai-gnb-pci1</services>
   </testCase>
 
-  <testCase id="000007">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach Quectel</desc>
     <id>raspix</id>
   </testCase>
 
-  <testCase id="000008">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>raspix</id>
@@ -121,20 +95,20 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000009">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
-  <testCase id="000010">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Gradually attenuate gNB-PCI0 (ch1-2=15dB) and gNB-PCI1 (ch3-4=0dB) over 5s to trigger N2 Handover to gNB-PCI1</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
-  <testCase id="000011">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
@@ -143,21 +117,21 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000012">
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI1?</desc>
     <node>rocket</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
-  <testCase id="000013">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Gradually attenuate gNB-PCI0 (ch1-2=0dB) and gNB-PCI1 (ch3-4=15dB) over 5s to trigger N2 Handover back to gNB-PCI0</desc>
     <node>rocket</node>
     <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
   </testCase>
 
-  <testCase id="000014">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>raspix</id>
@@ -166,29 +140,21 @@
     <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
-  <testCase id="000015">
+  <testCase>
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI0?</desc>
     <node>groot</node>
     <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
-  <testCase id="000016">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Reset all attenuators to 0dB</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
-  </testCase>
-
-  <testCase id="000017">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach Quectel</desc>
     <id>raspix</id>
   </testCase>
 
-  <testCase id="000018">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy Monolithic gNB-PCI0</desc>
@@ -196,7 +162,7 @@
     <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
   </testCase>
 
-  <testCase id="000019">
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy Monolithic gNB-PCI1</desc>
@@ -204,7 +170,15 @@
     <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
   </testCase>
 
-  <testCase id="000020">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Reset all attenuators to 0dB</desc>
+    <node>rocket</node>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -212,7 +186,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="000021">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -220,7 +194,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="000022">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <always_exec>true</always_exec>
     <desc>Terminate 5G Core</desc>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -24,65 +24,35 @@
   <htmlTabRef>TEST-SA-FR1-N310-2x2-100MHz</htmlTabRef>
   <htmlTabName>100 MHz TDD SA 2x2</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    100000
-    111111
-    010010
-    800813
-    040101
-    010001
-    051001
-    071100
-    071101
-    071002
-    010010
-    000001
-    040201
-    200000
-    033333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="111111">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-gnb</images>
-    <node>matix</node>
-  </testCase>
-
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>matix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
+  <testCase>
+    <class>Pull_Cluster_Image</class>
+    <desc>Pull Images from Cluster</desc>
+    <images>oai-gnb</images>
     <node>matix</node>
-    <command>sudo cpupower idle-set -E</command>
   </testCase>
 
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>up2</id>
-  </testCase>
-
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>matix</node>
   </testCase>
-  <testCase id="040101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band77/100MHz/N310) in a container</desc>
     <node>matix</node>
@@ -90,19 +60,13 @@
     <num_attempts>3</num_attempts>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2</id>
   </testCase>
 
-  <testCase id="000002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="051001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>up2</id>
@@ -112,7 +76,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="071100">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/650Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 650M -t 30 -R -O 10 -l 9000</iperf_args>
@@ -122,7 +86,7 @@
     <iperf_bitrate_threshold>70</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="071101">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/130Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 130M -t 30 -O 10</iperf_args>
@@ -132,7 +96,7 @@
     <iperf_bitrate_threshold>70</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="071002">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 --bidir</iperf_args>
@@ -140,7 +104,20 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="040201">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -150,7 +127,15 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="033333">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>matix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -159,4 +144,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -24,65 +24,35 @@
   <htmlTabRef>TEST-SA-FR1-N310-2x2-60MHz</htmlTabRef>
   <htmlTabName>60 MHz 2x2 TDD SA DSUUU</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    100000
-    111111
-    010010
-    800813
-    030101
-    010001
-    050001
-    071000
-    071001
-    070002
-    010010
-    000001
-    030201
-    200000
-    333333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="111111">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-gnb</images>
-    <node>matix</node>
-  </testCase>
-
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>matix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
+  <testCase>
+    <class>Pull_Cluster_Image</class>
+    <desc>Pull Images from Cluster</desc>
+    <images>oai-gnb</images>
     <node>matix</node>
-    <command>sudo cpupower idle-set -E</command>
   </testCase>
 
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>up2</id>
-  </testCase>
-
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>matix</node>
   </testCase>
-  <testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
     <node>matix</node>
@@ -90,19 +60,13 @@
     <num_attempts>3</num_attempts>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2</id>
   </testCase>
 
-  <testCase id="000002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="050001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>up2</id>
@@ -112,7 +76,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="071000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/150Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 150M -t 30 -R</iperf_args>
@@ -122,7 +86,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="071001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/250Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 250M -t 30</iperf_args>
@@ -132,7 +96,7 @@
     <iperf_bitrate_threshold>70</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="070002">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 --bidir</iperf_args>
@@ -140,7 +104,20 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="030201">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -150,7 +127,15 @@
     <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="333333">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>matix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -159,4 +144,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

@@ -24,65 +24,35 @@
   <htmlTabRef>TEST-SA-FR1-N310-4x4-60MHz</htmlTabRef>
   <htmlTabName>nFAPI 60 MHz 4x4 TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    100000
-    111111
-    010010
-    800813
-    030101
-    010001
-    050001
-    071000
-    071001
-    070002
-    010010
-    000001
-    030201
-    200000
-    333333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="111111">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-gnb</images>
-    <node>matix</node>
-  </testCase>
-
-  <testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>matix</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
 
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
+  <testCase>
+    <class>Pull_Cluster_Image</class>
+    <desc>Pull Images from Cluster</desc>
+    <images>oai-gnb</images>
     <node>matix</node>
-    <command>sudo cpupower idle-set -E</command>
   </testCase>
 
-  <testCase id="010001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>up2</id>
-  </testCase>
-
-  <testCase id="010010">
+  <testCase>
     <class>Detach_UE</class>
     <always_exec>true</always_exec>
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>matix</node>
   </testCase>
-  <testCase id="030101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy VNF-PNF (TDD/Band77/60MHz/N310) in a container</desc>
     <node>matix</node>
@@ -90,19 +60,13 @@
     <num_attempts>3</num_attempts>
   </testCase>
 
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2</id>
   </testCase>
 
-  <testCase id="000002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="050001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>up2</id>
@@ -112,7 +76,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="071000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/450Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 450M -t 30 -R</iperf_args>
@@ -122,7 +86,7 @@
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="071001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/120Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 120M -t 30</iperf_args>
@@ -132,7 +96,7 @@
     <iperf_bitrate_threshold>70</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="070002">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 --bidir</iperf_args>
@@ -140,7 +104,20 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="030201">
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy VNF-PNF</desc>
@@ -150,7 +127,15 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="333333">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>matix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -159,4 +144,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/container_sa_n310_nrue.xml

@@ -24,76 +24,48 @@
   <htmlTabRef>TEST-5G-NRUE</htmlTabRef>
   <htmlTabName>40 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    060000
-    010000 010001
-    800813
-    020000
-    800814
-    020001
-    000001
-    001000
-    002000
-    000100
-    000200
-    040001 040000
-    333333
-    444444
-    060001
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="060000">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
     <cn_id>oc-cn5g</cn_id>
   </testCase>
 
-  <testCase id="010000">
+  <testCase>
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
     <images>oai-gnb</images>
     <node>avra</node>
   </testCase>
 
-  <testCase id="010001">
+  <testCase>
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
     <images>oai-nr-ue</images>
     <node>caracal</node>
   </testCase>
 
-  <testCase id = "030000">
-    <class>Custom_Command</class>
-    <desc>Reboot USRP N310</desc>
-    <node>avra</node>
-    <command>ssh root@192.168.80.52 reboot ; sleep 45</command>
-  </testCase>
-
-  <testCase id = "030001">
-    <class>Custom_Command</class>
-    <desc>Reboot USRP N310</desc>
-    <node>caracal</node>
-    <command>ssh root@192.168.20.2 reboot ; sleep 45</command>
-  </testCase>
-  <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>avra</node>
   </testCase>
-  <testCase id="020000">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
     <node>avra</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
     <num_attempts>3</num_attempts>
   </testCase>
-  <testCase id="800814">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>caracal</node>
   </testCase>
-  <testCase id="020001">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
@@ -101,33 +73,13 @@
     <num_attempts>3</num_attempts>
   </testCase>
 
-  <testCase id="000001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAIUE</desc>
     <id>oai_ue_caracal</id>
   </testCase>
 
-  <testCase id="000100">
-    <class>Iperf</class>
-    <desc>iperf (DL/60Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 60M -t 30 -i 1 -R</iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="000200">
-    <class>Iperf</class>
-    <desc>iperf (UL/20Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 20M -t 30 -i 1 </iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="001000">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>oai_ue_caracal</id>
@@ -137,7 +89,7 @@
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="002000">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>oai_ue_caracal</id>
@@ -147,7 +99,35 @@
     <ping_rttavg_threshold>30</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="040000">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/60Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 60M -t 30 -i 1 -R</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/20Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 20M -t 30 -i 1</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy nr UE</desc>
+    <node>caracal</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -157,15 +137,7 @@
     <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="040001">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy nr UE</desc>
-    <node>caracal</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-  </testCase>
-
-  <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -173,7 +145,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="444444">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -181,7 +153,7 @@
     <images>oai-nr-ue</images>
   </testCase>
 
-  <testCase id="060001">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <desc>Terminate 5G Core</desc>
     <always_exec>true</always_exec>

ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml

@@ -24,60 +24,34 @@
   <htmlTabRef>LONGRUN-5G-NRUE</htmlTabRef>
   <htmlTabName>Longrun 40 MHz TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    060000
-    010000 010001
-    800813
-    020000
-    800814
-    020001
-    000001
-    001000
-    000100
-    001000
-    000100
-    001000
-    000100
-    001000
-    000200
-    001000
-    000200
-    001000
-    000200
-    040001 040000
-    333333
-    444444
-    060001
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="060000">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
     <cn_id>oc-cn5g</cn_id>
   </testCase>
 
-  <testCase id="010000">
+  <testCase>
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
     <images>oai-gnb</images>
     <node>avra</node>
   </testCase>
 
-  <testCase id="010001">
+  <testCase>
     <class>Pull_Cluster_Image</class>
     <desc>Pull Images from Cluster</desc>
     <images>oai-nr-ue</images>
     <node>caracal</node>
   </testCase>
 
-  <testCase id="800813">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>avra</node>
   </testCase>
 
-  <testCase id="020000">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
     <node>avra</node>
@@ -85,13 +59,13 @@
     <num_attempts>3</num_attempts>
   </testCase>
 
-  <testCase id="800814">
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>caracal</node>
   </testCase>
 
-  <testCase id="020001">
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
@@ -99,33 +73,13 @@
     <num_attempts>3</num_attempts>
   </testCase>
 
-  <testCase id="000001">
+  <testCase>
     <class>Attach_UE</class>
     <desc>Attach OAIUE</desc>
     <id>oai_ue_caracal</id>
   </testCase>
 
-  <testCase id="000100">
-    <class>Iperf</class>
-    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
-    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="000200">
-    <class>Iperf</class>
-    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
-    <iperf_args>-u -b 2M -t 600 -i 1 </iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="001000">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>oai_ue_caracal</id>
@@ -135,7 +89,125 @@
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="040000">
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 2M -t 600 -i 1</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 2M -t 600 -i 1</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 2M -t 600 -i 1</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy nr UE</desc>
+    <node>caracal</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -145,15 +217,7 @@
     <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="040001">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy nr UE</desc>
-    <node>caracal</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-  </testCase>
-
-  <testCase id="333333">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -161,7 +225,7 @@
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="444444">
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -169,7 +233,7 @@
     <images>oai-nr-ue</images>
   </testCase>
 
-  <testCase id="060001">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <desc>Terminate 5G Core</desc>
     <always_exec>true</always_exec>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -24,104 +24,47 @@
   <htmlTabRef>TEST-SA-FR1-SC-PATTERN2-FDMA-B200</htmlTabRef>
   <htmlTabName>40 MHz TDD (pattern2) SA with SC-FDMA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    300000
-    311111
-    210000
-    800813
-    230101
-    210001
-    250000
-    250001
-    270000
-    270001
-    270002
-    270003
-    270004
-    260001
-    200002
-    260002
-    250000
-    210010
-    210002
-    230201
-    400000
-    222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id="311111">
+  <testCase>
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <node>ofqot</node>
     <images>oai-gnb</images>
   </testCase>
 
-  <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="400000">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
-  <testCase id="210000">
+  <testCase>
     <class>Initialize_UE</class>
     <desc>Initialize Quectel</desc>
     <id>idefix</id>
   </testCase>
-  <testCase id="210002">
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="210001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="210010">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="800813">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>ofqot</node>
   </testCase>
-  <testCase id="230101">
+
+  <testCase>
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/pattern2/Band78/40MHz/B200) with SC-FDMA in a container</desc>
     <node>ofqot</node>
     <yaml_path>ci-scripts/yaml_files/sa_sc_b200_gnb</yaml_path>
   </testCase>
 
-  <testCase id="200001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="200002">
-    <class>Ping</class>
-    <desc>Ping: 20pings</desc>
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <ping_args>-c 20 -i0.5 -w25</ping_args>
-    <ping_packetloss_threshold>80</ping_packetloss_threshold>
   </testCase>
 
-
-  <testCase id="250000">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
@@ -131,7 +74,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="250001">
+  <testCase>
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
@@ -141,7 +84,7 @@
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="270000">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/80Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 80M -t 30 -R</iperf_args>
@@ -151,7 +94,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="270001">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/18Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 18M -t 30</iperf_args>
@@ -161,7 +104,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
-  <testCase id="270002">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 10 --bidir</iperf_args>
@@ -169,7 +112,7 @@
     <svr_id>sabox-nepes</svr_id>
   </testCase>
 
-  <testCase id="270003">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
@@ -178,7 +121,7 @@
     <iperf_tcp_rate_target>35</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="270004">
+  <testCase>
     <class>Iperf</class>
     <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
@@ -187,20 +130,54 @@
     <iperf_tcp_rate_target>5</iperf_tcp_rate_target>
   </testCase>
 
-  <testCase id="260001">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
   </testCase>
-  <testCase id="260002">
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20 -i0.5 -w25</ping_args>
+    <ping_packetloss_threshold>80</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
   </testCase>
 
-  <testCase id="230201">
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
+    <class>Terminate_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
+  <testCase>
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
@@ -210,7 +187,15 @@
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>
 
-  <testCase id="222222">
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>ofqot</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase>
     <class>Clean_Test_Server_Images</class>
     <always_exec>true</always_exec>
     <desc>Clean Test Images on Test Server</desc>
@@ -219,4 +204,3 @@
   </testCase>
 
 </testCaseList>
-

ci-scripts/xml_files/cppcheck.xml

@@ -24,17 +24,14 @@
   <htmlTabRef>build-tab</htmlTabRef>
   <htmlTabName>CPPCHECK Analysis</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 000002
- 000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-    <testCase id="000002">
+
+  <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace</desc>
     <node>carabe</node>
   </testCase>
-	<testCase id="000001">
+
+  <testCase>
     <class>Cppcheck_Analysis</class>
     <desc>Static Code Analysis with cppcheck</desc>
     <node>carabe</node>

ci-scripts/xml_files/formatting_check.xml

@@ -24,12 +24,8 @@
   <htmlTabRef>formatting-tab</htmlTabRef>
   <htmlTabName>License and Formatting Checks</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 000002
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="000002">
+  <testCase>
     <class>LicenceAndFormattingCheck</class>
     <desc>License and Formatting Checks</desc>
     <node>obelix</node>

ci-scripts/xml_files/fr1_5gc_closure.xml

@@ -24,12 +24,8 @@
   <htmlTabRef>5gc-closure</htmlTabRef>
   <htmlTabName>5GC-Closure</htmlTabName>
   <htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
-060000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="060000">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <desc>Terminate 5GC</desc>
     <cn_id>sabox-nepes</cn_id>

ci-scripts/xml_files/fr1_5gc_start.xml

@@ -24,13 +24,8 @@
   <htmlTabRef>5gc-start-tab</htmlTabRef>
   <htmlTabName>5GC-Start</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
 
-	<testCase id="000100">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5GC</desc>
     <cn_id>sabox-nepes</cn_id>

ci-scripts/xml_files/fr1_cn5g_basic_deploy.xml

@@ -24,15 +24,11 @@
   <htmlTabRef>cn5g-start-tab</htmlTabRef>
   <htmlTabName>CN5G-Start</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-        <TestCaseRequestedList>
-                000100
-        </TestCaseRequestedList>
-        <TestCaseExclusionList>
-        </TestCaseExclusionList>
 
-        <testCase id="000100">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize 5G Core</desc>
     <cn_id>matix-cn5g</cn_id>
   </testCase>
+
 </testCaseList>

ci-scripts/xml_files/fr1_cn5g_basic_undeploy.xml

@@ -24,16 +24,11 @@
   <htmlTabRef>cn5g-stop-tab</htmlTabRef>
   <htmlTabName>CN5G-Stop</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-        <TestCaseRequestedList>
-                000300
-        </TestCaseRequestedList>
-        <TestCaseExclusionList>
-        </TestCaseExclusionList>
 
-        <testCase id="000300">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <desc>Terminate 5G Core</desc>
     <cn_id>matix-cn5g</cn_id>
   </testCase>
-</testCaseList>
 
+</testCaseList>

ci-scripts/xml_files/fr1_epc_closure.xml

@@ -24,12 +24,8 @@
   <htmlTabRef>epc-closure</htmlTabRef>
   <htmlTabName>EPC-Closure</htmlTabName>
   <htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
-060000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="060000">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <desc>Terminate EPC</desc>
     <cn_id>ltebox-nano</cn_id>

ci-scripts/xml_files/fr1_epc_start.xml

@@ -24,13 +24,8 @@
   <htmlTabRef>epc-start-tab</htmlTabRef>
   <htmlTabName>EPC-Start</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
 
-	<testCase id="000100">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Initialize EPC</desc>
     <cn_id>ltebox-nano</cn_id>

ci-scripts/xml_files/fr1_epc_start_verizon.xml

@@ -24,24 +24,19 @@
   <htmlTabRef>epc-start-tab</htmlTabRef>
   <htmlTabName>EPC-Start</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100 000101 000102
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
 
-	<testCase id="000100">
+  <testCase>
     <class>Initialize_HSS</class>
     <desc>Initialize HSS</desc>
   </testCase>
 
-	<testCase id="000101">
+  <testCase>
     <class>Initialize_MME</class>
     <desc>Initialize MME</desc>
     <option>mme-verizon.conf</option>
   </testCase>
 
-	<testCase id="000102">
+  <testCase>
     <class>Initialize_SPGW</class>
     <desc>Initialize SPGW</desc>
   </testCase>

ci-scripts/xml_files/fr1_oai_cn_deploy.xml

@@ -24,13 +24,8 @@
   <htmlTabRef>epc-deploy-tab</htmlTabRef>
   <htmlTabName>EPC-Deploy</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
 
-	<testCase id="000100">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Deploy EPC</desc>
     <cn_id>porcepix-cn4g</cn_id>

ci-scripts/xml_files/fr1_oai_cn_undeploy.xml

@@ -24,13 +24,8 @@
   <htmlTabRef>epc-undeploy-tab</htmlTabRef>
   <htmlTabName>EPC-Undeploy</htmlTabName>
   <htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 000200
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
 
-	<testCase id="000200">
+  <testCase>
     <class>UndeployCoreNetwork</class>
     <desc>Undeploy EPC</desc>
     <cn_id>porcepix-cn4g</cn_id>

ci-scripts/xml_files/gnb_phytest_rfemulator_run_100_2x2.xml

@@ -24,25 +24,15 @@
   <htmlTabRef>gNB-PHY-Test-100-2x2-RFemu</htmlTabRef>
   <htmlTabName>Timing phytest 100 MHz 2x2 RFemulator</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-100000 390101 000001 390109 200000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-  <testCase id="100000">
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>caracal</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-  <testCase id="200000">
-	  <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-	  <desc>Enable Sleep States</desc>
-	  <node>caracal</node>
-	  <command>sudo cpupower idle-set -E</command>
-  </testCase>
 
-  <testCase id="390101">
+  <testCase>
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
     <node>caracal</node>
@@ -52,14 +42,13 @@
     <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
   </testCase>
 
-  <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
   </testCase>
 
-
-  <testCase id="390109">
+  <testCase>
     <class>Terminate_eNB</class>
     <node>caracal</node>
     <always_exec>true</always_exec>
@@ -67,4 +56,12 @@
     <air_interface>NR</air_interface>
   </testCase>
 
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>caracal</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
 </testCaseList>

ci-scripts/xml_files/gnb_phytest_usrp_run.xml

@@ -24,25 +24,15 @@
   <htmlTabRef>gNB-PHY-Test-40</htmlTabRef>
   <htmlTabName>Timing phytest 40 MHz</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
-100000 090101 000001 090109 200000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id = "100000">
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>caracal</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-	 <testCase id = "200000">
-		<class>Custom_Command</class>
-    <always_exec>true</always_exec>
-		<desc>Enable Sleep States</desc>
-		<node>caracal</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
 
-	<testCase id="090101">
+  <testCase>
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
     <node>caracal</node>
@@ -53,14 +43,13 @@
     <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
   </testCase>
 
-	<testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
   </testCase>
 
-
-	<testCase id="090109">
+  <testCase>
     <class>Terminate_eNB</class>
     <always_exec>true</always_exec>
     <desc>Terminate gNB</desc>
@@ -68,4 +57,12 @@
     <air_interface>NR</air_interface>
   </testCase>
 
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>caracal</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
 </testCaseList>

ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml

@@ -24,25 +24,15 @@
   <htmlTabRef>gNB-PHY-Test-100-2x2</htmlTabRef>
   <htmlTabName>Timing phytest 100 MHz 2x2</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-100000 390101 000001 390109 200000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-  <testCase id="100000">
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>caracal</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-  <testCase id="200000">
-	  <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-	  <desc>Enable Sleep States</desc>
-	  <node>caracal</node>
-	  <command>sudo cpupower idle-set -E</command>
-  </testCase>
 
-  <testCase id="390101">
+  <testCase>
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
     <node>caracal</node>
@@ -53,14 +43,13 @@
     <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
   </testCase>
 
-  <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
   </testCase>
 
-
-  <testCase id="390109">
+  <testCase>
     <class>Terminate_eNB</class>
     <always_exec>true</always_exec>
     <desc>Terminate gNB</desc>
@@ -68,4 +57,12 @@
     <air_interface>NR</air_interface>
   </testCase>
 
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>caracal</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
 </testCaseList>

ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml

@@ -24,25 +24,15 @@
   <htmlTabRef>gNB-PHY-Test-60</htmlTabRef>
   <htmlTabName>Timing phytest 60 MHz</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-100000 190101 000001 190109 200000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-  <testCase id = "100000">
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>caracal</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-  <testCase id = "200000">
-	  <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-	  <desc>Enable Sleep States</desc>
-	  <node>caracal</node>
-	  <command>sudo cpupower idle-set -E</command>
-  </testCase>
 
-  <testCase id="190101">
+  <testCase>
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
     <node>caracal</node>
@@ -53,14 +43,13 @@
     <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
   </testCase>
 
-  <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
   </testCase>
 
-
-  <testCase id="190109">
+  <testCase>
     <class>Terminate_eNB</class>
     <always_exec>true</always_exec>
     <desc>Terminate gNB</desc>
@@ -68,4 +57,12 @@
     <air_interface>NR</air_interface>
   </testCase>
 
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>caracal</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
 </testCaseList>

ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml

@@ -24,25 +24,15 @@
   <htmlTabRef>gNB-PHY-Test-60-2x2</htmlTabRef>
   <htmlTabName>Timing phytest 60 MHz 2x2</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-100000 290101 000001 290109 200000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-  <testCase id="100000">
+
+  <testCase>
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
     <node>caracal</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
-  <testCase id="200000">
-	  <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-	  <desc>Enable Sleep States</desc>
-	  <node>caracal</node>
-	  <command>sudo cpupower idle-set -E</command>
-  </testCase>
 
-  <testCase id="290101">
+  <testCase>
     <class>Initialize_eNB</class>
     <desc>Initialize gNB USRP</desc>
     <node>caracal</node>
@@ -53,14 +43,13 @@
     <cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
   </testCase>
 
-  <testCase id="000001">
+  <testCase>
     <class>IdleSleep</class>
     <desc>Sleep</desc>
     <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
   </testCase>
 
-
-  <testCase id="290109">
+  <testCase>
     <class>Terminate_eNB</class>
     <always_exec>true</always_exec>
     <desc>Terminate gNB</desc>
@@ -68,4 +57,12 @@
     <air_interface>NR</air_interface>
   </testCase>
 
+  <testCase>
+    <class>Custom_Command</class>
+    <always_exec>true</always_exec>
+    <desc>Enable Sleep States</desc>
+    <node>caracal</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
 </testCaseList>

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -24,28 +24,8 @@
   <htmlTabRef>gnb-build-tab</htmlTabRef>
   <htmlTabName>Build-gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
-100000
-000000
-010101
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="000000">
-		<class>Create_Workspace</class>
-		<desc>Create new Workspace</desc>
-		<node>caracal</node>
-	</testCase>
-
-	<testCase id="010101">
-		<mode>TesteNB</mode>	
-		<class>Build_eNB</class>
-		<desc>Build gNB (USRP)</desc>
-		<node>caracal</node>
-		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c --cmake-opt -DPHYSIM_CHECK_FILES="ThresholdsOffload.cmake"</Build_eNB_args>
-	</testCase>
-
-	<testCase id="100000">
+  <testCase>
     <class>Custom_Command</class>
     <desc>Reboot USRP</desc>
     <may_fail>true</may_fail>
@@ -53,4 +33,18 @@
     <command>ssh root@192.168.20.2 reboot</command>
   </testCase>
 
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>caracal</node>
+  </testCase>
+
+  <testCase>
+    <mode>TesteNB</mode>
+    <class>Build_eNB</class>
+    <desc>Build gNB (USRP)</desc>
+    <node>caracal</node>
+    <Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c --cmake-opt -DPHYSIM_CHECK_FILES="ThresholdsOffload.cmake"</Build_eNB_args>
+  </testCase>
+
 </testCaseList>

ci-scripts/xml_files/lte_oai_cn_deploy.xml

@@ -24,13 +24,8 @@
   <htmlTabRef>epc-deploy-tab</htmlTabRef>
   <htmlTabName>EPC-Deploy</htmlTabName>
   <htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
 
-	<testCase id="000100">
+  <testCase>
     <class>DeployCoreNetwork</class>
     <desc>Deploy EPC</desc>
     <cn_id>nano-cn4g</cn_id>