Commit 1d479b2a authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w12' into 'develop' 

Integration: `2025.w12`

Closes #920 and #915

See merge request !3325

* !3301 Remove unused NR UE PHY unit tests
* !3319 Disable EPS NAS security algorithms in 5GMM UE capabilities
* !3315 SCTP: avoid assert on partial SCTP message
* !3323 Fix long RACH regression
* !3311 Harmonize and update Frequency Range computation to the current values specified by the standard
* !3320 Miscelaneous improvements in PHY simulators
* !3286 Add support for ARM build pipeline
* !3308 remove ul_ch_estimates_time to save memory
* !3310 remove globale llr_layers to save memory, improve CPU, simplify code
* !3274 Add initial support for RedCap
* !3328 Fix ULSCH ID type to handle large max_nb_pusch values (ULSCH procedures)
* !3329 NR build improvements
* !3285 Update FHI 7.2 documentation, minor code cleanup
parents 82fb9fcc 9bbd2522

CMakeLists.txt

+20 −42
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ set(SCHED_SRC_NR_UE 
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c

  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c

  ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c

  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c

  ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c

  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c

)
@@ -1182,7 +1181,6 @@ set(NR_L2_SRC_UE 
  ${NR_SDAP_SRC}

  ${NR_UE_RRC_DIR}/L2_interface_ue.c

  ${NR_UE_RRC_DIR}/main_ue.c

  ${NR_RRC_DIR}/nr_rrc_config.c

  ${NR_UE_RRC_DIR}/rrc_UE.c

  ${NR_UE_RRC_DIR}/rrc_nsa.c

  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
@@ -1336,10 +1334,9 @@ if(E2_AGENT) 
endif()



add_library(L2_LTE_NR

  ${L2_RRC_SRC}

  ${MAC_SRC}

  # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)

  ${MAC_DIR}/dummy_functions.c

  ${ENB_APP_SRC}

  ${MCE_APP_SRC}

)



target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
@@ -1351,12 +1348,6 @@ add_library(L2_UE 
target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(L2_UE PRIVATE GTPV1U)



add_library(L2_UE_LTE_NR

  ${L2_RRC_SRC_UE}

  ${MAC_SRC_UE}

)

target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)



add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
@@ -1894,12 +1885,13 @@ add_executable(nr-uesoftmodem 
  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c

  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c

  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c

  ${PHY_INTERFACE_DIR}/queue_t.c

  )



target_link_libraries(nr-uesoftmodem PRIVATE

  -Wl,--start-group

  nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB

  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB

  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB

  NFAPI_USER_LIB MISC_NFAPI_NR_LIB

  ITTI SIMU shlib_loader

  -Wl,--end-group z dl)
@@ -1971,29 +1963,25 @@ target_link_libraries(ldpctest PRIVATE 
  -Wl,--whole-archive crc_byte -Wl,--no-whole-archive

)



add_executable(nr_dlschsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  )

add_library(physim_common OBJECT ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_unitary_common.c)

target_link_libraries(physim_common PRIVATE UTIL)



add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c)

target_link_libraries(nr_dlschsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader

  m pthread ${T_LIB} ITTI dl shlib_loader physim_common

  )

target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)



add_executable(nr_pbchsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  )

add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c)

target_link_libraries(nr_pbchsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader

  m pthread ${T_LIB} ITTI dl shlib_loader physim_common

)

target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



