X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;h=fba7ce1d1cb5588c6e3077e81d9cb041e8c6ec85;hb=0879ce9a9e28909ece90c603cb99c772b2552370;hp=82a7f4e525ecf1389a18e8001b7c5f88e5aca76f;hpb=1db958d9bb3ea59931b613b0d9be18da6ae523ad;p=osm%2FSO.git

diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index 82a7f4e5..fba7ce1d 100644
--- 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)