diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-03-16 13:43:57 +0000 |
|---|---|---|
| committer | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-03-17 11:06:08 +0000 |
| commit | 066e6c39c2a5133f89d1f00f25a247f7ce402f10 (patch) | |
| tree | b2d7eb9b67ee7ec53da8ad2aa2aa8dff0b4758fd /src/onaptests/steps/onboard/vsp.py | |
| parent | d6d052a5f1ce0ae0f0debcbb11220fce1c1dfdc5 (diff) | |
Fix tests regression
Delete SDC resources only if exists and archive all before delete
Bump onapsdk requirements
Issue-ID: INT-2193
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I1c116b93ab1dc4be2501df57b2a7d2d97354cfa5
Diffstat (limited to 'src/onaptests/steps/onboard/vsp.py')
| -rw-r--r-- | src/onaptests/steps/onboard/vsp.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/onaptests/steps/onboard/vsp.py b/src/onaptests/steps/onboard/vsp.py index a7fcf9f..49b766b 100644 --- a/src/onaptests/steps/onboard/vsp.py +++ b/src/onaptests/steps/onboard/vsp.py @@ -47,8 +47,9 @@ class VspOnboardStep(BaseStep): @BaseStep.store_state(cleanup=True) def cleanup(self): vsp: Vsp = Vsp(name=settings.VSP_NAME) - vsp.archive() - vsp.delete() + if vsp.exists(): + vsp.archive() + vsp.delete() super().cleanup() @@ -131,11 +132,13 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep): if "vnfs" in self.yaml_template: for vnf in self.yaml_template["vnfs"]: vsp: Vsp = Vsp(name=f"{vnf['vnf_name']}_VSP") - vsp.archive() - vsp.delete() + if vsp.exists(): + vsp.archive() + vsp.delete() elif "pnfs" in self.yaml_template: for pnf in self.yaml_template["pnfs"]: vsp: Vsp = Vsp(name=f"{pnf['pnf_name']}_VSP") - vsp.archive() - vsp.delete() + if vsp.exists(): + vsp.archive() + vsp.delete() super().cleanup() |