diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2021-05-12 14:41:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-05-12 14:41:05 +0000 |
| commit | 7ad3d1fd3b3f85c1a3154630da3ef00ce0e439a5 (patch) | |
| tree | 08f85a59e627edb339de040d482a3f7bdf417652 /src/onaptests/steps/onboard/pnf.py | |
| parent | 3f016d80eb03011339949abbc41ff33b06d09faa (diff) | |
| parent | ed9b039e5f4b54aa6ebbef7aa95fafdce7d5ce75 (diff) | |
Merge "[TEST] Do not try to recreate already created SDC resources"
Diffstat (limited to 'src/onaptests/steps/onboard/pnf.py')
| -rw-r--r-- | src/onaptests/steps/onboard/pnf.py | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/onaptests/steps/onboard/pnf.py b/src/onaptests/steps/onboard/pnf.py index 6250d7e..c5958dc 100644 --- a/src/onaptests/steps/onboard/pnf.py +++ b/src/onaptests/steps/onboard/pnf.py @@ -50,14 +50,15 @@ class PnfOnboardStep(BaseStep): super().execute() vendor: Vendor = Vendor(name=settings.VENDOR_NAME) pnf: Pnf = Pnf(name=settings.PNF_NAME, vendor=vendor) - pnf.create() - pnf.add_deployment_artifact( - artifact_type=settings.PNF_ARTIFACT_TYPE, - artifact_name=settings.PNF_ARTIFACT_NAME, - artifact_label=settings.PNF_ARTIFACT_LABEL, - artifact=settings.PNF_ARTIFACT_FILE_PATH - ) - pnf.onboard() + if not pnf.created: + pnf.create() + pnf.add_deployment_artifact( + artifact_type=settings.PNF_ARTIFACT_TYPE, + artifact_name=settings.PNF_ARTIFACT_NAME, + artifact_label=settings.PNF_ARTIFACT_LABEL, + artifact=settings.PNF_ARTIFACT_FILE_PATH + ) + pnf.onboard() class YamlTemplatePnfOnboardStep(YamlTemplateBaseStep): @@ -110,11 +111,12 @@ class YamlTemplatePnfOnboardStep(YamlTemplateBaseStep): else: vsp = None pnf_obj: Pnf = Pnf(name=pnf["pnf_name"], vendor=vendor, vsp=vsp) - pnf_obj.create() - pnf_obj.add_deployment_artifact( - artifact_type=pnf["pnf_artifact_type"], - artifact_name=pnf["pnf_artifact_name"], - artifact_label=pnf["pnf_artifact_label"], - artifact=pnf["pnf_artifact_file_path"] - ) - pnf_obj.onboard() + if not pnf_obj.created: + pnf_obj.create() + pnf_obj.add_deployment_artifact( + artifact_type=pnf["pnf_artifact_type"], + artifact_name=pnf["pnf_artifact_name"], + artifact_label=pnf["pnf_artifact_label"], + artifact=pnf["pnf_artifact_file_path"] + ) + pnf_obj.onboard() |