Merge branch 'ci-deploy-restructure' into 'develop'

chore(ci): CI Infrastructure Refactoring: Streamlining Deployment function, Logging, and docker images

See merge request oai/openairinterface5g!2770

ci-scripts/ci_infra.yaml

@@ -249,13 +249,13 @@ lte_oai_ue_carabe:
   MTU: 1500
 
 rfsim5g_gnb_nos1:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
   CmdPrefix: docker exec rfsim5g-oai-gnb
   IF: oaitun_enb1
 
 rfsim5g_ue:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue
   IF: oaitun_ue1
@@ -264,7 +264,7 @@ rfsim5g_ue:
   MTU: 1500
 
 rfsim5g_ue2:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue2
   IF: oaitun_ue1
@@ -273,7 +273,7 @@ rfsim5g_ue2:
   MTU: 1500
 
 rfsim5g_ue3:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue3 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue3
   IF: oaitun_ue1
@@ -282,7 +282,7 @@ rfsim5g_ue3:
   MTU: 1500
 
 rfsim5g_ue4:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue4 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue4
   IF: oaitun_ue1
@@ -291,7 +291,7 @@ rfsim5g_ue4:
   MTU: 1500
 
 rfsim5g_ue5:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue5 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue5
   IF: oaitun_ue1
@@ -300,7 +300,7 @@ rfsim5g_ue5:
   MTU: 1500
 
 rfsim5g_ue6:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue6 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue6
   IF: oaitun_ue1
@@ -309,7 +309,7 @@ rfsim5g_ue6:
   MTU: 1500
 
 rfsim5g_ue7:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue7 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue7
   IF: oaitun_ue1
@@ -318,7 +318,7 @@ rfsim5g_ue7:
   MTU: 1500
 
 rfsim5g_ue8:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue8 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue8
   IF: oaitun_ue1
@@ -327,7 +327,7 @@ rfsim5g_ue8:
   MTU: 1500
 
 rfsim5g_ue9:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue9 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue9
   IF: oaitun_ue1
@@ -336,7 +336,7 @@ rfsim5g_ue9:
   MTU: 1500
 
 rfsim5g_ue10:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-nr-ue10 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim5g-oai-nr-ue10
   IF: oaitun_ue1
@@ -345,12 +345,12 @@ rfsim5g_ue10:
   MTU: 1500
 
 rfsim5g_ext_dn:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
   CmdPrefix: docker exec rfsim5g-oai-ext-dn
 
 rfsim4g_ue:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
   CmdPrefix: docker exec rfsim4g-oai-lte-ue0
   IF: oaitun_ue1
@@ -359,30 +359,30 @@ rfsim4g_ue:
   MTU: 1500
 
 rfsim4g_ext_dn:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0
   CmdPrefix: docker exec rfsim4g-trf-gen
 
 rfsim4g_enb_nos1:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1
   CmdPrefix: docker exec rfsim4g-oai-enb
   IF: oaitun_enb1
 
 rfsim4g_enb_fembms:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enm1
   CmdPrefix: docker exec rfsim4g-oai-enb
   IF: oaitun_enm1
 
 rfsim4g_ue_fembms:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
   CmdPrefix: docker exec rfsim4g-oai-lte-ue0
   IF: oaitun_uem1
 
 l2sim5g_ue:
-  Host: localhost
+  Host: "%%current_host%%"
   AttachScript: docker start l2sim-oai-nr-ue0
   DetachScript: docker stop l2sim-oai-nr-ue0
   NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
@@ -391,12 +391,12 @@ l2sim5g_ue:
   MTU: 1500
 
 l2sim5g_ext_dn:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
   CmdPrefix: docker exec l2sim-oai-ext-dn
 
 l2sim4g_ue:
-  Host: localhost
+  Host: "%%current_host%%"
   AttachScript: docker start l2sim4g-oai-lte-ue1
   DetachScript: docker stop l2sim4g-oai-lte-ue1
   NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
@@ -405,6 +405,6 @@ l2sim4g_ue:
   MTU: 1500
 
 l2sim4g_ext_dn:
-  Host: localhost
+  Host: "%%current_host%%"
   NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
   CmdPrefix: docker exec l2sim4g-trf-gen

ci-scripts/cls_cluster.py

@@ -301,10 +301,7 @@ class Cluster:
 		self.testCase_id = HTML.testCase_id
 
 		# Workaround for some servers, we need to erase completely the workspace
