opennebula 4.14.2 → 4.90.0.beta1

data/lib/opennebula/marketplaceapp_pool.rb

@@ -0,0 +1,77 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+
+require 'opennebula/pool'
+
+module OpenNebula
+    class MarketPlaceAppPool < Pool
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+        MARKETPLACEAPP_POOL_METHODS = {
+            :info => "marketapppool.info"
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents a XML-RPC connection
+        def initialize(client, user_id=-1)
+            super('MARKETPLACEAPP_POOL','MARKETPLACEAPP', client)
+
+            @user_id  = user_id
+        end
+
+        # Factory method to create MarketPlaceApp objects
+        def factory(element_xml)
+            OpenNebula::MarketPlaceApp.new(element_xml, @client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the User Object
+        #######################################################################
+
+        # Retrieves all or part of the Images in the pool.
+        def info(*args)
+            case args.size
+                when 0
+                    info_filter(MARKETPLACEAPP_POOL_METHODS[:info],@user_id,-1,-1)
+                when 3
+                    info_filter(MARKETPLACEAPP_POOL_METHODS[:info],args[0],args[1],args[2])
+            end
+        end
+
+        def info_all()
+            return super(MARKETPLACEAPP_POOL_METHODS[:info])
+        end
+
+        def info_mine()
+            return super(MARKETPLACEAPP_POOL_METHODS[:info])
+        end
+
+        def info_group()
+            return super(MARKETPLACEAPP_POOL_METHODS[:info])
+        end
+
+        alias_method :info!, :info
+        alias_method :info_all!, :info_all
+        alias_method :info_mine!, :info_mine
+        alias_method :info_group!, :info_group
+    end
+end

data/lib/opennebula/oneflow_client.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -22,8 +22,8 @@ include CloudCLI
 module Role
     # Actions that can be performed on the VMs of a given Role
     SCHEDULE_ACTIONS = [
-        'shutdown',
-        'shutdown-hard',
+        'terminate',
+        'terminate-hard',
         'undeploy',
         'undeploy-hard',
         'hold',
@@ -31,8 +31,6 @@ module Role
         'stop',
         'suspend',
         'resume',
-        'delete',
-        'delete-recreate',
         'reboot',
         'reboot-hard',
         'poweroff',
@@ -114,7 +112,7 @@ module Service
     end
 
     # Build a json specifying an action
-    # @param [String] perform action to be performed (i.e: shutdowm)
+    # @param [String] perform action to be performed (e.g.: shutdown)
     # @param [Hash, nil] params contains the params for the action
     # @return [String] json representing the action
     def self.build_json_action(perform, params=nil)
@@ -307,11 +305,15 @@ module Service
             if @username.nil? && @password.nil?
                 if ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and File.file?(ENV["ONE_AUTH"])
                     one_auth = File.read(ENV["ONE_AUTH"])
-                elsif File.file?(ENV["HOME"]+"/.one/one_auth")
+                elsif ENV["HOME"] and File.file?(ENV["HOME"]+"/.one/one_auth")
                     one_auth = File.read(ENV["HOME"]+"/.one/one_auth")
+                elsif File.file?("/var/lib/one/.one/one_auth")
+                    one_auth = File.read("/var/lib/one/.one/one_auth")
+                else
+                    raise "ONE_AUTH file not present"
                 end
 
-                one_auth.rstrip!
+                one_auth = one_auth.rstrip
 
                 @username, @password = one_auth.split(':')
             end

data/lib/opennebula/pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/pool_element.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/security_group.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -32,7 +32,8 @@ module OpenNebula
             :chown       => "secgroup.chown",
             :chmod       => "secgroup.chmod",
             :clone       => "secgroup.clone",
-            :rename      => "secgroup.rename"
+            :rename      => "secgroup.rename",
+            :commit      => "secgroup.commit"
         }
 
         # Creates a SecurityGroup description with just its identifier
@@ -147,10 +148,50 @@ module OpenNebula
             return call(SECGROUP_METHODS[:rename], @pe_id, name)
         end
 
+        # Commit SG changes to associated VMs
+        #
+        # @param recover [Bool] If true will only operate on outdated and error
+        # VMs. This is intended for retrying updates of VMs or reinitialize the
+        # updating process if oned stopped or fail.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def commit(recover)
+            return call(SECGROUP_METHODS[:commit], @pe_id, recover)
+        end
+
         #######################################################################
         # Helpers to get SecurityGroup information
         #######################################################################
 
+        # Returns three arrays with the numeric vm ids for vms updated,
+        # outdated (include updating) and error
+        def vm_ids
+            updated = Array.new
+
+            self.each("UPDATED_VMS/ID") do |id|
+                updated << id.text.to_i
+            end
+
+            outdated = Array.new
+
+            self.each("OUTDATED_VMS/ID") do |id|
+                outdated << id.text.to_i
+            end
+
+            self.each("UPDATING_VMS/ID") do |id|
+                outdated << id.text.to_i
+            end
+
+            error = Array.new
+
+            self.each("ERROR_VMS/ID") do |id|
+                error << id.text.to_i
+            end
+
+            return [updated, outdated, error]
+        end
+
         # Returns the group identifier
         # [return] _Integer_ the element's group ID
         def gid

data/lib/opennebula/security_group_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/server_cipher_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/server_x509_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/ssh_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/system.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/template.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -96,8 +96,14 @@ module OpenNebula
         end
 
         # Deletes the Template
-        def delete()
-            super(TEMPLATE_METHODS[:delete])
+        # 
+        # @param recursive [true,false] optional, deletes the template plus
+        # any image defined in DISK.
+        # 
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def delete(recursive=false)
+            return call(TEMPLATE_METHODS[:delete], @pe_id, recursive)
         end
 
         # Creates a VM instance from a Template
@@ -108,18 +114,22 @@ module OpenNebula
         #   true to create it on hold
         # @param template [String] User provided Template to merge with the
         #   one being instantiated
+        # @param persistent [true,false] true to create a private persistent
+        #   copy of the template plus any image defined in DISK, and instantiate
+        #   that copy
         #
         # @return [Integer, OpenNebula::Error] The new VM id, Error
         #   otherwise
-        def instantiate(name="", hold=false, template="")
+        def instantiate(name="", hold=false, template="", persistent=false)
             return Error.new('ID not defined') if !@pe_id
 
             name ||= ""
             hold = false if hold.nil?
             template ||= ""
+            persistent = false if persistent.nil?
 
-            rc = @client.call(
-                TEMPLATE_METHODS[:instantiate], @pe_id, name, hold, template)
+            rc = @client.call(TEMPLATE_METHODS[:instantiate], @pe_id,
+                name, hold, template, persistent)
 
             return rc
         end
@@ -157,33 +167,52 @@ module OpenNebula
         # Changes the Template permissions.
         #
         # @param octet [String] Permissions octed , e.g. 640
+        # @param recursive [true,false] optional, chmods the template plus
+        # any image defined in DISK.
+        #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def chmod_octet(octet)
-            super(TEMPLATE_METHODS[:chmod], octet)
+        def chmod_octet(octet, recursive=false)
+            owner_u = octet[0..0].to_i & 4 != 0 ? 1 : 0
+            owner_m = octet[0..0].to_i & 2 != 0 ? 1 : 0
+            owner_a = octet[0..0].to_i & 1 != 0 ? 1 : 0
+            group_u = octet[1..1].to_i & 4 != 0 ? 1 : 0
+            group_m = octet[1..1].to_i & 2 != 0 ? 1 : 0
+            group_a = octet[1..1].to_i & 1 != 0 ? 1 : 0
+            other_u = octet[2..2].to_i & 4 != 0 ? 1 : 0
+            other_m = octet[2..2].to_i & 2 != 0 ? 1 : 0
+            other_a = octet[2..2].to_i & 1 != 0 ? 1 : 0
+
+            chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a, recursive)
         end
 
         # Changes the Template permissions.
         # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
         #
+        # @param recursive [true,false] optional, chmods the template plus
+        # any image defined in DISK.
+        #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
-                other_m, other_a)
-            super(TEMPLATE_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
-                group_m, group_a, other_u, other_m, other_a)
+                other_m, other_a, recursive=false)
+            return call(TEMPLATE_METHODS[:chmod], @pe_id, owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a, recursive)
         end
 
         # Clones this Template into a new one
         #
         # @param [String] name for the new Template.
