implements #1438

Author: micafer

IM/REST.py

@@ -773,6 +773,10 @@ def RESTAddResource(infid=None):
 
         vm_ids = InfrastructureManager.AddResource(infid, radl_data, auth, context)
 
+        # If there are no changes in the infra, launch a reconfigure
+        if not remove_list and not vm_ids and context:
+            InfrastructureManager.Reconfigure(infid, "", auth)
+
         # Replace the TOSCA document
         if tosca_data:
             sel_inf = InfrastructureManager.get_infrastructure(infid, auth)

IM/tosca/Tosca.py

@@ -136,6 +136,11 @@ def to_radl(self, inf_info=None):
                             Tosca.logger.warn("Unknown tyoe of token %s. Ignoring." % token_type)
                 radl.ansible_hosts = [ansible_host]
             elif root_type == "tosca.nodes.aisprint.FaaS.Function":
+                min_instances, _, default_instances, count, removal_list = self._get_scalable_properties(node)
+                num_instances = self._get_num_instances(count, default_instances, min_instances)
+                if num_instances not in [0, 1]:
+                    raise Exception("Scalability values of %s only allows 0 or 1." % root_type)
+
                 oscar_host = self._find_host_compute(node, self.tosca.nodetemplates,
                                                      "tosca.nodes.SoftwareComponent")
                 oscar_compute = self._find_host_compute(node, self.tosca.nodetemplates)
@@ -150,13 +155,22 @@ def to_radl(self, inf_info=None):
                     service_password = self._final_function_result(oscar_host.get_property_value('password'),
                                                                    oscar_host)
 
-                    recipe = '  - tasks:\n'
-                    recipe += '    - include_tasks: utils/tasks/oscar_function.yml\n'
-                    recipe += '      vars:\n'
-                    recipe += '        oscar_endpoint: "%s"\n' % service_endpoint
-                    recipe += '        oscar_username: "oscar"\n'
-                    recipe += '        oscar_password: "%s"\n' % service_password
-                    recipe += "        oscar_service_json: '%s'\n" % service_json
+                    if num_instances <= 0:
+                        recipe = '  - tasks:\n'
+                        recipe += '    - include_tasks: utils/tasks/del_oscar_function.yml\n'
+                        recipe += '      vars:\n'
+                        recipe += '        oscar_endpoint: "%s"\n' % service_endpoint
+                        recipe += '        oscar_username: "oscar"\n'
+                        recipe += '        oscar_password: "%s"\n' % service_password
+                        recipe += "        oscar_service_name: '%s'\n" % service_json["name"]
+                    else:
+                        recipe = '  - tasks:\n'
+                        recipe += '    - include_tasks: utils/tasks/oscar_function.yml\n'
+                        recipe += '      vars:\n'
+                        recipe += '        oscar_endpoint: "%s"\n' % service_endpoint
+                        recipe += '        oscar_username: "oscar"\n'
+                        recipe += '        oscar_password: "%s"\n' % service_password
+                        recipe += "        oscar_service_json: '%s'\n" % json.dumps(service_json)
 
                     conf = configure("oscar_%s" % node.name, recipe)
                     radl.configures.append(conf)
@@ -171,7 +185,19 @@ def to_radl(self, inf_info=None):
                     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)
+
+                    current_num_instances = self._get_current_num_instances(oscar_sys.name, inf_info)
+                    num_instances = num_instances - current_num_instances
+                    Tosca.logger.debug("User requested %d instances of type %s and there"
+                                       " are %s" % (num_instances, oscar_sys.name, current_num_instances))
+
+                    if num_instances < 0:
+                        vm_ids = self._get_vm_ids_to_remove(removal_list, num_instances, inf_info, oscar_sys)
+                        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:
                 if root_type == "tosca.nodes.Compute":
@@ -184,33 +210,17 @@ def to_radl(self, inf_info=None):
                     # Add the deploy element for this system
                     min_instances, _, default_instances, count, removal_list = self._get_scalable_properties(
                         node)
-                    if count is not None:
-                        # we must check the correct number of instances to
-                        # deploy
-                        num_instances = count
-                    elif default_instances is not None:
-                        num_instances = default_instances
-                    elif min_instances is not None:
-                        num_instances = min_instances
-                    else:
-                        num_instances = 1
-
-                    current_num_instances = self._get_num_instances(sys.name, inf_info)
+                    num_instances = self._get_num_instances(count, default_instances, min_instances)
+                    current_num_instances = self._get_current_num_instances(sys.name, inf_info)
                     num_instances = num_instances - current_num_instances
                     Tosca.logger.debug("User requested %d instances of type %s and there"
                                        " are %s" % (num_instances, sys.name, current_num_instances))
 
                     if num_instances < 0:
-                        if removal_list:
-                            # TODO: Think about to check the IDs of the VMs
-                            all_removal_list.extend([int(vm_id) for vm_id in removal_list[0:-num_instances]])
-                        # if no removal list is set, delete the oldest VMs of this type
-                        elif inf_info:
-                            vm_list = inf_info.get_vm_list_by_system_name()
-                            if sys.name in vm_list:
-                                vms = sorted(vm_list[sys.name], key=lambda vm: vm.creation_date)
-                                all_removal_list.extend([vm.im_id for vm in vms[0:-num_instances]])
-                        Tosca.logger.debug("List of VMs to delete: %s" % all_removal_list)
+                        vm_ids = self._get_vm_ids_to_remove(removal_list, num_instances, inf_info, sys)
+                        if vm_ids:
+                            all_removal_list.extend(vm_ids)
+                            Tosca.logger.debug("List of VMs to delete: %s" % vm_ids)
 
                     if num_instances > 0:
                         cloud_id = self._get_placement_property(sys.name, "cloud_id")
