From 4bccbde3060931c8fcf61fbf8b61db4a85b3200e Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Thu, 27 Jul 2023 14:59:15 +0000 Subject: Change cleanup process of tests Issue-ID: TEST-402 Signed-off-by: Lukasz Rajewski Change-Id: Iffe3aeaa4eab6adcabc94d143d1f94a684cd4657 --- src/onaptests/scenario/basic_network.py | 47 +-------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) (limited to 'src/onaptests/scenario/basic_network.py') diff --git a/src/onaptests/scenario/basic_network.py b/src/onaptests/scenario/basic_network.py index 32d2095..55427bf 100644 --- a/src/onaptests/scenario/basic_network.py +++ b/src/onaptests/scenario/basic_network.py @@ -1,60 +1,15 @@ #!/usr/bin/env python """Basic VM test case.""" -import logging -import time - -from onapsdk.configuration import settings -from onapsdk.exceptions import SDKException from onaptests.scenario.scenario_base import ScenarioBase from onaptests.steps.instantiate.vl_ala_carte import \ YamlTemplateVlAlaCarteInstantiateStep -from onaptests.utils.exceptions import OnapTestException class BasicNetwork(ScenarioBase): """Onboard then instantiate a simple Network with ONAP.""" - __logger = logging.getLogger(__name__) - def __init__(self, **kwargs): """Init Basic Network use case.""" # import basic_network_nomulticloud_settings needed super().__init__('basic_network', **kwargs) - self.test = YamlTemplateVlAlaCarteInstantiateStep( - cleanup=settings.CLEANUP_FLAG) - self.start_time = None - self.stop_time = None - self.result = 0 - - def run(self): - """Run onap_tests with basic network.""" - self.start_time = time.time() - self.__logger.debug("start time") - try: - self.test.execute() - self.__logger.info("Service basic_network successfully created") - # The cleanup is part of the test, not only a teardown action - if settings.CLEANUP_FLAG: - self.__logger.info("Service basic_network cleanup called") - time.sleep(settings.CLEANUP_ACTIVITY_TIMER) - try: - self.test.cleanup() - except SDKException as error: - self.__logger.info("service deletion error {0}".format(error)) - self.result = 100 - else: - self.__logger.info("No cleanup requested. Test completed.") - self.result = 100 - except OnapTestException as exc: - self.result = 0 - self.__logger.exception(exc.error_message) - except SDKException: - self.result = 0 - self.__logger.exception("SDK Exception") - finally: - self.stop_time = time.time() - - def clean(self): - """Clean Additional resources if needed.""" - self.__logger.info("Generate Test report") - self.test.reports_collection.generate_report() + self.test = YamlTemplateVlAlaCarteInstantiateStep() -- cgit 1.2.3-korg