-		if self.forcedWorkspaceCleanup:
-			self.cmd.run(f'rm -Rf {lSourcePath}')
-		cls_containerize.CreateWorkspace(self.cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-
+		self.cmd.cd(lSourcePath)
 		# to reduce the amount of data send to OpenShift, we
 		# manually delete all generated files in the workspace
 		self.cmd.run(f'rm -rf {lSourcePath}/cmake_targets/ran_build');

ci-scripts/cls_containerize.py

@@ -67,7 +67,7 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 
 	sshSession.command(f'rm -rf {sourcePath}', '\$', 10)
 	sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
-	sshSession.command('cd ' + sourcePath, '\$', 5)
+	(sshSession.cd(sourcePath) if isinstance(sshSession, cls_cmd.Cmd) else sshSession.command('cd ' + sourcePath, '\$', 5))
 	# Recent version of git (>2.20?) should handle missing .git extension # without problems
 	if ranTargetBranch == 'null':
 		ranTargetBranch = 'develop'
@@ -83,7 +83,9 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 	sshSession.command(f'git checkout -f {ranCommitID}', '\$', 30)
 	if sshSession.getBefore().count(f'HEAD is now at {ranCommitID[:6]}') != 1:
 		sshSession.command('git log --oneline | head -n5', '\$', 5)
-		logging.warning(f'problems during checkout, is at: {sshSession.getBefore()}')
+		logging.error(f'problems during checkout, is at: {sshSession.getBefore()}')
+		self.exitStatus = 1
+		HTML.CreateHtmlTestRowQueue('N/A', 'KO', "could not checkout correctly")
 	else:
 		logging.debug('successful checkout')
 	# if the branch is not develop, then it is a merge request and we need to do
@@ -169,6 +171,125 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo
 
+def GetCredentials(instance):
+    server_id = instance.eNB_serverId[instance.eNB_instance]
+    if server_id == '0':
+        return (instance.eNBIPAddress, instance.eNBUserName, instance.eNBPassword, instance.eNBSourceCodePath)
+    elif server_id == '1':
+        return (instance.eNB1IPAddress, instance.eNB1UserName, instance.eNB1Password, instance.eNB1SourceCodePath)
+    elif server_id == '2':
+        return (instance.eNB2IPAddress, instance.eNB2UserName, instance.eNB2Password, instance.eNB2SourceCodePath)
+    else:
+        raise Exception ("Only supports maximum of 3 servers")
+
+def GetContainerName(mySSH, svcName):
+	ret = mySSH.run(f"docker compose -f docker-compose.y*ml config --format json {svcName}  | jq -r '.services.\"{svcName}\".container_name'")
+	containerName = ret.stdout
+	return containerName
+
+def GetImageInfo(mySSH, containerName):
+	usedImage = ''
+	ret = mySSH.run('docker inspect --format="{{.Config.Image}}" ' + containerName)
+	usedImage = ret.stdout.strip()
+	logging.debug('Used image is: ' + usedImage)
+	if usedImage:
+		ret = mySSH.run('docker image inspect --format "* Size     = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id       = {{.Id}}" ' + usedImage)
+		imageInfo = f"Used image is {usedImage}\n{ret.stdout}\n"
+		return imageInfo
+	else:
+		return f"Could not retrieve used image info for {containerName}!\n"
+
+def GetContainerHealth(mySSH, containerName):
+    if containerName is None:
+        return 0, 0
+    unhealthyNb = 0
+    healthyNb = 0
+    time.sleep(5)
+    for _ in range(3):
+        if containerName != 'db_init':
+            result = mySSH.run(f'docker inspect --format="{{{{.State.Health.Status}}}}" {containerName}')
+            unhealthyNb = result.stdout.count('unhealthy')
+            healthyNb = result.stdout.count('healthy') - unhealthyNb
+            if healthyNb == 1:
+                break
+            else:
+                time.sleep(10)
+        else:
+            unhealthyNb = 0
+            healthyNb = 1
+            break
+    return healthyNb, unhealthyNb
+
+def ReTagImages(mySSH,IMAGES,ranCommitID,ranBranch,ranAllowMerge,displayedNewTags):
+	mySSH.run('cp docker-compose.y*ml ci-docker-compose.yml', 5)
+	for image in IMAGES:
+		imageTag = ImageTagToUse(image, ranCommitID, ranBranch, ranAllowMerge)
+		if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup':
+				ret = mySSH.run(f'docker image inspect oai-ci/{imageTag}', reportNonZero=False, silent=False)
+				if ret.returncode != 0:
+						imageTag = imageTag.replace('oai-gnb', 'oai-gnb-asan')
+						imageTag = imageTag.replace('oai-nr-ue', 'oai-nr-ue-asan')
+						imageTag = imageTag.replace('oai-nr-cuup', 'oai-nr-cuup-asan')
+						if not displayedNewTags:
+								logging.debug(f'\u001B[1m Using sanitized version of {image} with {imageTag}\u001B[0m')
+		mySSH.run(f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{imageTag}@" ci-docker-compose.yml',silent=True)
+
+def DeployServices(mySSH,svcName):
+	allServices = []
+	if svcName == '':
+		logging.warning('No service name given: starting all services in ci-docker-compose.yml!')
+		ret = mySSH.run(f'docker compose -f ci-docker-compose.yml config --services')
+		allServices = ret.stdout.splitlines()
+	deployStatus = mySSH.run(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', 50)
+	return deployStatus.returncode,allServices
+
+def CopyinContainerLog(mySSH,lSourcePath,ymlPath,containerName,filename):
+	logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[2]}'
+	os.system(f'mkdir -p {logPath}')
+	mySSH.run(f'docker logs {containerName} > {lSourcePath}/cmake_targets/log/{filename} 2>&1')
+	copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', os.path.join(logPath, filename))
+	return copyin_res
+
+def GetRunningServices(mySSH,yamlDir):
+	ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml config --services')
+	allServices = ret.stdout.splitlines()
+	services = []
+	for s in allServices:
+		# outputs the hash if the container is running
+		ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
+		c = ret.stdout
+		logging.debug(f'running service {s} with container id {c}')
+		if ret.stdout != "" and ret.returncode == 0: # something is running for that service
+			services.append((s, c))
+	logging.info(f'stopping services {[s for s, _ in services]}')
+	return services
+
+def CheckLogs(self,mySSH,ymlPath,service_name,HTML,RAN):
+	logPath = f'{os.getcwd()}/../cmake_targets/log/{ymlPath[2]}'
+	filename = f'{logPath}/{service_name}-{HTML.testCase_id}.log'
+	isFailed = 0
+	if (any(sub in service_name for sub in ['oai_ue','oai-nr-ue','lte_ue'])):
+		logging.debug(f'\u001B[1m Analyzing UE logfile {filename} \u001B[0m')
+		logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(filename, HTML, RAN)
+		if (logStatus < 0):
+			HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
+			isFailed = 1
+		else:
+			HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
+	elif service_name == 'nv-cubb':
+		msg = 'Undeploy PNF/Nvidia CUBB'
+		HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
+	elif (any(sub in service_name for sub in ['enb','rru','rcc','cu','du','gnb'])):
+		logging.debug(f'\u001B[1m Analyzing XnB logfile {filename}\u001B[0m')
+		logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
+		if (logStatus < 0):
+			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
+			isFailed = 1
+		else:
+			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+	else:
+		logging.info(f'Skipping to analyze log for service name {service_name}')
+	return isFailed
 # pyshark livecapture launches 2 processes:
 # * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
 # * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
@@ -325,14 +446,8 @@ class Containerize():
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu22.cross-arm64'
 		
-		# Workaround for some servers, we need to erase completely the workspace
-		if self.forcedWorkspaceCleanup:
-			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
-	
 		self.testCase_id = HTML.testCase_id
-	
-		CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-
+		cmd.cd(lSourcePath)
 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
 			cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
@@ -532,7 +647,7 @@ class Containerize():
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
 		self.ranTargetBranch = 'master'
-		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		mySSH.command('cd ' +lSourcePath, '\$', 3)
 		# to prevent accidentally overwriting data that might be used later
 		self.ranCommitID = oldRanCommidID
 		self.ranRepository = oldRanRepository
@@ -862,7 +977,7 @@ class Containerize():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
 
-	def DeployObject(self, HTML, EPC):
+	def Create_Workspace(self,HTML):
 		if self.eNB_serverId[self.eNB_instance] == '0':
 			lIpAddr = self.eNBIPAddress
 			lUserName = self.eNBUserName
@@ -881,333 +996,76 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
-		self.deployKind[self.eNB_instance] = True
-
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-
-		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		
+		logging.info(f"Running on server {lIpAddr}")
+		sshSession = cls_cmd.getConnection(lIpAddr)
 
-		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-		mySSH.command('cp docker-compose.y*ml ci-docker-compose.yml', '\$', 5)
-		for image in IMAGES:
-			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2)
-
-		# Currently support only one
-		svcName = self.services[self.eNB_instance]
-		if svcName == '':
-			logging.warning('no service name given: starting all services in ci-docker-compose.yml!')
-
-		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
-
-		# Checking Status
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {svcName}', '\$', 5)
-		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
-		unhealthyNb = 0
-		healthyNb = 0
-		startingNb = 0
-		containerName = ''
-		usedImage = ''
-		imageInfo = ''
-		if result is not None:
-			containerName = result.group('container_name')
-			time.sleep(5)
-			cnt = 0
-			while (cnt < 3):
-				mySSH.command('docker inspect --format="{{.State.Health.Status}}" ' + containerName, '\$', 5)
-				unhealthyNb = mySSH.getBefore().count('unhealthy')
-				healthyNb = mySSH.getBefore().count('healthy') - unhealthyNb
-				startingNb = mySSH.getBefore().count('starting')
-				if healthyNb == 1:
-					cnt = 10
-				else:
-					time.sleep(10)
-					cnt += 1
-
-			mySSH.command('docker inspect --format="ImageUsed: {{.Config.Image}}" ' + containerName, '\$', 5)
-			for stdoutLine in mySSH.getBefore().split('\n'):
-				if stdoutLine.count('ImageUsed: oai-ci'):
-					usedImage = stdoutLine.replace('ImageUsed: oai-ci', 'oai-ci').strip()
-					logging.debug('Used image is ' + usedImage)
-			if usedImage != '':
-				mySSH.command('docker image inspect --format "* Size     = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id       = {{.Id}}" ' + usedImage, '\$', 5, silent=True)
-				for stdoutLine in mySSH.getBefore().split('\n'):
-					if re.search('Size     = [0-9]', stdoutLine) is not None:
-						imageInfo += stdoutLine.strip() + '\n'
-					if re.search('Creation = [0-9]', stdoutLine) is not None:
-						imageInfo += stdoutLine.strip() + '\n'
-					if re.search('Id       = sha256', stdoutLine) is not None:
-						imageInfo += stdoutLine.strip() + '\n'
-		logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)')
-		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
-		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')
+		CreateWorkspace(sshSession, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
-		self.testCase_id = HTML.testCase_id
-		self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log'
-
-		status = False
-		if healthyNb == 1:
-			cnt = 0
-			while (cnt < 20):
-				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting|ready"', '\$', 30)
-				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured|cuPHYController initialized|Received CONFIG.response, gNB is ready', mySSH.getBefore())
-				if result is None:
-					time.sleep(6)
-					cnt += 1
-				else:
-					cnt = 100
-					status = True
-					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
-		else:
-			# containers are unhealthy, so we won't start. However, logs are stored at the end
-			# in UndeployObject so we here store the logs of the unhealthy container to report it
-			logfilename = f'{lSourcePath}/cmake_targets/log/{self.eNB_logFile[self.eNB_instance]}'
-			mySSH.command(f'docker logs {containerName} > {logfilename}', '\$', 30)
-			mySSH.copyin(lIpAddr, lUserName, lPassWord, logfilename, '.')
+	def DeployObject(self, HTML, EPC):
+		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
+		self.deployKind[self.eNB_instance] = True
+		mySSH = cls_cmd.getConnection(lIpAddr, f'{lSourcePath}/{self.yamlPath[self.eNB_instance]}')
+		logging.info(f'Current working directory: {lSourcePath}/{self.yamlPath[self.eNB_instance]}')
+		ReTagImages(mySSH,IMAGES,self.ranCommitID, self.ranBranch, self.ranAllowMerge, self.displayedNewTags)
+		deployStatus,allServices = DeployServices(mySSH,self.services[self.eNB_instance])
+		if deployStatus != 0:
+			mySSH.close()
+			self.exitStatus = 1
+			logging.error('Could not deploy')
+			HTML.CreateHtmlTestRow('Could not deploy', 'KO', CONST.ALL_PROCESSES_OK)
+			return
+		services_list = allServices if self.services[self.eNB_instance].split() == [] else self.services[self.eNB_instance].split()
+		status = True
+		imagesInfo=""
+		for svcName in services_list:
+			containerName = GetContainerName(mySSH, svcName)
+			healthyNb,unhealthyNb = GetContainerHealth(mySSH,containerName)
+			self.testCase_id = HTML.testCase_id
+			self.eNB_logFile[self.eNB_instance] = f'{svcName}-{self.testCase_id}.log'
+			if unhealthyNb: 
+				logging.warning(f"Deployment Failed: Trying to copy container logs {self.eNB_logFile[self.eNB_instance]}")
+				CopyinContainerLog(mySSH,lSourcePath,self.yamlPath[0].split('/'),containerName,self.eNB_logFile[self.eNB_instance])
+				status = False
+			imagesInfo += (GetImageInfo(mySSH, containerName))
 		mySSH.close()
-
-		message = ''
-		if usedImage != '':
-			message += f'Used Image = {usedImage} :\n'
-			message += imageInfo
-		else:
-			message += 'Could not retrieve used image info!\n'
-		if status:
-			message += '\nHealthy deployment!\n'
-		else:
-			message += '\nUnhealthy deployment! -- Check logs for reason!\n'
+		imagesInfo += ("\n")
 		if status:
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [message])
+			imagesInfo += ("Healthy deployment!")
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [(imagesInfo)])
 		else:
 			self.exitStatus = 1
-			HTML.CreateHtmlTestRowQueue('N/A', 'KO', [message])
-
+			imagesInfo += ("Unhealthy deployment! -- Check logs for reason!")
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', [(imagesInfo)])
 
 	def UndeployObject(self, HTML, RAN):
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
+		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
 		mySSH = cls_cmd.getConnection(lIpAddr)
 		yamlDir = f'{lSourcePath}/{self.yamlPath[self.eNB_instance]}'