@@ -246,6 +256,32 @@ def to_radl(self, inf_info=None):
 
         return all_removal_list, self._complete_radl_networks(radl)
 
+    @staticmethod
+    def _get_num_instances(count, default_instances, min_instances):
+        # we must check the correct number of instances to deploy
+        if count is not None:
+            num_instances = count
+        elif default_instances is not None:
+            num_instances = default_instances
+        elif min_instances is not None:
+            num_instances = min_instances
+        else:
+            num_instances = 1
+        return num_instances
+
+    @staticmethod
+    def _get_vm_ids_to_remove(removal_list, num_instances, inf_info, sys):
+        if removal_list:
+            # TODO: Think about to check the IDs of the VMs
+            return [int(vm_id) for vm_id in removal_list[0:-num_instances]]
+        # if no removal list is set, delete the oldest VMs of this type
+        elif inf_info:
+            vm_list = inf_info.get_vm_list_by_system_name()
+            if sys.name in vm_list:
+                vms = sorted(vm_list[sys.name], key=lambda vm: vm.creation_date)
+                return [vm.im_id for vm in vms[0:-num_instances]]
+        return None
+
     @staticmethod
     def _check_private_networks(radl, inf_info):
         """
@@ -336,7 +372,7 @@ def _order_deploys(radl):
         radl.deploys = fe + wn + priv
 
     @staticmethod
-    def _get_num_instances(sys_name, inf_info):
+    def _get_current_num_instances(sys_name, inf_info):
         """
         Get the current number of instances of system type name sys_name
         """
@@ -2003,4 +2039,4 @@ def _get_oscar_service_json(self, node):
                     # this should never happen
                     Tosca.logger.warn("Property %s not expected. Ignoring." % prop.name)
 
-        return json.dumps(res)
+        return res

contextualization/AnsibleRecipes/utils/tasks/del_oscar_function.yml

@@ -0,0 +1,49 @@
+# IM - Infrastructure Manager
+# Copyright (C) 2011 - GRyCAP - Universitat Politecnica de Valencia
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Task to delete an OSCAR function
+- name: Delete OSCAR service {{ oscar_service_name }} at {{ oscar_endpoint }}
+  uri:
+    url: "{{ oscar_endpoint }}/system/services/{{ oscar_service_name }}"
+    user: "{{ oscar_username }}"
+    password: "{{ oscar_password }}"
+    method: DELETE
+    force_basic_auth: yes
+    status_code: [204, 409, 404]
+    validate_certs: false
+    timeout: 30
+  register: endpoint_result
+  changed_when: "endpoint_result.status == 204"
+  until: endpoint_result.status == 204 or endpoint_result.status == 409 or endpoint_result.status == 404
+  retries: 10
+  delay: 5
+
+- name: Delete OSCAR service {{ oscar_service_name }} at localhost
+  uri:
+    url: "http://localhost/system/services/{{ oscar_service_name }}"
+    user: "{{ oscar_username }}"
+    password: "{{ oscar_password }}"
+    method: DELETE
+    force_basic_auth: yes
+    status_code: [204, 409, 404]
+    validate_certs: false
+    timeout: 60
+  register: _result
+  changed_when: "_result.status == 204"
+  until: _result.status == 204 or _result.status == 409 or _result.status == 404
+  retries: 10
+  delay: 5
+  when: endpoint_result is failed

test/unit/Tosca.py

@@ -302,6 +302,7 @@ def test_tosca_oscar(self):
         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, 1)
 
     def test_tosca_oscar_get_attribute(self):
         """Test TOSCA OSCAR get_attributes function"""
@@ -344,6 +345,54 @@ def test_tosca_oscar_get_attribute(self):
                                                           'token_type': 'password',
                                                           'user': 'oscar'}})
 
+    def test_tosca_oscar_delete(self):
+        """Test TOSCA RADL deletion with OSCAR functions"""
+        tosca_data = read_file_as_string('../files/tosca_oscar_host.yml')
+        tosca_yaml = yaml.safe_load(tosca_data)
+        tosca_yaml["topology_template"]["node_templates"]["plants"]["capabilities"] = \
+            {"scalable": {"properties": {"count": 0}}}
+        tosca_data = yaml.safe_dump(tosca_yaml)
+
+        tosca = Tosca(tosca_data)
+        _, radl = tosca.to_radl()
+        radl = parse_radl(str(radl))
+        radl.check()
+        node = radl.get_configure_by_name('oscar_plants')
+        epected_res = """
+  - tasks:
+    - include_tasks: utils/tasks/del_oscar_function.yml
+      vars:
+        oscar_endpoint: "https://cluster.oscar.com"
+        oscar_username: "oscar"
+        oscar_password: "oscar_password"
+        oscar_service_name: 'plants'
+"""
+        self.assertIn(epected_res, node.recipes)
+
+        tosca_data = read_file_as_string('../files/tosca_oscar.yml')
+        tosca_yaml = yaml.safe_load(tosca_data)
+        tosca_yaml["topology_template"]["node_templates"]["plants"]["capabilities"] = \
+            {"scalable": {"properties": {"count": 0}}}
+        tosca_data = yaml.safe_dump(tosca_yaml)
+
+        vm1 = MagicMock()
+        system1 = system("plants", [Feature("disk.0.image.url", "=", "grycap/image")])
+        vm1.info.systems = [system1]
+        vm1.creation_date = 1
+        vm1.im_id = 1
+        inf_info = MagicMock()
+        inf_info.get_vm_list_by_system_name.return_value = {"plants": [vm1]}
+
+        tosca = Tosca(tosca_data)
+        remove_list, radl = tosca.to_radl(inf_info)
+        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')
         tosca = Tosca(tosca_data)