From ed9b039e5f4b54aa6ebbef7aa95fafdce7d5ce75 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Tue, 11 May 2021 07:56:34 +0000 Subject: [TEST] Do not try to recreate already created SDC resources When try to recreate SDC resources like VF, PNF or Service it's API returns errors. Check before onboarding if resource we want to create already exists. Issue-ID: TEST-333 Signed-off-by: Michal Jagiello Change-Id: I852bdf12bc6acd5ef8be52c9a883861f53d4a9ac --- src/onaptests/steps/onboard/vf.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'src/onaptests/steps/onboard/vf.py') diff --git a/src/onaptests/steps/onboard/vf.py b/src/onaptests/steps/onboard/vf.py index 5f5fc4d..d26e123 100644 --- a/src/onaptests/steps/onboard/vf.py +++ b/src/onaptests/steps/onboard/vf.py @@ -40,7 +40,8 @@ class VfOnboardStep(BaseStep): super().execute() vsp: Vsp = Vsp(name=settings.VSP_NAME) vf: Vf = Vf(name=settings.VF_NAME, vsp=vsp) - vf.onboard() + if not vf.created: + vf.onboard() class YamlTemplateVfOnboardStep(YamlTemplateBaseStep): @@ -85,15 +86,16 @@ class YamlTemplateVfOnboardStep(YamlTemplateBaseStep): for vnf in self.yaml_template["vnfs"]: vsp: Vsp = Vsp(name=f"{vnf['vnf_name']}_VSP") vf: Vf = Vf(name=vnf['vnf_name'], vsp=vsp) - if all([x in vnf for x in ["vnf_artifact_type", - "vnf_artifact_name", - "vnf_artifact_label", - "vnf_artifact_file_path"]]): - vf.create() - vf.add_deployment_artifact( - artifact_type=vnf["vnf_artifact_type"], - artifact_name=vnf["vnf_artifact_name"], - artifact_label=vnf["vnf_artifact_label"], - artifact=vnf["vnf_artifact_file_path"] - ) - vf.onboard() + if not vf.created: + if all([x in vnf for x in ["vnf_artifact_type", + "vnf_artifact_name", + "vnf_artifact_label", + "vnf_artifact_file_path"]]): + vf.create() + vf.add_deployment_artifact( + artifact_type=vnf["vnf_artifact_type"], + artifact_name=vnf["vnf_artifact_name"], + artifact_label=vnf["vnf_artifact_label"], + artifact=vnf["vnf_artifact_file_path"] + ) + vf.onboard() -- cgit 1.2.3-korg