Bug 240 - NS Scaling Scale out

[osm/SO.git] / rwlaunchpad / plugins / rwnsm / rift / tasklets / rwnsmtasklet / openmano_nsm.py

diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index 82a7f4e..fba7ce1 100644 (file)
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
@@ -394,7 +394,6 @@ class OpenmanoNsr(object):
         openmano_instance_create["name"] = self._nsr_config_msg.name
         openmano_instance_create["description"] = self._nsr_config_msg.description
         openmano_instance_create["scenario"] = self._nsd_uuid
-        self._log.debug("DEBUG NSRID %s", self._nsd_uuid)
 
         cloud_config = self.get_ssh_key_pairs()
         if cloud_config:
@@ -455,12 +454,13 @@ class OpenmanoNsr(object):
     def scaling_instance_create_yaml(self, scaleout=False):
         self._log.debug("Creating instance-scenario-create input file for nsd %s with name %s", self.nsd.id, self._nsr_config_msg.name+"scal1")
         scaling_instance_create = {}
-        scaling_instance_create["name"] = self._nsr_config_msg.name + "__"+"scaling_group"
+        for group_list in self._nsd_msg.scaling_group_descriptor:
+            scaling_instance_create["name"] = self._nsr_config_msg.name + "__"+group_list.name
+            if scaleout:
+                scaling_instance_create["scenario"] = self._nsd_uuid + "__" +group_list.name
+            else:
+                scaling_instance_create["scenario"] = self._nsd_uuid
         scaling_instance_create["description"] = self._nsr_config_msg.description
-        if scaleout:
-            scaling_instance_create["scenario"] = self._nsd_uuid + "__" +"scal"
-        else:
-            scaling_instance_create["scenario"] = self._nsd_uuid
 
 
         if self._nsr_config_msg.has_field("om_datacenter"):
@@ -490,7 +490,7 @@ class OpenmanoNsr(object):
                     elif vld_msg.has_field("om_datacenter"):
                         network["datacenter"] = vld_msg.om_datacenter
                     elif "datacenter" in scaling_instance_create:
-                        network["datacenter"] = openmano_instance_create["datacenter"]
+                        network["datacenter"] = scaling_instance_create["datacenter"]
                     if network:
                         scaling_instance_create["networks"][vld_msg.name]["sites"].append(network)