Create functions for OC CN deployment/undeployment

These functions enables (un)deployment of the OAI CN v2.0.1, increase
reliability and speedup overall CN (un)deployment compared to current
implementation.

Use "--wait" helm option to wait for deployment/undeployment of the CN.
Wait for pods to be in a ready state before marking the release as
successful. If not deployed/undeployed before timeout, marked as
unsuccessful.

Hardcode path for OC CN5G deployment/undeployment

ci-scripts/cls_cluster.py

@@ -44,6 +44,9 @@ OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
 CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
+CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
+CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
+
 
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
@@ -65,6 +68,51 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
+def OC_deploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
+	if not succeeded:
+		return False, CONST.OC_LOGIN_FAIL
+	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
+	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Deployment failed')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
+def OC_undeploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Terminating CN on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
+	if not succeeded:
+		return False, CONST.OC_LOGIN_FAIL
+	cmd.run(f'rm -Rf {path}/logs')
+	cmd.run(f'mkdir -p {path}/logs')
+	logging.debug('OC OAI CN5G: Collecting log files to workspace')
+	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
+	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
+	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
+		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
+		if not podName:
+			logging.debug(f'{ii} pod not found!')
+		else:
+			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
+	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
+	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
+	ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Undeployment failed')
+		cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""

ci-scripts/epc.py

@@ -298,39 +298,18 @@ class EPCManagement():
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			self.testCase_id = HTML.testCase_id
-			imageNames = ["oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "mysql","oai-traffic-server"]
-			logging.debug('Deploying OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = "/opt/oai-cn5g-fed-develop-2023-04-28-20897"
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
+			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			for ii in imageNames:
-					mySSH.run(f'helm uninstall {ii}', reportNonZero=False)
-			mySSH.run(f'helm spray {lSourcePath}/ci-scripts/charts/oai-5g-basic/.')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			if ret.stdout.count('Running') != 9:
-				logging.error('\u001B[1m Deploying 5GCN Failed using helm chart on OC Cluster\u001B[0m')
-				for ii in imageNames:
-					mySSH.run('helm uninstall '+ ii)
-				ret = mySSH.run(f'oc get pods')
-				if re.search('No resources found', ret.stdout):
-					logging.debug('All pods uninstalled')
-					OC.OC_logout(mySSH)
-					mySSH.close()
-					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
-					return False
-			ret = mySSH.run(f'oc get pods', silent=True)
-			for line in ret.stdout.split('\n')[1:]:
+				HTML.CreateHtmlTestRow('N/A', 'KO', report)
+				HTML.CreateHtmlTabFooter(False)
+				mySSH.close()
+				sys.exit("OC OAI CN5G: CN deployment failed!")
+			for line in report.stdout.split('\n')[1:]:
 				columns = line.strip().split()
 				name = columns[0]
 				status = columns[2]
 				html_cell += status + '    ' + name
 				html_cell += '\n'
-			OC.OC_logout(mySSH)
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
@@ -562,8 +541,6 @@ class EPCManagement():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 
 	def Terminate5GCN(self, HTML):
-		imageNames = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-		containerInPods = ["", "-c nrf", "-c amf", "-c smf", "-c spgwu", "-c ausf", "-c udm", "-c udr", ""]
 		mySSH = cls_cmd.getConnection(self.IPAddress)
 		message = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
@@ -598,36 +575,13 @@ class EPCManagement():
 			mySSH.copyin(f'{self.SourceCodePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
 			logging.debug(message)
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			logging.debug('Terminating OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = self.SourceCodePath
-			mySSH.run(f'rm -Rf {lSourcePath}/logs')
-			mySSH.run(f'mkdir -p {lSourcePath}/logs')
-			logging.debug('OC OAI CN5G - Collecting Log files to workspace')
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
+			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			mySSH.run(f'oc describe pod &> {lSourcePath}/logs/describe-pods-post-test.log')
-			mySSH.run(f'oc get pods.metrics.k8s &> {lSourcePath}/logs/nf-resource-consumption.log')
-			for ii, ci in zip(imageNames, containerInPods):
-			       podName = mySSH.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-			       if not podName:
-				       logging.debug(f'{ii} pod not found!')
-				       HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-				       HTML.CreateHtmlTabFooter(False)
-			       mySSH.run(f'oc logs -f {podName} {ci} &> {lSourcePath}/logs/{ii}.log &')
-			       mySSH.run(f'helm uninstall {ii}')
-			       podName = ''
-			mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq test_logs_CN.zip *.log')
-			mySSH.copyin(f'{lSourcePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			res = re.search(f'No resources found in {OC.CI_OC_CORE_NAMESPACE} namespace.', ret.stdout)
-			if res is not None:
-			       logging.debug('OC OAI CN5G components uninstalled')
-			       message = 'OC OAI CN5G components uninstalled'
-			OC.OC_logout(mySSH)
+				HTML.CreateHtmlTestRow('N/A', 'KO', report)
+				HTML.CreateHtmlTabFooter(False)
+				sys.exit("OC OAI CN5G: CN undeployment failed!")
+			else:
+				message = report.stdout
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()