-		mySSH.run(f'cd {yamlDir}')
-		svcName = self.services[self.eNB_instance]
-		forceDown = False
-		if svcName != '':
-			logging.warning(f'service name given, but will stop all services in ci-docker-compose.yml!')
-			svcName = ''
-
-		ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml config --services')
-		if ret.returncode != 0:
-			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', "cannot enumerate running services")
-			self.exitStatus = 1
-			return
-		# first line has command, last line has next command prompt
-		allServices = ret.stdout.splitlines()
-		services = []
-		for s in allServices:
-			# outputs the hash if the container is running
-			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
-			c = ret.stdout
-			logging.debug(f'running service {s} with container id {c}')
-			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
-				services.append((s, c))
-		logging.info(f'stopping services {[s for s, _ in services]}')
-
+		services = GetRunningServices(mySSH, yamlDir)
 		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
 		copyin_res = True
-		for service_name, container_id in services:
-			# head -n -1 suppresses the final "X exited with status code Y"
-			filename = f'{service_name}-{HTML.testCase_id}.log'
-			mySSH.run(f'docker logs {container_id} &> {lSourcePath}/cmake_targets/log/{filename}')
-			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res
-
+		copyin_res = all(CopyinContainerLog(mySSH, lSourcePath, self.yamlPath[0].split('/'), container_id, f'{service_name}-{HTML.testCase_id}.log') for service_name, container_id in services)
 		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')
-
-		# Analyzing log file!
 		if not copyin_res:
 			HTML.htmleNBFailureMsg='Could not copy logfile(s) to analyze it!'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
-		# use function for UE log analysis, when oai-nr-ue container is used
-		elif any(service_name == 'oai-nr-ue' or service_name == 'lte_ue0' for service_name, _ in services):
-			self.exitStatus == 0
-			logging.debug(f'Analyzing UE logfile {filename}')
-			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
-			if (logStatus < 0):
-				HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
-				self.exitStatus = 1
-			else:
-				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
-			for service_name, _ in services:
-				if service_name == 'nv-cubb':
-					msg = 'Undeploy PNF/Nvidia CUBB'
-					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
-				else:
-					filename = f'{service_name}-{HTML.testCase_id}.log'
-					logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
-					logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
-					if (logStatus < 0):
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
-						self.exitStatus = 1
-					else:
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
-			# all the xNB run logs shall be on the server 0 for logCollecting
-			if self.eNB_serverId[self.eNB_instance] != '0':
-				mySSH.copyout(f'./*.log', f'{lSourcePath}/cmake_targets/', recursive=True)
-		if self.exitStatus == 0:
-			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
-		else:
-			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
+			log_results = [CheckLogs(self, mySSH, self.yamlPath[0].split('/'), service_name, HTML, RAN) for service_name, _ in services]
+			self.exitStatus = 1 if any(log_results) else 0
+			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m') if self.exitStatus == 0 else logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
 		mySSH.close()
 
-	def DeployGenObject(self, HTML, RAN, UE):
-		self.exitStatus = 0
-		logging.debug('\u001B[1m Checking Services to deploy\u001B[0m')
-		# Implicitly we are running locally
-		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
-		self.deployKind[0] = False
-		cmd = 'docker-compose config --services'
-		listServices = myCmd.run(cmd)
-		if listServices.returncode != 0:
-			myCmd.close()
-			self.exitStatus = 1
-			HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK)
-			return
-		for reqSvc in self.services[0].split(' '):
-			res = re.search(reqSvc, listServices.stdout)
-			if res is None:
-				logging.error(reqSvc + ' not found in specified docker-compose')
-				self.exitStatus = 1
-		if (self.exitStatus == 1):
-			myCmd.close()
-			HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK)
-			return
-		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
-		myCmd.run(cmd, silent=self.displayedNewTags)
-		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
-		for image in imageNames:
-			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			# In the scenario, for 5G images, we have the choice of either pulling normal images
-			# or -asan images. We need to detect which kind we did pull.
-			if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup':
-				ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False, silent=self.displayedNewTags)
-				if ret.returncode != 0:
-					tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan')
-					tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan')
-					tagToUse = tagToUse.replace('oai-nr-cuup', 'oai-nr-cuup-asan')
-					if not self.displayedNewTags:
-						logging.debug(f'\u001B[1m Using sanitized version of {image} with {tagToUse}\u001B[0m')
-			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
-			myCmd.run(cmd, silent=self.displayedNewTags)
-		self.displayedNewTags = True
-
-		cmd = f'docker-compose -f docker-compose-ci.yml up -d {self.services[0]}'
-		deployStatus = myCmd.run(cmd, timeout=100)
-		if deployStatus.returncode != 0:
-			myCmd.close()
-			self.exitStatus = 1
-			logging.error('Could not deploy')
-			HTML.CreateHtmlTestRow('Could not deploy', 'KO', CONST.ALL_PROCESSES_OK)
-			return
-
-		logging.debug('\u001B[1m Checking if all deployed healthy\u001B[0m')
-		cmd = 'docker-compose -f docker-compose-ci.yml ps -a'
-		count = 0
-		healthy = 0
-		restarting = 0
-		newContainers = []
-		while (count < 10):
-			count += 1
-			containerStatus = []
-			deployStatus = myCmd.run(cmd, 30, silent=True)
-			healthy = 0
-			restarting = 0
-			for state in deployStatus.stdout.split('\n'):
-				state = state.strip()
-				res = re.search('Name|NAME|----------', state)
-				if res is not None:
-					continue
-				if len(state) == 0:
-					continue
-				res = re.search('^(?P<container_name>[a-zA-Z0-9\-\_]+) ', state)
-				if res is not None:
-					cName = res.group('container_name')
-					found = False
-					for alreadyDeployed in self.deployedContainers:
-						if cName == alreadyDeployed:
-							found = True
-					if not found:
-						newContainers.append(cName)
-						self.deployedContainers.append(cName)
-				if re.search('\(healthy\)', state) is not None:
-					healthy += 1
-				if re.search('rfsim4g-db-init.*Exit 0', state) is not None or re.search('rfsim4g-db-init.*Exited \(0\)', state) is not None:
-					myCmd.run('docker rm -f rfsim4g-db-init', timeout=30, silent=True, reportNonZero=False)
-				if re.search('l2sim4g-db-init.*Exit 0', state) is not None or re.search('l2sim4g-db-init.*Exited \(0\)', state) is not None:
-					myCmd.run('docker rm -f l2sim4g-db-init', timeout=30, silent=True, reportNonZero=False)
-				if re.search('Restarting', state) is None:
-					containerStatus.append(state)
-				else:
-					restarting += 1
-			if healthy == self.nb_healthy[0] and restarting == 0:
-				count = 100
-			else:
-				time.sleep(10)
-
-		html_cell = ''
-		for newCont in newContainers:
-			if newCont == 'rfsim4g-db-init':
-				continue
-			cmd = 'docker inspect -f "{{.Config.Image}}" ' + newCont
-			imageInspect = myCmd.run(cmd, timeout=30, silent=True)
-			imageName = str(imageInspect.stdout).strip()
-			cmd = 'docker image inspect --format \'{{.RepoTags}}\t{{.Size}} bytes\t{{index (split .Created ".") 0}}\n{{.Id}}\' ' + imageName
-			imageInspect = myCmd.run(cmd, 30, silent=True)
-			html_cell += imageInspect.stdout + '\n'
-		myCmd.close()
-
-		for cState in containerStatus:
-			html_cell += cState + '\n'
-		if count == 100 and healthy == self.nb_healthy[0]:
-			if self.tsharkStarted == False:
-				logging.debug('Starting tshark on public network')
-				self.CaptureOnDockerNetworks()
-			HTML.CreateHtmlTestRowQueue('n/a', 'OK', [html_cell])
-			for cState in containerStatus:
-				logging.debug(cState)
-			logging.info('\u001B[1m Deploying OAI Object(s) PASS\u001B[0m')
-		else:
-			HTML.CreateHtmlTestRowQueue('Could not deploy in time', 'KO', [html_cell])
-			for cState in containerStatus:
-				logging.debug(cState)
-			logging.error('\u001B[1m Deploying OAI Object(s) FAILED\u001B[0m')
-			HTML.testCase_id = 'AUTO-UNDEPLOY'
-			UE.testCase_id = 'AUTO-UNDEPLOY'
-			HTML.desc = 'Automatic Undeployment'
-			UE.desc = 'Automatic Undeployment'
-			UE.ShowTestID()
-			self.UndeployGenObject(HTML, RAN, UE)
-			self.exitStatus = 1
-
 	def CaptureOnDockerNetworks(self):
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'docker-compose -f docker-compose-ci.yml config | grep com.docker.network.bridge.name | sed -e "s@^.*name: @@"'
@@ -1236,116 +1094,6 @@ class Containerize():
 		x.daemon = True
 		x.start()
 