add_executable(nr_psbchsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  ${OPENAIR_DIR}/executables/softmodem-common.c

  ${NR_UE_RRC_DIR}/rrc_nsa.c

  ${NFAPI_USER_DIR}/nfapi.c
@@ -2002,24 +1990,19 @@ add_executable(nr_psbchsim 
  )

target_link_libraries(nr_psbchsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader

  m pthread ${T_LIB} ITTI dl shlib_loader physim_common

  )

target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



#PUCCH ---> Prashanth

add_executable(nr_pucchsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  )

add_executable(nr_pucchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c)

target_link_libraries(nr_pucchsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader

  m pthread ${T_LIB} ITTI dl shlib_loader physim_common

)

target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



add_executable(nr_dlsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  ${OPENAIR_DIR}/executables/softmodem-common.c

  ${NR_UE_RRC_DIR}/rrc_nsa.c

  ${NFAPI_USER_DIR}/nfapi.c
@@ -2028,33 +2011,28 @@ add_executable(nr_dlsim 
  )

target_link_libraries(nr_dlsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas

  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common

  )

target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



add_executable(nr_prachsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

)

add_executable(nr_prachsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c)

target_link_libraries(nr_prachsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader)

  m pthread ${T_LIB} ITTI dl shlib_loader physim_common)

target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



add_executable(nr_ulschsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  ${PHY_INTERFACE_DIR}/queue_t.c

  )

target_link_libraries(nr_ulschsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader

  m pthread ${T_LIB} ITTI dl shlib_loader physim_common

)

target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



add_executable(nr_ulsim

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c

  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c

  ${OPENAIR_DIR}/executables/softmodem-common.c

  ${NR_UE_RRC_DIR}/rrc_nsa.c

  ${NFAPI_USER_DIR}/nfapi.c
@@ -2064,7 +2042,7 @@ add_executable(nr_ulsim 


target_link_libraries(nr_ulsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas

  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas physim_common

  )

target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2121,7 +2099,7 @@ if (${T_TRACER}) 
        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB

        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB

        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU

        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap

        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap

        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB

        dfts config_internals nr_common crc_byte)

    if (TARGET ${i})

ci-scripts/Jenkinsfile-GitLab-Container

+22 −0
Original line number Diff line number Diff line
@@ -153,6 +153,28 @@ pipeline { 
            }

          }

        }

        stage ("Ubuntu-ARM-Image-Builder") {

          steps {

            script {

              triggerSlaveJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')

            }

          }

          post {

            always {

              script {

                // Using a unique variable name for each test stage to avoid overwriting on a global variable

                // due to parallel-time concurrency

                ubuntuArmBuildStatus = finalizeSlaveJob('RAN-Ubuntu-ARM-Image-Builder')

              }

            }

            failure {

              script {

                currentBuild.result = 'FAILURE'

                failingStages += ubuntuArmBuildStatus

              }

            }

          }

        }

        stage ("RHEL-Cluster-Image-Builder") {

          steps {

            script {

ci-scripts/cls_cluster.py

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ class Cluster: 
	def _undeploy_pod(self, filename):

		self.cmd.run(f'oc delete -f {filename}')



	def PullClusterImage(self, HTML, node, images):

	def PullClusterImage(self, HTML, node, images, tag_prefix):

		logging.debug(f'Pull OC image {images} to server {node}')

		self.testCase_id = HTML.testCase_id

		with cls_cmd.getConnection(node) as cmd:
@@ -242,7 +242,7 @@ class Cluster: 
				return False

			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)

			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'

			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, registry, None, None)

			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)

			OC_logout(cmd)

		param = f"on node {node}"

		if success:

ci-scripts/cls_containerize.py

+25 −17
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ def CopyLogsToExecutor(cmd, sourcePath, log_name): 
		os.remove(f'./{log_name}.zip')

	if (os.path.isdir(f'./{log_name}')):

		shutil.rmtree(f'./{log_name}')

	cmd.copyin(f'{sourcePath}/cmake_targets/{log_name}.zip', f'./{log_name}.zip')

	cmd.copyin(src=f'{sourcePath}/cmake_targets/{log_name}.zip', tgt=f'{os.getcwd()}/{log_name}.zip')

	cmd.run(f'rm -f {log_name}.zip')

	ZipFile(f'{log_name}.zip').extractall('.')
@@ -359,7 +359,7 @@ class Containerize(): 
		svr = self.eNB_serverId[self.eNB_instance]

		lIpAddr, lSourcePath = self.GetCredentials(svr)

		logging.debug('Building on server: ' + lIpAddr)

		cmd = cls_cmd.RemoteCmd(lIpAddr)

		cmd = cls_cmd.getConnection(lIpAddr)

	

		# Checking the hostname to get adapted on cli and dockerfileprefixes

		cmd.run('hostnamectl')
@@ -407,6 +407,12 @@ class Containerize(): 
		result = re.search('build_cross_arm64', self.imageKind)

		if result is not None:

			self.dockerfileprefix = '.ubuntu22.cross-arm64'

		result = re.search('native_arm', self.imageKind)

		if result is not None:

			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))

			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))

			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))

			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))

		

		self.testCase_id = HTML.testCase_id

		cmd.cd(lSourcePath)
@@ -491,10 +497,10 @@ class Containerize(): 
			elif image != 'ran-build':

				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')

			if image == 'oai-gnb-aerial':

				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.tar.gz .')

				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.*.tar.gz .')

			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)

			if image == 'oai-gnb-aerial':

				cmd.run('rm -f nvipc_src.2024.05.23.tar.gz')

				cmd.run('rm -f nvipc_src.*.tar.gz')

			if image == 'ran-build' and ret.returncode == 0:

				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")

				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -720,9 +726,9 @@ class Containerize(): 
			HTML.CreateHtmlTabFooter(False)

			return False



	def Push_Image_to_Local_Registry(self, HTML, svr_id):

	def Push_Image_to_Local_Registry(self, HTML, svr_id, tag_prefix=""):

		lIpAddr, lSourcePath = self.GetCredentials(svr_id)

		logging.debug('Pushing images from server: ' + lIpAddr)

		logging.debug('Pushing images to server: ' + lIpAddr)

		ssh = cls_cmd.getConnection(lIpAddr)

		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'

		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
