Merge "PNF onboarding step"

1 files changed, 89 insertions, 10 deletions

diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py
index 3c8b183..8ec9165 100644
--- a/src/onaptests/steps/onboard/service.py
+++ b/src/onaptests/steps/onboard/service.py
@@ -1,11 +1,16 @@
+from typing import Any, Dict
 from yaml import load
 
 from onapsdk.configuration import settings
-from onapsdk.sdc.service import Service
+from onapsdk.sdc.component import Component
+from onapsdk.sdc.pnf import Pnf
+from onapsdk.sdc.properties import ComponentProperty
+from onapsdk.sdc.service import Service, ServiceInstantiationType
 from onapsdk.sdc.vf import Vf
 from onapsdk.sdc.vl import Vl
 
 from ..base import BaseStep, YamlTemplateBaseStep
+from .pnf import PnfOnboardStep, YamlTemplatePnfOnboardStep
 from .vf import VfOnboardStep, YamlTemplateVfOnboardStep
 
 
@@ -19,7 +24,10 @@ class ServiceOnboardStep(BaseStep):
             - VfOnboardStep.
         """
         super().__init__(cleanup=cleanup)
-        self.add_step(VfOnboardStep(cleanup=cleanup))
+        if settings.VF_NAME != "":
+            self.add_step(VfOnboardStep(cleanup=cleanup))
+        if settings.PNF_NAME != "":
+            self.add_step(PnfOnboardStep(cleanup=cleanup))
 
     @property
     def description(self) -> str:
@@ -38,11 +46,13 @@ class ServiceOnboardStep(BaseStep):
         Use settings values:
          - VL_NAME,
          - VF_NAME,
-         - SERVICE_NAME.
+         - PNF_NAME,
+         - SERVICE_NAME,
+         - SERVICE_INSTANTIATION_TYPE.
 
         """
         super().execute()
-        service: Service = Service(name=settings.SERVICE_NAME)
+        service: Service = Service(name=settings.SERVICE_NAME, instantiation_type=settings.SERVICE_INSTANTIATION_TYPE)
         service.create()
         if settings.VL_NAME != "":
             vl: Vl = Vl(name=settings.VL_NAME)
@@ -50,6 +60,9 @@ class ServiceOnboardStep(BaseStep):
         if settings.VF_NAME != "":
             vf: Vf = Vf(name=settings.VF_NAME)
             service.add_resource(vf)
+        if settings.PNF_NAME != "":
+            pnf: Pnf = Pnf(name=settings.PNF_NAME)
+            service.add_resource(pnf)
         service.checkin()
         service.onboard()
 
@@ -65,7 +78,10 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep):
         """
         super().__init__(cleanup=cleanup)
         self._yaml_template: dict = None
-        self.add_step(YamlTemplateVfOnboardStep(cleanup=cleanup))
+        if "vnfs" in self.yaml_template[self.service_name]:
+            self.add_step(YamlTemplateVfOnboardStep(cleanup=cleanup))
+        if "pnfs" in self.yaml_template[self.service_name]:
+            self.add_step(YamlTemplatePnfOnboardStep(cleanup=cleanup))
 
     @property
     def description(self) -> str:
@@ -106,15 +122,33 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep):
         """
         if self.is_root:
             return next(iter(self.yaml_template.keys()))
-        else:
-            return self.parent.service_name
+        return self.parent.service_name
 
     @YamlTemplateBaseStep.store_state
     def execute(self):
         """Onboard service."""
         super().execute()
-        service: Service = Service(name=settings.SERVICE_NAME)
+        if "instantiation_type" in self.yaml_template[self.service_name]:
+            instantiation_type: ServiceInstantiationType = ServiceInstantiationType(
+                self.yaml_template[self.service_name]["instantiation_type"])
+        else:
+            instantiation_type: ServiceInstantiationType = ServiceInstantiationType.A_LA_CARTE
+        service: Service = Service(name=settings.SERVICE_NAME, instantiation_type=instantiation_type)
         service.create()
+        self.declare_resources(service)
+        self.assign_properties(service)
+        service.checkin()
+        service.onboard()
+
+    def declare_resources(self, service: Service) -> None:
+        """Declare resources.
+
+        Resources defined in YAML template are declared.
+
+        Args:
+            service (Service): Service object
+
+        """
         if "networks" in self.yaml_template[self.service_name]:
             for net in self.yaml_template[self.service_name]["networks"]:
                 vl: Vl = Vl(name=net['vl_name'])
@@ -123,5 +157,50 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep):
             for vnf in self.yaml_template[self.service_name]["vnfs"]:
                 vf: Vf = Vf(name=vnf["vnf_name"])
                 service.add_resource(vf)
-        service.checkin()
-        service.onboard()
+        if "pnfs" in self.yaml_template[self.service_name]:
+            for pnf in self.yaml_template[self.service_name]["pnfs"]:
+                pnf_obj: Pnf = Pnf(name=pnf["pnf_name"])
+                service.add_resource(pnf_obj)
+
+    def assign_properties(self, service: Service) -> None:
+        """Assign components properties.
+
+        For each component set properties and it's value if are declared
+            in YAML template.
+
+        Args:
+            service (Service): Service object
+
+        """
+        if "networks" in self.yaml_template[self.service_name]:
+            for net in self.yaml_template[self.service_name]["networks"]:
+                if "properties" in net:
+                    vl: Vl = Vl(name=net['vl_name'])
+                    vl_component: Component = service.get_component(vl)
+                    self.assign_properties_to_component(vl_component, net["properties"])
+        if "vnfs" in self.yaml_template[self.service_name]:
+            for vnf in self.yaml_template[self.service_name]["vnfs"]:
+                if "properties" in vnf:
+                    vf: Vf = Vf(name=vnf["vnf_name"])
+                    vf_component: Component = service.get_component(vf)
+                    self.assign_properties_to_component(vf_component, vnf["properties"])
+        if "pnfs" in self.yaml_template[self.service_name]:
+            for pnf in self.yaml_template[self.service_name]["pnfs"]:
+                if "properties" in pnf:
+                    pnf_obj: Pnf = Pnf(name=pnf["pnf_name"])
+                    pnf_component: Component = service.get_component(pnf_obj)
+                    self.assign_properties_to_component(pnf_component, pnf["properties"])
+
+    def assign_properties_to_component(self,
+                                       component: Component,
+                                       component_properties: Dict[str, Any]) -> None:
+        """Assign properties to component.
+
+        Args:
+            component (Component): Component to which properites are going to be assigned
+            component_properties (Dict[str, Any]): Properties dictionary
+
+        """
+        for property_name, property_value in component_properties.items():
+            prop: ComponentProperty = component.get_property(property_name)
+            prop.value = property_value