-	def UndeployGenObject(self, HTML, RAN, UE):
-		self.exitStatus = 0
-		# Implicitly we are running locally
-		ymlPath = self.yamlPath[0].split('/')
-		logPath = '../cmake_targets/log/' + ymlPath[1]
-		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
-		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
-		myCmd.run(cmd)
-
-		# check which containers are running for log recovery later
-		cmd = 'docker-compose -f docker-compose-ci.yml ps --all'
-		deployStatusLogs = myCmd.run(cmd, timeout=30)
-
-		# Stop the containers to shut down objects
-		logging.debug('\u001B[1m Stopping containers \u001B[0m')
-		cmd = 'docker-compose -f docker-compose-ci.yml stop -t3'
-		deployStatus = myCmd.run(cmd, timeout=100)
-		if deployStatus.returncode != 0:
-			myCmd.close()
-			self.exitStatus = 1
-			logging.error('Could not stop containers')
-			HTML.CreateHtmlTestRow('Could not stop', 'KO', CONST.ALL_PROCESSES_OK)
-			logging.error('\u001B[1m Undeploying OAI Object(s) FAILED\u001B[0m')
-			return
-
-		anyLogs = False
-		logging.debug('Working dir is now . (ie ci-scripts)')
-		myCmd2 = cls_cmd.LocalCmd()
-		myCmd2.run(f'mkdir -p {logPath}')
-		myCmd2.cd(logPath)
-		for state in deployStatusLogs.stdout.split('\n'):
-			res = re.search('Name|NAME|----------', state)
-			if res is not None:
-				continue
-			if len(state) == 0:
-				continue
-			res = re.search('^(?P<container_name>[a-zA-Z0-9\-\_]+) ', state)
-			if res is not None:
-				anyLogs = True
-				cName = res.group('container_name')
-				cmd = f'docker logs {cName} > {cName}.log 2>&1'
-				myCmd2.run(cmd, timeout=30, reportNonZero=False)
-				if re.search('magma-mme', cName) is not None:
-					cmd = f'docker cp -L {cName}:/var/log/mme.log {cName}-full.log'
-					myCmd2.run(cmd, timeout=30, reportNonZero=False)
-		fullStatus = True
-		if anyLogs:
-			# Analyzing log file(s)!
-			listOfPossibleRanContainers = ['enb*', 'gnb*', 'cu*', 'du*']
-			for container in listOfPossibleRanContainers:
-				filenames = './*-oai-' + container + '.log'
-				cmd = f'ls {filenames}'
-				lsStatus = myCmd2.run(cmd, silent=True, reportNonZero=False)
-				if lsStatus.returncode != 0:
-					continue
-				filenames = str(lsStatus.stdout).strip()
-
-				for filename in filenames.split('\n'):
-					logging.debug('\u001B[1m Analyzing xNB logfile ' + filename + ' \u001B[0m')
-					logStatus = RAN.AnalyzeLogFile_eNB(f'{logPath}/{filename}', HTML, self.ran_checkers)
-					if (logStatus < 0):
-						fullStatus = False
-						self.exitStatus = 1
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
-					else:
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
-
-			listOfPossibleUeContainers = ['lte-ue*', 'nr-ue*']
-			for container in listOfPossibleUeContainers:
-				filenames = './*-oai-' + container + '.log'
-				cmd = f'ls {filenames}'
-				lsStatus = myCmd2.run(cmd, silent=True, reportNonZero=False)
-				if lsStatus.returncode != 0:
-					continue
-				filenames = str(lsStatus.stdout).strip()
-
-				for filename in filenames.split('\n'):
-					logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
-					logStatus = UE.AnalyzeLogFile_UE(f'{logPath}/{filename}', HTML, RAN)
-					if (logStatus < 0):
-						fullStatus = False
-						self.exitStatus = 1
-						HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
-					else:
-						HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
-		myCmd2.close()
-		if self.tsharkStarted:
-			self.tsharkStarted = StopPySharkCapture(ymlPath[1])
-		logging.debug('\u001B[1m Undeploying \u001B[0m')
-		logging.debug(f'Working dir is back {self.yamlPath[0]}')
-		cmd = 'docker-compose -f docker-compose-ci.yml down -v'
-		deployStatus = myCmd.run(cmd, timeout=100)
-		if deployStatus.returncode != 0:
-			myCmd.close()
-			self.exitStatus = 1
-			logging.error('Could not undeploy')
-			HTML.CreateHtmlTestRow('Could not undeploy', 'KO', CONST.ALL_PROCESSES_OK)
-			logging.error('\u001B[1m Undeploying OAI Object(s) FAILED\u001B[0m')
-			return
-
-		self.deployedContainers = []
-		myCmd.close()
-
-		if fullStatus:
-			HTML.CreateHtmlTestRow('n/a', 'OK', CONST.ALL_PROCESSES_OK)
-			logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m')
-		else:
-			HTML.CreateHtmlTestRow('n/a', 'KO', CONST.ALL_PROCESSES_OK)
-			logging.error('\u001B[1m Undeploying OAI Object(s) FAIL\u001B[0m')
-
 	def StatsFromGenObject(self, HTML):
 		self.exitStatus = 0
 		ymlPath = self.yamlPath[0].split('/')

ci-scripts/cls_module.py

@@ -41,14 +41,18 @@ import cls_cmd
 
 class Module_UE:
 
-	def __init__(self, module_name, filename="ci_infra.yaml"):
+	def __init__(self, module_name, node=None, filename="ci_infra.yaml"):
 		with open(filename, 'r') as f:
 			all_ues = yaml.load(f, Loader=yaml.FullLoader)
 			m = all_ues.get(module_name)
 			if m is None:
 				raise Exception(f'no such module name "{module_name}" in "{filename}"')
 			self.module_name = module_name
-			self.host = m['Host']
+			self.host = m['Host'] if m['Host'] != "%%current_host%%" else None
+			if node is None and self.host is None:
+				raise Exception(f'node not provided when needed')
+			elif node is not None and self.host is None:
+				self.host = node
 			self.cmd_dict = {
 				"attach": m.get('AttachScript'),
 				"detach": m.get('DetachScript'),

ci-scripts/cls_oaicitest.py

@@ -280,6 +280,8 @@ class OaiCiTest():
 		self.clean_repository = True
 		self.air_interface=''
 		self.ue_ids = []
+		self.nodes = []
+		self.svr_node = None
 		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
@@ -606,7 +608,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AttachUE(self, HTML, RAN, EPC, CONTAINERS):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -621,7 +623,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML, RAN, EPC, CONTAINERS)
 
 	def DetachUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -662,7 +664,7 @@ class OaiCiTest():
 			messages = [f.result() for f in futures]
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
-	def Ping_common(self, EPC, ue, RAN, printLock):
+	def Ping_common(self, EPC, ue, RAN, CONTAINERS, printLock):
 		# Launch ping on the EPC side (true for ltebox and old open-air-cn)
 		ping_status = 0
 		ueIP = ue.getIP()
@@ -670,7 +672,11 @@ class OaiCiTest():
 			return (False, f"UE {ue.getName()} has no IP address")
 		ping_log_file = f'ping_{self.testCase_id}_{ue.getName()}.log'
 		ping_time = re.findall("-c *(\d+)",str(self.ping_args))
-		local_ping_log_file = f'{os.getcwd()}/{ping_log_file}'
+		# Creating destination log folder if needed on the python executor workspace
+		ymlPath = CONTAINERS.yamlPath[0].split('/')
+		logPath = f'../cmake_targets/log/{ymlPath[2]}'
+		os.system(f'mkdir -p {logPath}')
+		local_ping_log_file = f'{logPath}/{ping_log_file}'
 		# if has pattern %cn_ip%, replace with core IP address, else we assume the IP is present
 		if re.search('%cn_ip%', self.ping_args):
 			#target address is different depending on EPC type
@@ -757,12 +763,11 @@ class OaiCiTest():
 
 		if self.ue_ids == []:
 			raise Exception("no module names in self.ue_ids provided")
-
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		logging.debug(ues)
 		pingLock = Lock()
 		with concurrent.futures.ThreadPoolExecutor() as executor:
-			futures = [executor.submit(self.Ping_common, EPC, ue, RAN, pingLock) for ue in ues]
+			futures = [executor.submit(self.Ping_common, EPC, ue, RAN, CONTAINERS, pingLock) for ue in ues]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -788,7 +793,9 @@ class OaiCiTest():
 		bidirIperf = re.search('--bidir', iperf_opt) is not None
 		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
 		ymlPath = CONTAINERS.yamlPath[0].split('/')
-		logPath = f'../cmake_targets/log/{ymlPath[1]}'
+		logPath = f'../cmake_targets/log/{ymlPath[2]}'
+		# Creating destination log folder if needed on the python executor workspace
+		os.system(f'mkdir -p {logPath}')
 		if udpIperf:
 			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
 			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
@@ -845,9 +852,8 @@ class OaiCiTest():
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
-		svr = cls_module.Module_UE(self.svr_id)
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
+		svr = cls_module.Module_UE(self.svr_id,self.svr_node)
 		logging.debug(ues)
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(self.Iperf_Module, EPC, ue, svr, RAN, i, len(ues), CONTAINERS) for i, ue in enumerate(ues)]
@@ -863,8 +869,8 @@ class OaiCiTest():
 	def Iperf2_Unidir(self,HTML,RAN,EPC,CONTAINERS):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip())
-		svr = cls_module.Module_UE(self.svr_id)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip())
+		svr = cls_module.Module_UE(self.svr_id,self.svr_node)
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
@@ -901,9 +907,9 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
-		if (not os.path.isfile(f'./{UElogFile}')):
+		if (not os.path.isfile(f'{UElogFile}')):
 			return -1
-		ue_log_file = open(f'./{UElogFile}', 'r')
+		ue_log_file = open(f'{UElogFile}', 'r')
 		exitSignalReceived = False
 		foundAssertion = False
 		msgAssertion = ''

ci-scripts/cls_static_code_analysis.py

@@ -105,8 +105,7 @@ class StaticCodeAnalysis():
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
 
-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-
+		cmd.cd(lSourcePath)
 		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')

ci-scripts/main.py

@@ -217,6 +217,13 @@ def GetParametersFromXML(action):
 
 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