+        # @param recursive [true,false] optional, clones the template plus
+        # any image defined in DISK. The new IMAGE_ID is set into each DISK.
         #
         # @return [Integer, OpenNebula::Error] The new Template ID in case
         #   of success, Error otherwise
-        def clone(name)
+        def clone(name, recursive=false)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(TEMPLATE_METHODS[:clone], @pe_id, name)
+            rc = @client.call(TEMPLATE_METHODS[:clone], @pe_id, name, recursive)
 
             return rc
         end

data/lib/opennebula/template_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/user.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/user_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vdc.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vdc_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/virtual_machine.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -46,11 +46,12 @@ module OpenNebula
             :disksaveas     => "vm.disksaveas",
             :disksnapshotcreate => "vm.disksnapshotcreate",
             :disksnapshotrevert => "vm.disksnapshotrevert",
-            :disksnapshotdelete => "vm.disksnapshotdelete"
+            :disksnapshotdelete => "vm.disksnapshotdelete",
+            :updateconf     => "vm.updateconf"
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
-            POWEROFF UNDEPLOYED}
+            POWEROFF UNDEPLOYED CLONING CLONING_FAILURE}
 
         LCM_STATE=%w{
             LCM_INIT
@@ -111,21 +112,24 @@ module OpenNebula
             DISK_SNAPSHOT_REVERT_SUSPENDED
             DISK_SNAPSHOT_DELETE_SUSPENDED
             DISK_SNAPSHOT
-            DISK_SNAPSHOT_REVERT
             DISK_SNAPSHOT_DELETE
+            PROLOG_MIGRATE_UNKNOWN
+            PROLOG_MIGRATE_UNKNOWN_FAILURE
         }
 
         SHORT_VM_STATES={
-            "INIT"      => "init",
-            "PENDING"   => "pend",
-            "HOLD"      => "hold",
-            "ACTIVE"    => "actv",
-            "STOPPED"   => "stop",
-            "SUSPENDED" => "susp",
-            "DONE"      => "done",
-            "FAILED"    => "fail",
-            "POWEROFF"  => "poff",
-            "UNDEPLOYED"=> "unde"
+            "INIT"              => "init",
+            "PENDING"           => "pend",
+            "HOLD"              => "hold",
+            "ACTIVE"            => "actv",
+            "STOPPED"           => "stop",
+            "SUSPENDED"         => "susp",
+            "DONE"              => "done",
+            "FAILED"            => "fail",
+            "POWEROFF"          => "poff",
+            "UNDEPLOYED"        => "unde",
+            "CLONING"           => "clon",
+            "CLONING_FAILURE"   => "fail"
         }
 
         SHORT_LCM_STATES={
@@ -186,8 +190,9 @@ module OpenNebula
             "DISK_SNAPSHOT_REVERT_SUSPENDED"=> "snap",
             "DISK_SNAPSHOT_DELETE_SUSPENDED"=> "snap",
             "DISK_SNAPSHOT"        => "snap",
-            "DISK_SNAPSHOT_REVERT" => "snap",
-            "DISK_SNAPSHOT_DELETE" => "snap"
+            "DISK_SNAPSHOT_DELETE" => "snap",
+            "PROLOG_MIGRATE_UNKNOWN" => "migr",
+            "PROLOG_MIGRATE_UNKNOWN_FAILURE" => "fail"
         }
 
         MIGRATE_REASON=%w{NONE ERROR USER}
