From d3837cd3b0bf69da61025ca89e68dc26460c053a Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 11 Aug 2025 12:29:46 +0200 Subject: [PATCH] Deploy_Run_PhySim(): pass node name harmonize with other code that takes a "node" parameter. --- ci-scripts/cls_cluster.py | 8 ++++---- ci-scripts/main.py | 4 ++-- ci-scripts/xml_files/physim_4g_deploy_run.xml | 2 +- ci-scripts/xml_files/physim_5g_deploy_run.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index ba8c208508..dd3c66d989 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -421,17 +421,17 @@ class Cluster: return status - def deploy_oc_physim(self, ctx, HTML, oc_release, svr_id): + def deploy_oc_physim(self, ctx, HTML, oc_release, node): if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '': HELP.GenericHelp(CONST.Version) raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {self.ranBranch} ranCommitID {self.ranCommitID}') image_tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge) - logging.debug(f'Running physims from server: {svr_id}') + logging.debug(f'Running physims from server: {node}') script = "scripts/oc-deploy-physims.sh" options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {self.eNBSourceCodePath}" - ret = cls_cmd.runScript(svr_id, script, 600, options) + ret = cls_cmd.runScript(node, script, 600, options) logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}') - with cls_cmd.getConnection(svr_id) as ssh: + with cls_cmd.getConnection(node) as ssh: details_json = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-tests.json') result_junit = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-run.xml') archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_log.txt') diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 30fe2bd5c9..e7d7ffd3b5 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -296,8 +296,8 @@ def ExecuteActionWithParam(action, ctx): elif action == 'Deploy_Run_PhySim': oc_release = test.findtext('oc_release') - svr_id = test.findtext('svr_id') or None - success = CLUSTER.deploy_oc_physim(ctx, HTML, oc_release, svr_id) + node = test.findtext('node') or None + success = CLUSTER.deploy_oc_physim(ctx, HTML, oc_release, node) elif action == 'DeployCoreNetwork' or action == 'UndeployCoreNetwork': cn_id = test.findtext('cn_id') diff --git a/ci-scripts/xml_files/physim_4g_deploy_run.xml b/ci-scripts/xml_files/physim_4g_deploy_run.xml index 7dcdd61ee0..bdad3e412f 100644 --- a/ci-scripts/xml_files/physim_4g_deploy_run.xml +++ b/ci-scripts/xml_files/physim_4g_deploy_run.xml @@ -40,7 +40,7 @@ Deploy_Run_PhySim Deploy and run physical simulator on openshift physims-4g - avra + avra diff --git a/ci-scripts/xml_files/physim_5g_deploy_run.xml b/ci-scripts/xml_files/physim_5g_deploy_run.xml index 7cf595b770..08de47aaac 100644 --- a/ci-scripts/xml_files/physim_5g_deploy_run.xml +++ b/ci-scripts/xml_files/physim_5g_deploy_run.xml @@ -40,7 +40,7 @@ Deploy_Run_PhySim Deploy and run physical simulator on openshift physims-5g - avra + avra