+		if test.findtext('nodes'):
+			CiTestObj.nodes = test.findtext('nodes').split(' ')
+			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+				logging.error('Number of Nodes are not equal to the total number of UEs')
+				sys.exit("Mismatch in number of Nodes and UIs")
+		else:
+			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 
 	elif action == 'Build_OAI_UE':
 		CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
@@ -263,12 +270,28 @@ def GetParametersFromXML(action):
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
+		if test.findtext('nodes'):
+			CiTestObj.nodes = test.findtext('nodes').split(' ')
+			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+				logging.error('Number of Nodes are not equal to the total number of UEs')
+				sys.exit("Mismatch in number of Nodes and UIs")
+		else:
+			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
 
-	elif action == 'Iperf':
+	elif action == 'Iperf' or action == 'Iperf2_Unidir':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
 		CiTestObj.svr_id = test.findtext('svr_id') or None
+		if test.findtext('nodes'):
+			CiTestObj.nodes = test.findtext('nodes').split(' ')
+			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+				logging.error('Number of Nodes are not equal to the total number of UEs')
+				sys.exit("Mismatch in number of Nodes and UIs")
+		else:
+			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
+		if test.findtext('svr_node'):
+			CiTestObj.svr_node = test.findtext('svr_node')
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
 		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
 		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
@@ -345,7 +368,7 @@ def GetParametersFromXML(action):
 			EPC.cfgUnDeploy = string_field	
 		EPC.cnID = test.findtext('cn_id')
 
-	elif action == 'Deploy_Object' or action == 'Undeploy_Object':
+	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
 		eNB_instance=test.findtext('eNB_instance')
 		if (eNB_instance is None):
 			CONTAINERS.eNB_instance=0
@@ -369,23 +392,6 @@ def GetParametersFromXML(action):
 		if string_field is not None:
 			CONTAINERS.services[CONTAINERS.eNB_instance] = string_field
 
-	elif action == 'DeployGenObject' or action == 'UndeployGenObject' or action == 'StatsFromGenObject':
-		string_field=test.findtext('yaml_path')
-		if (string_field is not None):
-			CONTAINERS.yamlPath[0] = string_field
-		string_field=test.findtext('services')
-		if (string_field is not None):
-			CONTAINERS.services[0] = string_field
-		string_field=test.findtext('nb_healthy')
-		if (string_field is not None):
-			CONTAINERS.nb_healthy[0] = int(string_field)
-		string_field=test.findtext('d_retx_th')
-		if (string_field is not None):
-			CONTAINERS.ran_checkers['d_retx_th'] = [float(x) for x in string_field.split(',')]
-		string_field=test.findtext('u_retx_th')
-		if (string_field is not None):
-			CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
-
 	elif action == 'Run_CUDATest' or action == 'Run_NRulsimTest' or action == 'Run_T2Test':
 		ldpc.runargs = test.findtext('physim_run_args')
 		ldpc.runsim = test.findtext('physim_run')
@@ -546,10 +552,14 @@ elif re.match('^LogCollecteNB$', mode, re.IGNORECASE):
 	if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '':
 		HELP.GenericHelp(CONST.Version)
 		sys.exit('Insufficient Parameter')
-	if RAN.eNBIPAddress == 'none':
+	if os.path.isdir('cmake_targets/log'):
 		cmd = 'zip -r enb.log.' + RAN.BuildId + '.zip cmake_targets/log'
 		logging.info(cmd)
-		zipStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=60)
+		try:
+			zipStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=60)
+		except subprocess.CalledProcessError as e:
+			logging.error("Command '{}' returned non-zero exit status {}.".format(e.cmd, e.returncode))
+			logging.error("Error output:\n{}".format(e.output))
 		sys.exit(0)
 	RAN.LogCollecteNB()
 elif re.match('^LogCollectHSS$', mode, re.IGNORECASE):
@@ -852,6 +862,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 						success = CONTAINERS.Clean_Test_Server_Images(HTML)
 						if not success:
 							RAN.prematureExit = True
+					elif action == 'Create_Workspace':
+						CONTAINERS.Create_Workspace(HTML)
 					elif action == 'Deploy_Object':
 						CONTAINERS.DeployObject(HTML, EPC)
 						if CONTAINERS.exitStatus==1:
@@ -870,20 +882,10 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 							RAN.prematureExit = True
 					elif action == 'Deploy_Run_PhySim':
 						PHYSIM.Deploy_PhySim(HTML, RAN)
-					elif action == 'DeployGenObject':
-						CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'UndeployGenObject':
-						CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
 					elif action == 'IperfFromContainer':
 						CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
 						if CONTAINERS.exitStatus==1:
 							RAN.prematureExit = True
-					elif action == 'StatsFromGenObject':
-						CONTAINERS.StatsFromGenObject(HTML)
 					elif action == 'Push_Images_To_Test_Servers':
 						logging.debug('To be implemented')
 					else:

ci-scripts/xml_class_list.yml

@@ -48,3 +48,4 @@
   - Pull_Local_Registry
   - Clean_Test_Server_Images
   - Custom_Command
+  - Create_Workspace

ci-scripts/xml_files/cluster_image_build.xml

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

ci-scripts/xml_files/container_4g_l2sim_proxy.xml

@@ -26,10 +26,16 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
+ 100001
  000001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
-
+        <testCase id="100001">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>1</eNB_instance>
+                <eNB_serverId>1</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>Build_Proxy</class>
                 <desc>Build L2sim Proxy Image</desc>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -27,18 +27,16 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000000
  000001
  000002
  000003
  000004
- 200000
  020001
  020002
  030011
  030012
- 200001
  100001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -49,49 +47,60 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000000">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy Cassandra Database</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
                 <services>cassandra db_init</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G CoreNetwork</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
                 <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB L2 sim</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
                 <services>oai_enb</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI L2 sim 4G LTE-UE 1 and Proxy</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
                 <services>proxy oai_ue1</services>
-                <nb_healthy>10</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000004">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE</desc>
                 <id>l2sim4g_ue</id>
+                <nodes>obelix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping trf-gen from LTE-UE 1</desc>
                 <id>l2sim4g_ue</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 192.168.61.11</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -100,6 +109,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE 1 from trf-gen</desc>
                 <id>l2sim4g_ext_dn</id>
+                <nodes>obelix</nodes>
                 <ping_args>-c 20 12.0.0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -108,7 +118,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP Downlink</desc>
                 <id>l2sim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>l2sim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 1M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -118,28 +130,18 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP Uplink</desc>
                 <id>l2sim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>l2sim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 3M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
-        </testCase>
-
-        <testCase id="200000">
-                <class>StatsFromGenObject</class>
-                <desc>Statistics before Traffic Test</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
-        </testCase>
-
-        <testCase id="200001">
-                <class>StatsFromGenObject</class>
-                <desc>Statistics after Traffic Test</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000011
  000001
  000012
@@ -42,7 +42,12 @@
  100011
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="111111">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
@@ -51,11 +56,12 @@
         </testCase>
 
         <testCase id="000011">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy Cassandra Database</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
                 <services>cassandra db_init</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
@@ -71,39 +77,44 @@
         </testCase>
 
         <testCase id="000012">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G CoreNetwork</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
                 <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>9</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000015">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 192.168.61.11</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -113,6 +124,7 @@
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
                 <ping_args>-c 20 12.0.0.2</ping_args>
+                <nodes>obelix</nodes>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
@@ -124,6 +136,8 @@
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <nodes>obelix</nodes>
+                <svr_node>obelix</svr_node>
         </testCase>
 
         <testCase id="030011">
@@ -134,12 +148,16 @@
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <nodes>obelix</nodes>
+                <svr_node>obelix</svr_node>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100011
+800813
  000013
  000002
  000014
@@ -45,7 +45,12 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>IdleSleep</class>
                 <desc>Sleep</desc>