@@ -737,7 +743,7 @@ class Containerize(): 
		if self.ranAllowMerge:

			orgTag = 'ci-temp'

		for image in IMAGES:

			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)

			tagToUse = tag_prefix + CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)

			imageTag = f"{image}:{tagToUse}"

			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')

			if ret.returncode != 0:
@@ -751,9 +757,10 @@ class Containerize(): 
				return False

			# Creating a develop tag on the local private registry

			if not self.ranAllowMerge:

				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:develop')

				ssh.run(f'docker push {imagePrefix}/{image}:develop')

				ssh.run(f'docker rmi {imagePrefix}/{image}:develop')

				devTag = f"{tag_prefix}develop"

				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:{devTag}')

				ssh.run(f'docker push {imagePrefix}/{image}:{devTag}')

				ssh.run(f'docker rmi {imagePrefix}/{image}:{devTag}')

			ssh.run(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}')



		ret = ssh.run(f'docker logout {imagePrefix}')
@@ -768,7 +775,7 @@ class Containerize(): 
		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)

		return True



	def Pull_Image(cmd, images, tag, registry, username, password):

	def Pull_Image(cmd, images, tag, tag_prefix, registry, username, password):

		if username is not None and password is not None:

			logging.info(f"logging into registry {username}@{registry}")

			response = cmd.run(f'docker login -u {username} -p {password} {registry}', silent=True, reportNonZero=False)
@@ -778,14 +785,15 @@ class Containerize(): 
				return False, msg

		pulled_images = []

		for image in images:

			imagePrefTag = f"{image}:{tag_prefix}{tag}"

			imageTag = f"{image}:{tag}"

			response = cmd.run(f'docker pull {registry}/{imageTag}')

			response = cmd.run(f'docker pull {registry}/{imagePrefTag}')

			if response.returncode != 0:

				msg = f'Could not pull {image} from local registry: {imageTag}'

				msg = f'Could not pull {image} from local registry: {imagePrefTag}'

				logging.error(msg)

				return False, msg

			cmd.run(f'docker tag {registry}/{imageTag} oai-ci/{imageTag}')

			cmd.run(f'docker rmi {registry}/{imageTag}')

			cmd.run(f'docker tag {registry}/{imagePrefTag} oai-ci/{imageTag}')

			cmd.run(f'docker rmi {registry}/{imagePrefTag}')

			pulled_images += [f"oai-ci/{imageTag}"]

		if username is not None and password is not None:

			response = cmd.run(f'docker logout {registry}')
@@ -793,13 +801,13 @@ class Containerize(): 
		msg = "Pulled Images:\n" + '\n'.join(pulled_images)

		return True, msg



	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):

	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, tag_prefix="", registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):

		lIpAddr, lSourcePath = self.GetCredentials(svr_id)

		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')

		if not tag:

			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)

		with cls_cmd.getConnection(lIpAddr) as cmd:

			success, msg = Containerize.Pull_Image(cmd, images, tag, registry, username, password)

			success, msg = Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, username, password)

		param = f"on node {lIpAddr}"

		if success:

			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])

ci-scripts/main.py

+6 −3
Original line number Diff line number Diff line
@@ -387,20 +387,22 @@ def ExecuteActionWithParam(action): 


	elif action == 'Push_Local_Registry':

		svr_id = test.findtext('svr_id')

		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id)

		tag_prefix = test.findtext('tag_prefix') or ""

		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id, tag_prefix)



	elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':

		if force_local:

			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup

			return True

		svr_id = test.findtext('svr_id')

		tag_prefix = test.findtext('tag_prefix') or ""

		images = test.findtext('images').split()

		# hack: for FlexRIC, we need to overwrite the tag to use

		tag = None

		if len(images) == 1 and images[0] == "oai-flexric":

			tag = CONTAINERS.flexricTag

		if action == "Pull_Local_Registry":

			success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images, tag=tag)

			success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images, tag=tag, tag_prefix=tag_prefix)

		if action == "Clean_Test_Server_Images":

			success = CONTAINERS.Clean_Test_Server_Images(HTML, svr_id, images, tag=tag)
@@ -420,9 +422,10 @@ def ExecuteActionWithParam(action): 
		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)



	elif action == 'Pull_Cluster_Image':

		tag_prefix = test.findtext('tag_prefix') or ""

		images = test.findtext('images').split()

		node = test.findtext('node')

		success = CLUSTER.PullClusterImage(HTML, node, images)

		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)



	else:

		logging.warning(f"unknown action {action}, skip step")