implements #1438

Author: micafer

IM/tosca/Tosca.py

@@ -179,12 +179,6 @@ def to_radl(self, inf_info=None):
                 else:
                     # if not create a system
                     oscar_sys = self._gen_oscar_system(node)
-                    radl.systems.append(oscar_sys)
-                    conf = configure(node.name, None)
-                    radl.configures.append(conf)
-                    level = Tosca._get_dependency_level(node)
-                    cont_items.append(contextualize_item(node.name, conf.name, level))
-                    cloud_id = self._get_placement_property(oscar_sys.name, "cloud_id")
 
                     current_num_instances = self._get_current_num_instances(oscar_sys.name, inf_info)
                     num_instances = num_instances - current_num_instances
@@ -196,9 +190,15 @@ def to_radl(self, inf_info=None):
                         if vm_ids:
                             all_removal_list.extend(vm_ids)
                             Tosca.logger.debug("List of FaaS to delete: %s" % vm_ids)
-
-                    dep = deploy(oscar_sys.name, num_instances if num_instances > 0 else 0, cloud_id)
-                    radl.deploys.append(dep)
+                    else:
+                        radl.systems.append(oscar_sys)
+                        conf = configure(node.name, None)
+                        radl.configures.append(conf)
+                        level = Tosca._get_dependency_level(node)
+                        cont_items.append(contextualize_item(node.name, conf.name, level))
+                        cloud_id = self._get_placement_property(oscar_sys.name, "cloud_id")
+                        dep = deploy(oscar_sys.name, 1, cloud_id)
+                        radl.deploys.append(dep)
             else:
                 if root_type == "tosca.nodes.Compute":
                     # Add the system RADL element

test/unit/Tosca.py

@@ -354,7 +354,8 @@ def test_tosca_oscar_delete(self):
         tosca_data = yaml.safe_dump(tosca_yaml)
 
         tosca = Tosca(tosca_data)
-        _, radl = tosca.to_radl()
+        remove_list, radl = tosca.to_radl()
+        self.assertEqual(remove_list, [])
         radl = parse_radl(str(radl))
         radl.check()
         node = radl.get_configure_by_name('oscar_plants')
@@ -388,10 +389,6 @@ def test_tosca_oscar_delete(self):
         self.assertEqual(remove_list, [1])
         radl = parse_radl(str(radl))
         radl.check()
-        conf = radl.get_configure_by_name('plants')
-        self.assertEqual(conf.recipes, None)
-        self.assertEqual(radl.deploys[0].id, "plants")
-        self.assertEqual(radl.deploys[0].vm_number, 0)
 
     def test_tosca_remove(self):
         tosca_data = read_file_as_string('../files/tosca_remove_no_list.yml')