@@ -202,7 +207,7 @@ module OpenNebula
             undeploy undeploy-hard hold release stop suspend resume boot delete
             delete-recreate reboot reboot-hard resched unresched poweroff
             poweroff-hard disk-attach disk-detach nic-attach nic-detach
-            snap-create snap-delete}
+            snap-create snap-delete terminate terminate-hard}
 
         EXTERNAL_IP_ATTRS = [
             'GUEST_IP',
@@ -316,6 +321,19 @@ module OpenNebula
         def deploy(host_id, enforce=false, ds_id=-1)
             enforce ||= false
             ds_id ||= -1
+
+            self.info
+
+            # Add dsid as VM template parameter for vcenter
+            if ds_id!=-1 &&
+               !self["/VM/USER_TEMPLATE/PUBLIC_CLOUD/TYPE"].nil? &&
+               self["/VM/USER_TEMPLATE/PUBLIC_CLOUD/TYPE"].downcase == "vcenter"
+                ds = OpenNebula::Datastore.new_with_id(ds_id, @client)
+                rc = ds.info
+                return rc if OpenNebula.is_error?(rc)
+               self.update("VCENTER_DATASTORE=#{ds['/DATASTORE/NAME']}", true)
+            end
+
             return call(VM_METHODS[:deploy],
                         @pe_id,
                         host_id.to_i,
@@ -324,10 +342,12 @@ module OpenNebula
         end
 
         # Shutdowns an already deployed VM
-        def shutdown(hard=false)
-            action(hard ? 'shutdown-hard' : 'shutdown')
+        def terminate(hard=false)
+            action(hard ? 'terminate-hard' : 'terminate')
         end
 
+        alias_method :shutdown, :terminate
+
         # Shuts down an already deployed VM, saving its state in the system DS
         def undeploy(hard=false)
             action(hard ? 'undeploy-hard' : 'undeploy')
@@ -343,16 +363,6 @@ module OpenNebula
             action(hard ? 'reboot-hard' : 'reboot')
         end
 
-        # @deprecated use {#reboot}
-        def reset
-            reboot(true)
-        end
-
-        # @deprecated use {#shutdown}
-        def cancel
-            shutdown(true)
-        end
-
         # Sets a VM to hold state, scheduler will not deploy it
         def hold
             action('hold')
@@ -418,25 +428,6 @@ module OpenNebula
             return call(VM_METHODS[:detachnic], @pe_id, nic_id)
         end
 
-        # Deletes a VM from the pool
-        def delete(recreate=false)
-            if recreate
-                action('delete-recreate')
-            else
-                action('delete')
-            end
-        end
-
-        # @deprecated use {#delete} instead
-        def finalize(recreate=false)
-            delete(recreate)
-        end
-
-        # @deprecated use {#delete} instead
-        def resubmit
-            action('delete-recreate')
-        end
-
         # Sets the re-scheduling flag for the VM
         def resched
             action('resched')
@@ -647,8 +638,8 @@ module OpenNebula
 
         # Recovers an ACTIVE VM
         #
-        # @param result [Integer] Recover with failure (0), success (1) or
-        # retry (2)
+        # @param result [Integer] Recover with failure (0), success (1),
+        # retry (2), delete (3), delete-recreate (4)
         # @param result [info] Additional information needed to recover the VM
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
@@ -656,6 +647,29 @@ module OpenNebula
             return call(VM_METHODS[:recover], @pe_id, result)
         end
 
+        # Deletes a VM from the pool
+        def delete(recreate=false)
+            if recreate
+                recover(4)
+            else
+                recover(3)
+            end
+        end
+
+		#  Changes the attributes of a VM in power off, failure and undeploy
+		#  states
+		#  @param new_conf, string describing the new attributes. Each attribute
+        #  will replace the existing ones or delete it if empty. Attributes that
+        #  can be updated are: INPUT/{TYPE, BUS}; RAW/{TYPE, DATA, DATA_VMX},
+        #  OS/{BOOT, BOOTLOADER, ARCH, MACHINE, KERNEL, INITRD},
+        #  FEATURES/{ACPI, APIC, PAE, LOCALTIME, HYPERV, GUEST_AGENT},
+        #  and GRAPHICS/{TYPE, LISTEN, PASSWD, KEYMAP}
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+		def updateconf(new_conf)
+            return call(VM_METHODS[:updateconf], @pe_id, new_conf)
+		end
+
         ########################################################################
         # Helpers to get VirtualMachine information
         ########################################################################
@@ -708,6 +722,7 @@ module OpenNebula
                 self['USER_TEMPLATE/KEEP_DISKS_ON_DONE'].downcase=="yes"
         end
 
+
         # Clones the VM's source Template, replacing the disks with live snapshots
         # of the current disks. The VM capacity and NICs are also preserved
         #