From 9ae6448df2adb57822c81c15961464e10d39bf8d Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Sun, 30 Jul 2023 08:04:26 +0000 Subject: Simplify PNF Macro VES Send process Issue-ID: TEST-404 Signed-off-by: pawel.denst Signed-off-by: Lukasz Rajewski Change-Id: I7b3fd8f4bd96ff02dadf2662a1a16079a00fb1d0 --- src/onaptests/scenario/pnf_macro.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/onaptests/scenario') diff --git a/src/onaptests/scenario/pnf_macro.py b/src/onaptests/scenario/pnf_macro.py index a07404f..630e439 100644 --- a/src/onaptests/scenario/pnf_macro.py +++ b/src/onaptests/scenario/pnf_macro.py @@ -1,12 +1,15 @@ """Instantiate service with PNF using SO macro flow.""" from onapsdk.configuration import settings +from yaml import SafeLoader, load + from onaptests.scenario.scenario_base import BaseStep, ScenarioBase, YamlTemplateBaseScenarioStep +from onaptests.steps.instantiate.pnf_register_ves import \ + SendPnfRegisterVesEvent from onaptests.steps.instantiate.service_macro import \ YamlTemplateServiceMacroInstantiateStep from onaptests.steps.onboard.cds import CbaEnrichStep from onaptests.steps.simulator.pnf_simulator_cnf.pnf_register import \ PnfSimulatorCnfRegisterStep -from yaml import SafeLoader, load class PnfMacroScenarioStep(YamlTemplateBaseScenarioStep): @@ -20,7 +23,10 @@ class PnfMacroScenarioStep(YamlTemplateBaseScenarioStep): """ super().__init__(cleanup=BaseStep.HAS_NO_CLEANUP) self._yaml_template: dict = None - self.add_step(PnfSimulatorCnfRegisterStep()) + if settings.USE_SIMULATOR: + self.add_step(PnfSimulatorCnfRegisterStep()) + else: + self.add_step(SendPnfRegisterVesEvent()) self.add_step(CbaEnrichStep()) self.add_step(YamlTemplateServiceMacroInstantiateStep()) -- cgit 1.2.3-korg