[TEST] Use the newest ONAP SDK version

Use `a_la_carte` flag in vnf and vf_module SO deletion

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

diff --git a/requirements.txt b/requirements.txt
index 0abd52a..1c0d5f3 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 xtesting
 openstacksdk
-onapsdk==7.5.1
+onapsdk==8.1.2
 jinja2
 kubernetes
 avionix==0.4.4
\ No newline at end of file

diff --git a/src/onaptests/steps/instantiate/service_ala_carte.py b/src/onaptests/steps/instantiate/service_ala_carte.py
index 858db2d..8ce2871 100644 (file)
--- a/src/onaptests/steps/instantiate/service_ala_carte.py
+++ b/src/onaptests/steps/instantiate/service_ala_carte.py
@@ -251,7 +251,7 @@ class YamlTemplateServiceAlaCarteInstantiateStep(YamlTemplateBaseStep):
             Exception: Service cleaning failed
 
         """
-        service_deletion = self._service_instance.delete()
+        service_deletion = self._service_instance.delete(a_la_carte=True)
         try:
             service_deletion.wait_for_finish(settings.ORCHESTRATION_REQUEST_TIMEOUT)
         except TimeoutError:

diff --git a/src/onaptests/steps/instantiate/service_macro.py b/src/onaptests/steps/instantiate/service_macro.py
index 1264dd8..7ed4952 100644 (file)
--- a/src/onaptests/steps/instantiate/service_macro.py
+++ b/src/onaptests/steps/instantiate/service_macro.py
@@ -214,7 +214,7 @@ class YamlTemplateServiceMacroInstantiateStep(YamlTemplateBaseStep):
 
         """
         if self._service_instance:
-            service_deletion = self._service_instance.delete()
+            service_deletion = self._service_instance.delete(a_la_carte=False)
             try:
                 service_deletion.wait_for_finish(timeout=settings.ORCHESTRATION_REQUEST_TIMEOUT)
             except TimeoutError:

diff --git a/src/onaptests/steps/instantiate/vf_module_ala_carte.py b/src/onaptests/steps/instantiate/vf_module_ala_carte.py
index ee20bc6..65559ca 100644 (file)
--- a/src/onaptests/steps/instantiate/vf_module_ala_carte.py
+++ b/src/onaptests/steps/instantiate/vf_module_ala_carte.py
@@ -166,7 +166,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep):
             for vf_module in vnf_instance.vf_modules:
                 self._logger.info("Delete VF Module %s",
                                   vf_module.name)
-                vf_module_deletion = vf_module.delete()
+                vf_module_deletion = vf_module.delete(a_la_carte=True)
 
                 try:
                     vf_module_deletion.wait_for_finish(settings.ORCHESTRATION_REQUEST_TIMEOUT)

diff --git a/src/onaptests/steps/instantiate/vl_ala_carte.py b/src/onaptests/steps/instantiate/vl_ala_carte.py
index fd040aa..75dcdb9 100644 (file)
--- a/src/onaptests/steps/instantiate/vl_ala_carte.py
+++ b/src/onaptests/steps/instantiate/vl_ala_carte.py
@@ -159,7 +159,7 @@ class YamlTemplateVlAlaCarteInstantiateStep(YamlTemplateBaseStep):
         if settings.CLEANUP_FLAG:
             for net_instance in self._service_instance.network_instances:
                 self._logger.info("Start network deletion %s",net_instance.name)
-                net_deletion = net_instance.delete()
+                net_deletion = net_instance.delete(a_la_carte=True)
                 try:
                     net_deletion.wait_for_finish(settings.ORCHESTRATION_REQUEST_TIMEOUT)
                     if net_deletion.failed:

diff --git a/src/onaptests/steps/instantiate/vnf_ala_carte.py b/src/onaptests/steps/instantiate/vnf_ala_carte.py
index 9dc062a..c97add5 100644 (file)
--- a/src/onaptests/steps/instantiate/vnf_ala_carte.py
+++ b/src/onaptests/steps/instantiate/vnf_ala_carte.py
@@ -135,7 +135,7 @@ class YamlTemplateVnfAlaCarteInstantiateStep(YamlTemplateBaseStep):
 
         """
         for vnf_instance in self._service_instance.vnf_instances:
-            vnf_deletion = vnf_instance.delete()
+            vnf_deletion = vnf_instance.delete(a_la_carte=True)
 
             try:
                 vnf_deletion.wait_for_finish(settings.ORCHESTRATION_REQUEST_TIMEOUT)