3 files changed, 147 insertions, 0 deletions
diff --git a/src/onaptests/scenario/basic_vm_macro.py b/src/onaptests/scenario/basic_vm_macro.py
index f22ee12..67dded9 100644
--- a/src/onaptests/scenario/basic_vm_macro.py
+++ b/src/onaptests/scenario/basic_vm_macro.py
@@ -72,6 +72,10 @@ class BasicVmMacroStep(YamlTemplateBaseStep):
         return self._yaml_template
 
     @property
+    def model_yaml_template(self) -> dict:
+        return {}
+
+    @property
     def service_name(self) -> dict:
         """Service name.
 
diff --git a/src/onaptests/scenario/multi_vnf_macro.py b/src/onaptests/scenario/multi_vnf_macro.py
new file mode 100644
index 0000000..284baf0
--- /dev/null
+++ b/src/onaptests/scenario/multi_vnf_macro.py
@@ -0,0 +1,139 @@
+"""Instantiate basic vm using SO macro flow."""
+import logging
+import time
+
+from yaml import load
+
+from onapsdk.configuration import settings
+from onapsdk.exceptions import SDKException
+from xtesting.core import testcase
+
+from onaptests.steps.base import YamlTemplateBaseStep
+from onaptests.steps.onboard.cds import CbaPublishStep
+from onaptests.utils.exceptions import OnapTestException
+from onaptests.steps.instantiate.service_macro import YamlTemplateServiceMacroInstantiateStep
+
+
+class MultiVnfUbuntuMacroStep(YamlTemplateBaseStep):
+
+    def __init__(self, cleanup=False):
+        """Initialize step.
+
+        Substeps:
+            - CbaPublishStep
+            - YamlTemplateServiceAlaCarteInstantiateStep.
+        """
+        super().__init__(cleanup=cleanup)
+        self._yaml_template: dict = None
+        self._model_yaml_template: dict = None
+        self.add_step(CbaPublishStep(
+            cleanup=settings.CLEANUP_FLAG
+        ))
+        self.add_step(YamlTemplateServiceMacroInstantiateStep(
+            cleanup=settings.CLEANUP_FLAG
+        ))
+
+    @property
+    def description(self) -> str:
+        """Step description.
+
+        Used for reports
+
+        Returns:
+            str: Step description
+
+        """
+        return "Multi VNF Ubuntu macro scenario step"
+
+    @property
+    def component(self) -> str:
+        """Component name.
+
+        Name of component which step is related with.
+            Most is the name of ONAP component.
+
+        Returns:
+            str: Component name
+
+        """
+        return "PythonSDK-tests"
+
+    @property
+    def yaml_template(self) -> dict:
+        """YAML template abstract property.
+
+        Every YAML template step need to implement that property.
+
+        Returns:
+            dict: YAML template
+
+        """
+        if not self._yaml_template:
+            with open(settings.SERVICE_YAML_TEMPLATE, "r") as yaml_template:
+                self._yaml_template: dict = load(yaml_template)
+        return self._yaml_template
+
+    @property
+    def model_yaml_template(self) -> dict:
+        if not self._model_yaml_template:
+            with open(settings.MODEL_YAML_TEMPLATE, "r") as model_yaml_template:
+                self._model_yaml_template: dict = load(model_yaml_template)
+        return self._model_yaml_template
+
+    @property
+    def service_name(self) -> dict:
+        """Service name.
+
+        Get from YAML template.
+
+        Returns:
+            str: Service name
+
+        """
+        return next(iter(self.yaml_template.keys()))
+
+    @property
+    def service_instance_name(self) -> str:
+        """Service instance name.
+
+        Returns:
+            str: Service instance name
+
+        """
+        return settings.SERVICE_INSTANCE_NAME
+
+
+class MultiVnfUbuntuMacro(testcase.TestCase):
+    """Instantiate a basic vm macro."""
+
+    __logger = logging.getLogger(__name__)
+
+    def __init__(self, **kwargs):
+        """Init Basic Macro use case."""
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'nso_ubuntu_macro'
+        super().__init__(**kwargs)
+        self.__logger.debug("NSO Ubuntu macro init started")
+        self.test = MultiVnfUbuntuMacro(cleanup=settings.CLEANUP_FLAG)
+
+    def run(self):
+        """Run NSO Ubuntu macro test."""
+        self.start_time = time.time()
+        try:
+            self.test.execute()
+            self.__logger.info("Starting to clean up in {} seconds".format(settings.CLEANUP_ACTIVITY_TIMER))
+            time.sleep(settings.CLEANUP_ACTIVITY_TIMER)
+            self.test.cleanup()
+            self.result = 100
+        except OnapTestException as exc:
+            self.result = 0
+            self.__logger.error(exc.error_message)
+        except SDKException:
+            self.result = 0
+            self.__logger.error("SDK Exception")
+        finally:
+            self.stop_time = time.time()
+
+    def clean(self):
+        """Generate report."""
+        self.test.reports_collection.generate_report()
diff --git a/src/onaptests/scenario/pnf_macro.py b/src/onaptests/scenario/pnf_macro.py
index e86557b..73a2adf 100644
--- a/src/onaptests/scenario/pnf_macro.py
+++ b/src/onaptests/scenario/pnf_macro.py
@@ -76,6 +76,10 @@ class PnfMacroScenarioStep(YamlTemplateBaseStep):
         return self._yaml_template
 
     @property
+    def model_yaml_template(self) -> dict:
+        return {}
+
+    @property
     def service_name(self) -> dict:
         """Service name.