From c10f9f4706aeb848cc55ad7a552081dbf3e7b6a7 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Fri, 16 Jun 2023 15:56:52 +0000 Subject: BaseScenario class added It prints out settings and will unify logic of scenarios later on. Issue-ID: TEST-395 Signed-off-by: Lukasz Rajewski Change-Id: Ie5929e0cc136183d4374b95bfc1600445126c4b6 --- src/onaptests/scenario/basic_cnf_macro.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/onaptests/scenario/basic_cnf_macro.py') diff --git a/src/onaptests/scenario/basic_cnf_macro.py b/src/onaptests/scenario/basic_cnf_macro.py index ddc8802..18435ca 100644 --- a/src/onaptests/scenario/basic_cnf_macro.py +++ b/src/onaptests/scenario/basic_cnf_macro.py @@ -1,16 +1,16 @@ """Instantiate basic cnf using SO macro flow.""" import logging import time -from yaml import load, SafeLoader from onapsdk.configuration import settings from onapsdk.exceptions import SDKException -from xtesting.core import testcase - +from onaptests.scenario.scenario_base import ScenarioBase from onaptests.steps.base import YamlTemplateBaseStep +from onaptests.steps.instantiate.service_macro import \ + YamlTemplateServiceMacroInstantiateStep from onaptests.steps.onboard.cds import CbaPublishStep from onaptests.utils.exceptions import OnapTestException -from onaptests.steps.instantiate.service_macro import YamlTemplateServiceMacroInstantiateStep +from yaml import SafeLoader, load class BasicCnfMacroStep(YamlTemplateBaseStep): @@ -98,17 +98,14 @@ class BasicCnfMacroStep(YamlTemplateBaseStep): return settings.SERVICE_INSTANCE_NAME -class BasicCnfMacro(testcase.TestCase): +class BasicCnfMacro(ScenarioBase): """Instantiate a basic cnf macro.""" __logger = logging.getLogger() def __init__(self, **kwargs): """Init Basic Cnf Macro use case.""" - if "case_name" not in kwargs: - kwargs["case_name"] = 'basic_cnf_macro' - super().__init__(**kwargs) - self.__logger.debug("Basic Cnf macro init started") + super().__init__('basic_cnf_macro', **kwargs) self.test = BasicCnfMacroStep(cleanup=settings.CLEANUP_FLAG) def run(self): -- cgit 1.2.3-korg