@@ -59,25 +64,28 @@
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (FDD 05MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (FDD 05MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>2</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 10.0.1.1</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -86,6 +94,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from eNB</desc>
                 <id>rfsim4g_enb_nos1</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 10.0.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -94,7 +103,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -104,16 +115,20 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000011
  000001
  000012
@@ -49,13 +49,19 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000011">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy Cassandra Database</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
                 <services>cassandra db_init</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
@@ -71,39 +77,44 @@
         </testCase>
 
         <testCase id="000012">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G CoreNetwork</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
                 <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (FDD 10MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (FDD 10MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>9</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000015">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 192.168.61.11</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -112,6 +123,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
+                <nodes>obelix</nodes>
                 <ping_args>-c 20 12.0.0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -120,7 +132,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -130,16 +144,20 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000011
  000001
  000012
@@ -49,13 +49,19 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000011">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy Cassandra Database</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
                 <services>cassandra db_init</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
@@ -71,39 +77,44 @@
         </testCase>
 
         <testCase id="000012">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G CoreNetwork</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
                 <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (FDD 20MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (FDD 20MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>9</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000015">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 192.168.61.11</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -112,6 +123,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
+                <nodes>obelix</nodes>
                 <ping_args>-c 20 12.0.0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -120,7 +132,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -130,16 +144,20 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000013
  000002
  000014
@@ -42,7 +42,12 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>IdleSleep</class>
                 <desc>Sleep</desc>
@@ -56,35 +61,41 @@
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (FeMBMS)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fembms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (FeMBMS)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fembms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>2</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="030011">
                 <class>Iperf2_Unidir</class>
                 <desc>Iperf2 UDP DL</desc>
                 <id>rfsim4g_ue_fembms</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_enb_fembms</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 2M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fembms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_fembms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000013
  000002
  000014
@@ -42,7 +42,12 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>IdleSleep</class>
                 <desc>Sleep</desc>
@@ -56,35 +61,41 @@
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (MBMS)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_mbms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (MBMS)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_mbms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>2</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="030011">
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_mbms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_mbms</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000011
  000001
  000012
@@ -50,13 +50,19 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000011">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy Cassandra Database</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
                 <services>cassandra db_init</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
@@ -72,33 +78,37 @@
         </testCase>
 
         <testCase id="000012">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G CoreNetwork</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
                 <services>oai_hss oai_mme oai_spgwc oai_spgwu trf_gen</services>
-                <nb_healthy>6</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000013">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G eNB RF sim (TDD 05MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
                 <services>oai_enb0</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000014">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 4G LTE-UE RF sim (TDD 05MHz)</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
                 <services>oai_ue0</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <ping_args> -c 20 192.168.61.11</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -107,6 +117,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
+                <nodes>obelix</nodes>
                 <ping_args>-c 20 12.0.0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -115,7 +126,9 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -125,16 +138,20 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
+                <nodes>obelix</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
+                <svr_node>obelix</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100021
+ 800813
  000021
  000022
  000023
@@ -42,51 +42,63 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb oai-nr-cuup oai-nr-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000021">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf</services>
-                <nb_healthy>4</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000022">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
                 <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
-                <nb_healthy>11</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000023">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
                 <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
-                <nb_healthy>14</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000024">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+                <nodes>cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+                <nodes>cacofonix cacofonix cacofonix</nodes>
                 <ping_args> -c 20 12.1.1.1 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100021">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_e1_rfsim_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100022">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -26,7 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
- 100021
+ 800813
  000021
  000022
  000023
@@ -44,33 +44,42 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000021">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000022">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
                 <services>oai-cu oai-du oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000023">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -78,7 +87,7 @@
         <testCase id="030020">
                 <class>Custom_Command</class>
                 <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>localhost</node>
+                <node>cacofonix</node>
                 <command>echo channelmod modify 0 noise_power_dB 3 | nc --send-only 192.168.71.181 8091</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -88,7 +97,9 @@
                 <desc>Iperf (DL/5Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 5M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -98,7 +109,9 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -106,7 +119,7 @@
         <testCase id="040021">
                 <class>Custom_Command</class>
                 <desc>Simulate a disruption of DL radio channel (ploss 55)(5 sec)</desc>
-                <node>localhost</node>
+                <node>cacofonix</node>
                 <command>echo channelmod modify 0 ploss 55 | nc -N 192.168.71.181 8091 &amp;&amp; sleep 5</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -114,7 +127,7 @@
         <testCase id="040022">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>cacofonix</node>
                 <command>echo ciUE sync_state 0 | nc -N 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -122,7 +135,7 @@
         <testCase id="040023">
                 <class>Custom_Command</class>
                 <desc>Restoration of the original DL channel conditions (ploss 0)(5 sec)</desc>
-                <node>localhost</node>
+                <node>cacofonix</node>
                 <command>echo channelmod modify 0 ploss 0 | nc -N 192.168.71.181 8091 &amp;&amp; sleep 5</command>
                 <command_fail>yes</command_fail>
         </testCase>
@@ -130,17 +143,19 @@
         <testCase id="040024">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>cacofonix</node>
                 <command>echo ciUE sync_state 0 | nc -N 192.168.71.181 8091 | grep -E UE_CONNECTED &amp;&amp; sleep 10</command>
                 <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100021">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
                 <d_retx_th>30,30,100,100</d_retx_th>
                 <u_retx_th>30,30,100,100</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_f1_rfsim_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100022">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  000011
  000012
  000013
@@ -45,33 +45,42 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000011">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000012">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000013">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -80,6 +89,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 12.1.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -89,7 +99,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -99,17 +111,21 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100012">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -27,16 +27,14 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000000
  000001
  000002
  000003
  000004
- 200000
  020001
  020002
- 200001
  100001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -47,49 +45,60 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000000">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
                 <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
                 <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB L2 sim SA</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UE L2 sim SA and Proxy</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
                 <services>proxy oai-nr-ue0</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000004">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE</desc>
                 <id>l2sim5g_ue</id>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>l2sim5g_ue</id>
+                <nodes>localhost</nodes>
                 <ping_args> -c 20 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -98,28 +107,19 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>l2sim5g_ext_dn</id>
+                <nodes>localhost</nodes>
                 <ping_args>-c 20 12.1.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
                 <d_retx_th>20,50,100,100</d_retx_th>
                 <u_retx_th>0,0,0,0</u_retx_th>
-        </testCase>
-
-        <testCase id="200000">
-                <class>StatsFromGenObject</class>
-                <desc>Statistics before Traffic Test</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
-        </testCase>
-
-        <testCase id="200001">
-                <class>StatsFromGenObject</class>
-                <desc>Statistics after Traffic Test</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000001
  000002
  000003
@@ -60,73 +60,87 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000004">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue2</services>
-                <nb_healthy>8</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000005">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
-                <nb_healthy>11</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000006">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
-                <nb_healthy>14</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000007">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue9 oai-nr-ue10</services>
-                <nb_healthy>16</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000008">
                 <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>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args> -c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -135,6 +149,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 12.1.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -143,6 +158,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args> -c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -151,6 +167,7 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 12.1.1.3</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -159,6 +176,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>cacofonix cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -167,6 +185,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>cacofonix cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -175,6 +194,7 @@
                 <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>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
                 <ping_args>-c 20 192.168.72.135 -i 0.25 -s 1016</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -184,7 +204,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -194,7 +216,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -203,26 +227,31 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="444445">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 2 to 10</desc>
                 <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000001
  000002
  000003
@@ -45,33 +45,42 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args> -c 20 -i0.2 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -80,6 +89,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -89,7 +99,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -99,17 +111,21 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000001
  000002
  000003
@@ -45,33 +45,42 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -80,6 +89,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 12.1.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -89,7 +99,9 @@
                 <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -99,15 +111,19 @@
                 <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 4M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml

@@ -26,6 +26,7 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  111111
+ 800813
  000020
  000021
  020021
@@ -40,33 +41,43 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000020">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI-DU+nrUE</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_accelleran</yaml_path>
                 <services>oai-du oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000021">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>ofqot</nodes>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Test Connectivity (ping)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>ofqot</nodes>
                 <ping_args>-c 20 12.1.1.1</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100022">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100022">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100011
+ 800813
  004000
  000010
  000011
@@ -49,30 +49,38 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000010">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000011">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
                 <services>oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -81,6 +89,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -90,7 +99,9 @@
                 <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -100,17 +111,21 @@
                 <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100011">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <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! -->
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml

@@ -32,15 +32,17 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100012">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
         </testCase>
 

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000000
  000001
  020001
@@ -43,26 +43,36 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
         <testCase id="000000">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI gNB</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI NR-UE</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i0.2 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -71,16 +81,19 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
                 <d_retx_th>10,0,0,0</d_retx_th>
                 <u_retx_th>10,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -28,6 +28,7 @@
         <TestCaseRequestedList>
  111111
  100001
+ 800813
  000001
  000002
  000003
@@ -44,32 +45,42 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -78,14 +89,17 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 12.1.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -27,6 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
+ 800813
  000002
  000003
  000004
@@ -42,20 +43,29 @@
                 <images_to_pull>oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G UE 1</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_sidelink</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
                 <services>oai-nr-ue-1</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
         
         <testCase id="000003"> 
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G UE 2</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_sidelink</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
                 <services>oai-nr-ue-2</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000004">
@@ -67,17 +77,19 @@
         <testCase id="000005">
                 <class>Custom_Command</class>
                 <desc>Check that UE synched</desc>
-                <node>localhost</node>
+                <node>cacofonix</node>
                 <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
                 <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_sidelink</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_sidelink</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  004000
  000000
  000001
@@ -47,30 +47,38 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000000">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI gNB</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>1</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI NR-UE</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
                 <services>oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -79,16 +87,19 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
                 <d_retx_th>0,0,0,0</d_retx_th>
                 <u_retx_th>0,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml

@@ -32,15 +32,17 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 	<testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
         </testCase>
 

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -27,7 +27,7 @@
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
- 100001
+ 800813
  000001
  000002
  000003
@@ -45,33 +45,42 @@
                 <test_svr_id>0</test_svr_id>
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="000001">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000002">
-                <class>DeployGenObject</class>
+                <class>Deploy_Object</class>
                 <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="000003">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 192.168.72.135</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -80,6 +89,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
+                <nodes>cacofonix</nodes>
                 <ping_args>-c 20 -i 0.25 12.1.1.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -89,7 +99,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -99,17 +111,21 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="100001">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml

@@ -31,9 +31,11 @@
         <TestCaseExclusionList></TestCaseExclusionList>
 
         <testCase id="100002">
-                <class>UndeployGenObject</class>
+                <class>Undeploy_Object</class>
                 <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
         </testCase>
 
         <testCase id="222222">

ci-scripts/xml_files/container_image_build.xml

@@ -25,11 +25,18 @@
 	<htmlTabName>Build Container Images</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
+ 800813
  000001
  000010
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
+	<testCase id="800813">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace for server 0</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
 	<testCase id="000001">
 		<class>Build_Image</class>
 		<desc>Build all Images</desc>

ci-scripts/xml_files/container_image_build_cross.xml

@@ -25,10 +25,16 @@
 	<htmlTabName>Build Container Images</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
+ 100001
  000001
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-
+	<testCase id="100001">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
 	<testCase id="000001">
 		<class>Build_Image</class>
 		<desc>Cross-Compile for ARM64</desc>

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -26,10 +26,17 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
+ 100001
  000001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
 
+        <testCase id="100001">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>1</eNB_instance>
+                <eNB_serverId>1</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>Build_Proxy</class>
                 <desc>Build L2sim Proxy Image</desc>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -31,6 +31,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 111110
 300000
 040101 
+800813
 030101
 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
 030201
@@ -63,7 +64,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <node>hutch</node>
         <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030101">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -29,7 +29,9 @@
 111110
 300000
 040101
-030131 030132
+800813
+030131
+030132
 040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
 030231
 200000
@@ -61,7 +63,12 @@
         <node>hutch</node>
         <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030131">
         <class>Deploy_Object</class>
         <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
@@ -70,7 +77,6 @@
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
-
     <testCase id="030132">
         <class>Deploy_Object</class>
         <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
 100000
 111110
 040101
+800813
 030102
 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
 030202
@@ -55,7 +56,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <node>hutch</node>
         <command>sudo cpupower idle-set -E</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030102">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -31,6 +31,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030111
 000001
 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
@@ -57,7 +58,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <node>hutch</node>
         <command>sudo cpupower idle-set -E</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030111">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030112
 040301 040302 040512 040612 040650 040401
 040201
@@ -56,7 +57,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030112">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -29,8 +29,10 @@
 100001
 111110
 111111
+800813
 030111
 000001
+800814
 030311
 000002
 040511 040613 040616 040651
@@ -78,7 +80,12 @@
         <node>carabe</node>
         <command>sudo cpupower idle-set -E</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030111">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
@@ -86,7 +93,12 @@
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
-
+    <testCase id="800814">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 1</desc>
+        <eNB_instance>1</eNB_instance>
+        <eNB_serverId>1</eNB_serverId>
+    </testCase>
     <testCase id="030311">
         <class>Deploy_Object</class>
         <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030121
 000001
 040301 040521 040623 040624 040625 040662 040401 040201
@@ -56,7 +57,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030121">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/20MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -31,6 +31,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
 100000
 111110
 040101
+800813
 030104
 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201
 030204
@@ -59,12 +60,17 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     </testCase>
 
     <testCase id="300000">
-	<class>Custom_Command</class>
-	<desc>Reset USRP</desc>
-	<node>starsky</node>
-	<command>sudo -S b2xx_fx3_utils --reset-device</command>
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>starsky</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
+    </testCase>
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
     </testCase>
-
     <testCase id="030104">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -28,7 +28,9 @@
 300000
 100000
 111110
-030134 030135
+800813
+030134
+030135
 040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
 030231
 040101
@@ -57,12 +59,17 @@
     </testCase>
 
     <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Reset USRP</desc>
-    <node>starsky</node>
-    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>starsky</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
+    </testCase>
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
     </testCase>
-
     <testCase id="030134">
         <class>Deploy_Object</class>
         <desc>Deploy RRU (TDD/Band40/5MHz/B200) in a container</desc>
@@ -71,7 +78,6 @@
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
-
     <testCase id="030135">
         <class>Deploy_Object</class>
         <desc>Deploy RCC (TDD/Band40/5MHz) in a container</desc>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
 100000
 111110
 040101
+800813
 030105
 040301 040502 040606 040608 040646 040648 040401 040201
 030205
@@ -55,6 +56,12 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>  
     <testCase id="030105">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030114
 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
 030214
@@ -55,6 +56,12 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <node>starsky</node>
         <command>sudo cpupower idle-set -E</command>
     </testCase>
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030114">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/10MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
 100000
 111110
 040101
+800813
 030124
 040301 040521 040622 040621 040623 040662 040401 040201
 030224
@@ -55,6 +56,12 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </testCase>
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030124">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
 100000
 111110
 040101
+800813
 030125
 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
 030225
@@ -56,7 +57,12 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <node>starsky</node>
         <command>sudo cpupower idle-set -E</command>
     </testCase>
-
+    <testCase id="800813">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 0</desc>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
     <testCase id="030125">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml

@@ -31,6 +31,7 @@
 111111
 100000
 010010
+800833
 030101
 010001
 000001
@@ -64,7 +65,12 @@
     <node>obelix</node>
     <command>sudo cpupower idle-set -E</command>
   </testCase>
-
+  <testCase id="800833">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml

@@ -31,6 +31,7 @@
 111111
 100000
 010010
+800833
 031101
 010001
 000001
@@ -64,7 +65,12 @@
     <node>obelix</node>
     <command>sudo cpupower idle-set -E</command>
   </testCase>
-
+  <testCase id="800833">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="031101">
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -32,7 +32,9 @@
  111110
  111111
  010000
+ 800833
  030101
+ 800834
  030102
  010001
  050000
@@ -111,13 +113,18 @@
 		<class>Attach_UE</class>
 		<desc>Attach UE</desc>
 		<id>idefix</id>
-  </testCase>
+  	</testCase>
 	<testCase id= "010010">
 		<class>Detach_UE</class>
 		<desc>Detach UE</desc>
 		<id>idefix</id>
 	</testCase>
-
+	<testCase id="800833">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
 	<testCase id="030101">
 		<class>Deploy_Object</class>
 		<desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
@@ -125,7 +132,12 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 	</testCase>
-
+	<testCase id="800834">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace</desc>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+	</testCase>
 	<testCase id="030102">
 		<class>Deploy_Object</class>
 		<desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -29,6 +29,7 @@
                 111111
                 000222
                 001111
+                800813
                 002222
                 002223
                 000111
@@ -54,7 +55,12 @@
                 <desc>Initialize Quectel</desc>
                 <id>sphex_quectel</id>
         </testCase>
-
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace for server 0</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
         <testCase id="002222">
                 <class>Deploy_Object</class>
                 <desc>Deploy PNF/Nvidia CUBB in a container</desc>
@@ -63,7 +69,6 @@
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
-
         <testCase id="002223">
                 <class>Deploy_Object</class>
                 <desc>Deploy VNF in a container</desc>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -28,6 +28,7 @@
   <TestCaseRequestedList>
     010000
     001000
+    800813
     020000
     002000
     002001
@@ -65,7 +66,12 @@
     <oc_project>oaicicd-ran</oc_project>
     <images_to_pull>oai-gnb-aw2s</images_to_pull>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="020000">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -29,6 +29,7 @@
     100000
     111111
     010000
+    800813
     030101
     010001
     050000
@@ -95,7 +96,12 @@
     <desc>Detach UE</desc>
     <id>idefix</id>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace for server 0</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -29,8 +29,11 @@
     333333
     300000
     310000
+    800813
     330101
+    800814
     330102
+    800815
     330103
     310001
     350000
@@ -77,7 +80,12 @@
     <desc>Detach Quectel</desc>
     <id>idefix</id>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="330101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU-CP in a container</desc>
@@ -86,7 +94,6 @@
     <eNB_serverId>0</eNB_serverId>
     <services>gnb_cucp</services>
   </testCase>
-
   <testCase id="330102">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU-UP in a container</desc>
@@ -95,7 +102,6 @@
     <eNB_serverId>0</eNB_serverId>
     <services>gnb_cuup</services>
   </testCase>
-
   <testCase id="330103">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU (TDD/Band78/40MHz/B200) in a container</desc>

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -28,6 +28,7 @@
   <TestCaseRequestedList>
     100000
     110002
+    800813
     130101
     130102
     100001
@@ -79,7 +80,12 @@
     <desc>Detach Quectel</desc>
     <id>idefix</id>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="130101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU in a container</desc>
@@ -88,7 +94,6 @@
     <eNB_serverId>0</eNB_serverId>
     <services>gnb_cu</services>
   </testCase>
-
   <testCase id="130102">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU (FDD/Band1/10MHz/B200) in a container</desc>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -28,6 +28,7 @@
   <TestCaseRequestedList>
     200000
     110000
+    800813
     120000
     102000
     102001
@@ -56,7 +57,12 @@
     <oc_project>oaicicd-ran</oc_project>
     <images_to_pull>oai-gnb-fhi72</images_to_pull>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace for server 0</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="120000">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/100MHz/VVDN) in a container</desc>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -29,6 +29,7 @@
     100000
     111111
     010010
+    800813
     040101
     010001
     051001
@@ -74,7 +75,12 @@
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="040101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band77/100MHz/N310) in a container</desc>

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -29,6 +29,7 @@
     100000
     111111
     010010
+    800813
     030101
     010001
     050001
@@ -74,13 +75,18 @@
     <desc>Detach UE</desc>
     <id>up2</id>
   </testCase>
-
+  <testCase id="800813">
+      <class>Create_Workspace</class>
+      <desc>Creating new Workspace</desc>
+      <eNB_instance>0</eNB_instance>
+      <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="030101">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
+      <class>Deploy_Object</class>
+      <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
+      <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
+      <eNB_instance>0</eNB_instance>
+      <eNB_serverId>0</eNB_serverId>
   </testCase>
 
   <testCase id="000001">

ci-scripts/xml_files/container_sa_n310_nrue.xml

@@ -27,7 +27,10 @@
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
     010000 010001
-    020000 020001
+    800813
+    020000
+    800814
+    020001
     000001
     001000
     002000
@@ -64,7 +67,12 @@
     <node>caracal</node>
     <command>ssh root@192.168.20.2 reboot ; sleep 45</command>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="020000">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
@@ -72,7 +80,12 @@
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>
-
+  <testCase id="800814">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>1</eNB_instance>
+    <eNB_serverId>1</eNB_serverId>
+  </testCase>
   <testCase id="020001">
     <class>Deploy_Object</class>
     <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -29,6 +29,7 @@
     300000
     311111
     210000
+    800813
     230101
     210001
     250000
@@ -89,7 +90,12 @@
     <desc>Detach UE</desc>
     <id>idefix</id>
   </testCase>
-
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
   <testCase id="230101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) with SC-FDMA in a container</desc>

ci-scripts/xml_files/cppcheck.xml

@@ -25,10 +25,14 @@
 	<htmlTabName>CPPCHECK Analysis</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
+ 000002
  000001
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-
+    <testCase id="000002">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace</desc>
+    </testCase>
 	<testCase id="000001">
 		<class>Cppcheck_Analysis</class>
 		<desc>Static Code Analysis with cppcheck</desc>

ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml

@@ -30,7 +30,7 @@ services:
         entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
 
     oai_hss:
-        image: oai-hss:latest
+        image: oaisoftwarealliance/oai-hss:latest
         container_name: l2sim4g-oai-hss
         privileged: true
         depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
             retries: 5
 
     magma_mme:
-        image: magma-mme:latest
+        image: oaisoftwarealliance/magma-mme:latest
         container_name: l2sim4g-magma-mme
         hostname: mme
         privileged: true
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai_spgwc:
-        image: oai-spgwc:latest
+        image: oaisoftwarealliance/oai-spgwc:latest
         privileged: true
         depends_on: [magma_mme]
         container_name: l2sim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
             retries: 5
 
     oai_spgwu:
-        image: oai-spgwu-tiny:latest
+        image: oaisoftwarealliance/oai-spgwu-tiny:latest
         privileged: true
         container_name: l2sim4g-oai-spgwu-tiny
         depends_on: [oai_spgwc]

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -30,7 +30,7 @@ services:
         entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
 
     oai_hss:
-        image: oai-hss:latest
+        image: oaisoftwarealliance/oai-hss:latest
         container_name: rfsim4g-oai-hss
         privileged: true
         depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
             retries: 5
 
     magma_mme:
-        image: magma-mme:latest
+        image: oaisoftwarealliance/magma-mme:latest
         container_name: rfsim4g-magma-mme
         hostname: mme
         privileged: true
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai_spgwc:
-        image: oai-spgwc:latest
+        image: oaisoftwarealliance/oai-spgwc:latest
         privileged: true
         depends_on: [magma_mme]
         container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
             retries: 5
 
     oai_spgwu:
-        image: oai-spgwu-tiny:latest
+        image: oaisoftwarealliance/oai-spgwu-tiny:latest
         privileged: true
         container_name: rfsim4g-oai-spgwu-tiny
         depends_on: [oai_spgwc]

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -30,7 +30,7 @@ services:
         entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
 
     oai_hss:
-        image: oai-hss:latest
+        image: oaisoftwarealliance/oai-hss:latest
         container_name: rfsim4g-oai-hss
         privileged: true
         depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
             retries: 5
 
     magma_mme:
-        image: magma-mme:latest
+        image: oaisoftwarealliance/magma-mme:latest
         container_name: rfsim4g-magma-mme
         hostname: mme
         privileged: true
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai_spgwc:
-        image: oai-spgwc:latest
+        image: oaisoftwarealliance/oai-spgwc:latest
         privileged: true
         depends_on: [magma_mme]
         container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
             retries: 5
 
     oai_spgwu:
-        image: oai-spgwu-tiny:latest
+        image: oaisoftwarealliance/oai-spgwu-tiny:latest
         privileged: true
         container_name: rfsim4g-oai-spgwu-tiny
         depends_on: [oai_spgwc]

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -30,7 +30,7 @@ services:
         entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
 
     oai_hss:
-        image: oai-hss:latest
+        image: oaisoftwarealliance/oai-hss:latest
         container_name: rfsim4g-oai-hss
         privileged: true
         depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
             retries: 5
 
     magma_mme:
-        image: magma-mme:latest
+        image: oaisoftwarealliance/magma-mme:latest
         container_name: rfsim4g-magma-mme
         hostname: mme
         privileged: true
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai_spgwc:
-        image: oai-spgwc:latest
+        image: oaisoftwarealliance/oai-spgwc:latest
         privileged: true
         depends_on: [magma_mme]
         container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
             retries: 5
 
     oai_spgwu:
-        image: oai-spgwu-tiny:latest
+        image: oaisoftwarealliance/oai-spgwu-tiny:latest
         privileged: true
         container_name: rfsim4g-oai-spgwu-tiny
         depends_on: [oai_spgwc]

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -30,7 +30,7 @@ services:
         entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
 
     oai_hss:
-        image: oai-hss:latest
+        image: oaisoftwarealliance/oai-hss:latest
         container_name: rfsim4g-oai-hss
         privileged: true
         depends_on: [cassandra]
@@ -73,7 +73,7 @@ services:
             retries: 5
 
     magma_mme:
-        image: magma-mme:latest
+        image: oaisoftwarealliance/magma-mme:latest
         container_name: rfsim4g-magma-mme
         hostname: mme
         privileged: true
@@ -102,7 +102,7 @@ services:
             retries: 5
 
     oai_spgwc:
-        image: oai-spgwc:latest
+        image: oaisoftwarealliance/oai-spgwc:latest
         privileged: true
         depends_on: [magma_mme]
         container_name: rfsim4g-oai-spgwc
@@ -134,7 +134,7 @@ services:
             retries: 5
 
     oai_spgwu:
-        image: oai-spgwu-tiny:latest
+        image: oaisoftwarealliance/oai-spgwu-tiny:latest
         privileged: true
         container_name: rfsim4g-oai-spgwu-tiny
         depends_on: [oai_spgwc]

ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml

 services:
     oai-gnb:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml

 services:
     oai-gnb:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         network_mode: "host"
         container_name: oai-gnb
         cap_drop:

ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml

 services:
     oai-nr-ue:
-        image: oai-nr-ue:latest
+        image: oaisoftwarealliance/oai-nr-ue:develop
         network_mode: host
         container_name: oai-nr-ue
         cap_drop:

ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: prod-enb-mono-fdd
         environment:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml

 services:
     rru_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-rru-fdd-05Mhz-tm1
         network_mode: "host"
@@ -17,7 +17,7 @@ services:
             timeout: 5s
             retries: 5
     rcc_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-rcc-fdd-05Mhz-tm1
         network_mode: "host"

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-fdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml

 services:
     lte_ue0:
-        image: oai-lte-ue:latest
+        image: oaisoftwarealliance/oai-lte-ue:develop
         privileged: true
         container_name: lte-b200-ue-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-fdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-fdd-20Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml

 services:
     rru_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-rru-tdd-05Mhz-tm1
         network_mode: "host"
@@ -17,7 +17,7 @@ services:
             timeout: 5s
             retries: 5
     rcc_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-rcc-tdd-05Mhz-tm1
         network_mode: "host"

ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-tdd-05Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-tdd-05Mhz-tm2
         environment:

ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-tdd-10Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-tdd-20Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml

 services:
     enb_mono_tdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: lte-b200-enb-tdd-20Mhz-tm1
         environment:

ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml

 services:
     oai-enb:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: oai-enb
         environment:

ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml

 services:
     oai-enb:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: oai-enb
         environment:

ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml

 services:
     enb_mono_fdd:
-        image: oai-enb:latest
+        image: oaisoftwarealliance/oai-enb:develop
         privileged: true
         container_name: nsa-b200-enb
         ulimits:

ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml

 services:
     gnb_mono_tdd:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: nsa-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oai-gnb-aw2s:latest
+        image: oaisoftwarealliance/oai-gnb-aw2s:develop
         network_mode: "host"
         container_name: oai-gnb-aw2s
         cap_drop:

ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml

 services:
     gnb_mono_tdd:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: sa-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml

 services:
     gnb_cucp:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: sa-cucp-gnb
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     gnb_cuup:
-        image: oai-nr-cuup:latest
+        image: oaisoftwarealliance/oai-nr-cuup:develop
         container_name: sa-cuup-gnb
         cap_drop:
             - ALL
@@ -52,7 +52,7 @@ services:
             retries: 5
 
     gnb_du_tdd:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: sa-du-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml

 services:
     gnb_cu:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: sa-cu-gnb
         cap_drop:
             - ALL
@@ -26,7 +26,7 @@ services:
             retries: 5
 
     gnb_du_fdd:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: sa-du-b200-gnb
         cap_drop:
             - ALL

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oai-gnb-fhi72:latest
+        image: oaisoftwarealliance/oai-gnb-fhi72:develop
         cap_add:
             - SYS_ADMIN
             - IPC_LOCK

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml

 services:
     oai-gnb:
-        image: oai-gnb-fhi72:latest
+        image: oaisoftwarealliance/oai-gnb-fhi72:develop
         cap_add:
             - SYS_ADMIN
             - IPC_LOCK

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -34,7 +34,7 @@ services:
       retries: 5
   oai-gnb-aerial:
     cpuset: "13-20"
-    image: oai-gnb-aerial:latest
+    image: oaisoftwarealliance/oai-gnb-aerial:develop
     depends_on:
       nv-cubb:
         condition: service_healthy

ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml

 services:
     gnb_mono_tdd:
-        image: oai-gnb:latest
+        image: oaisoftwarealliance/oai-gnb:develop
         container_name: sa-b200-gnb
         cap_drop:
             - ALL