Refactor tests to use SDC v2 onapsdk module

Refactored SDC allows to archive and delete SDC resources
Remove unmaintained test basic_clamp

Issue-ID: TEST-404
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I11e4be6f4567098b20733879e393c689766a9c6e

1 files changed, 4 insertions, 5 deletions

diff --git a/src/onaptests/steps/onboard/vsp.py b/src/onaptests/steps/onboard/vsp.py
index 24bae77..4d279c8 100644
--- a/src/onaptests/steps/onboard/vsp.py
+++ b/src/onaptests/steps/onboard/vsp.py
@@ -5,7 +5,7 @@ from onapsdk.sdc.vsp import Vsp
 from onaptests.utils.resources import get_resource_location
 
 from ..base import BaseStep, YamlTemplateBaseStep
-from .vendor import VendorOnboardStep
+from .vendor import VendorOnboardStep, YamlTemplateVendorOnboardStep
 
 
 class VspOnboardStep(BaseStep):
@@ -74,7 +74,7 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep):
             - VendorOnboardStep.
         """
         super().__init__(cleanup=settings.CLEANUP_FLAG)
-        self.add_step(VendorOnboardStep())
+        self.add_step(YamlTemplateVendorOnboardStep())
 
     @property
     def description(self) -> str:
@@ -127,12 +127,11 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep):
          - VENDOR_NAME.
         """
         super().execute()
-        vendor: Vendor = Vendor(name=settings.VENDOR_NAME)
         if "vnfs" in self.yaml_template:
             for vnf in self.yaml_template["vnfs"]:
                 with open(get_resource_location(vnf["heat_files_to_upload"]), "rb") as package:
                     vsp: Vsp = Vsp(name=f"{vnf['vnf_name']}_VSP",
-                                   vendor=vendor,
+                                   vendor=Vendor(name=f"{vnf['vnf_name']}"),
                                    package=package)
                     vsp.onboard()
         elif "pnfs" in self.yaml_template:
@@ -140,7 +139,7 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep):
                 if "heat_files_to_upload" in pnf:
                     with open(get_resource_location(pnf["heat_files_to_upload"]), "rb") as package:
                         vsp: Vsp = Vsp(name=f"{pnf['pnf_name']}_VSP",
-                                       vendor=vendor,
+                                       vendor=Vendor(name=f"{pnf['pnf_name']}"),
                                        package=package)
                         vsp.onboard()