Add cleanup function

Issue-ID: TEST-240

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I784e958f869a0cbee702c915509fe80d37d44b65
Signed-off-by: mrichomme <morgan.richomme@orange.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/run_basicvm_nomulticloud.py b/run_basicvm_nomulticloud.py
index 03246cc..e6be410 100644
--- a/run_basicvm_nomulticloud.py
+++ b/run_basicvm_nomulticloud.py
@@ -1,4 +1,5 @@
 import logging.config
+import time
 from onapsdk.configuration import settings
 from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep
 
@@ -8,6 +9,14 @@ if __name__ == "__main__":
     # logging configuration for onapsdk, it is not requested for onaptests
     # Correction requested in onapsdk to avoid having this duplicate code
     logging.config.dictConfig(settings.LOG_CONFIG)
+    logger = logging.getLogger("Instantiate Basic VM without multicloud")
 
-    basic_vm_instantiate = YamlTemplateVfModuleAlaCarteInstantiateStep()
+    basic_vm_instantiate = YamlTemplateVfModuleAlaCarteInstantiateStep(
+        cleanup=settings.CLEANUP_FLAG)
     basic_vm_instantiate.execute()
+    if settings.CLEANUP_FLAG:
+        time.sleep(settings.CLEANUP_ACTIVITY_TIMER)
+        try:
+            basic_vm_instantiate.cleanup()
+        except ValueError as error:
+            logger.info("service instance deleted as expected {0}".format(error))