opennebula 6.0.3 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae4c2d6ffef598e821e3b6bcc4a429f766caadbf
-  data.tar.gz: 2e65f273fb1f2d383d799fa4fd31e6d2fb66cb41
+SHA256:
+  metadata.gz: 630fc82258e06265dd9308385f987452c2c9e97774f9c844567eb0512c699996
+  data.tar.gz: 4b19ee5faf356fc61ba4e8883dc7bb37137d54d34c251c6f0cbbfab5a8b0b27b
 SHA512:
-  metadata.gz: ce66ed43b8db71bcb0f8572a7e3a48de18b3e7c4819006d93333709e892718cd83c724a723c81870538b404ed3d80bc33786b1b1cc0bbd8a882412992c56bd17
-  data.tar.gz: e3694d73c467089a0ec6720c2ac22034bfcb49f273d14b607915d9aa1ba23abf6c5045a436ec08f47d7f87e5c394981c0e95d8b1614833f87c3666f64b731291
+  metadata.gz: ea3eba7d99bfc70cb7b94a2c8c2548b130d50ec3cf73d3344e0ed12a05b2e83780eec32e4790cfeef00bde6a38164468a0cfe91bb62cd1325c20aac7f9cca235
+  data.tar.gz: eeb5c702a03ef47f5ad8e37f95b94259e49019a78d5b58f8ce560d3b2afd50cb8828a7512afe14b1f3e25e262ab3b3974f9174e3109a20a98d89140a90fbca96

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.0.3'
+    VERSION = '6.2.1'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/datacenter.rb

@@ -131,7 +131,10 @@ module VCenterDriver
 
                     # Setting host import name and
                     # replace spaces and weird characters
-                    cluster_name = (ccr['name']).to_s.tr(' ', '_')
+                    cluster_name = ccr['name'].to_s.tr(' ', '_')
+                    cluster_name = VCenterDriver::VcImporter.sanitize(
+                        cluster_name
+                    )
                     cluster_name =
                         VCenterDriver::VIHelper
                         .one_name(
@@ -159,11 +162,28 @@ module VCenterDriver
             host_objects
         end
 
-        def get_unimported_datastores(dpool, vcenter_instance_name, hpool)
+        # rubocop:disable Style/GlobalVars
+        def get_unimported_datastores(dpool, vcenter_instance_name, hpool, args)
             import_id = 0
             ds_objects = {}
             vcenter_uuid = vcenter_instance_uuid
 
+            # Selected host in OpenNebula
+            if $conf.nil?
+                one_client = OpenNebula::Client.new
+            else
+                one_client = OpenNebula::Client.new(
+                    nil,
+                    $conf[:one_xmlrpc]
+                )
+            end
+            one_host = OpenNebula::Host.new_with_id(args[:host], one_client)
+
+            rc = one_host.info
+            raise rc.message if OpenNebula.is_error? rc
+
+            cluster_id = one_host['CLUSTER_ID'].to_i
+
             # Get datacenters
             fetch! if @items.empty?
 
@@ -185,7 +205,10 @@ module VCenterDriver
                             'summary.freeSpace'
                         )
 
-                    ds_name     = name.to_s
+                    ds_name = VCenterDriver::VcImporter.sanitize(
+                        name.to_s
+                    )
+
                     ds_total_mb = ((capacity.to_i / 1024) / 1024)
                     ds_free_mb  = ((free_space.to_i / 1024) / 1024)
                     ds_ref      = ds['_ref']
@@ -363,8 +386,15 @@ module VCenterDriver
                 end
             end
 
+            ds_objects.keys.each do |key|
+                unless ds_objects[key][:cluster].include? cluster_id
+                    ds_objects.delete key
+                end
+            end
+
             { vcenter_instance_name => ds_objects }
         end
+        # rubocop:enable Style/GlobalVars
 
         def get_unimported_templates(vi_client, tpool)
             template_objects = {}

data/lib/datastore.rb

@@ -558,8 +558,12 @@ module VCenterDriver
                 raise 'Could not get file size or capacity' if size.nil?
 
                 size
-            rescue StandardError
-                raise 'Could not find file.'
+            rescue StandardError => e
+                message = "Could not find file. Reason: \"#{e.message}\"."
+                if VCenterDriver::CONFIG[:debug_information]
+                    message += ' ' + e.backtrace
+                end
+                raise message
             end
         end
 
@@ -877,7 +881,7 @@ module VCenterDriver
             @one_class = OpenNebula::Datastore
         end
 
-        def get_list(_args = {})
+        def get_list(args = {})
             dc_folder = VCenterDriver::DatacenterFolder.new(@vi_client)
 
             # one pool creation
@@ -904,7 +908,8 @@ module VCenterDriver
                  .get_unimported_datastores(
                      dpool,
                      @vi_client.vc_name,
-                     hpool
+                     hpool,
+                     args
                  )
             @list = rs
         end
@@ -944,7 +949,11 @@ module VCenterDriver
                 clusters = opts['selected_clusters'].each.map(&:to_i)
             end
 
-            res = { :id => [], :name => selected[:simple_name] }
+            name = VCenterDriver::VcImporter.sanitize(
+                selected[:simple_name]
+            )
+
+            res = { :id => [], :name => name }
             @info[:rollback] = []
             pair.each do |ds|
                 create(ds[:one]) do |one_object, id|
@@ -1007,7 +1016,9 @@ module VCenterDriver
             message = 'Error creating the OpenNebula resource'
             info = selected[:one]
             dsid = selected[:dsid].to_i
-            name = selected[:name]
+            name = VCenterDriver::VcImporter.sanitize(
+                selected[:name]
+            )
 
             rc = resource.allocate(info, dsid, false)
             VCenterDriver::VIHelper.check_error(rc, message)

data/lib/models/role.rb

@@ -571,11 +571,20 @@ module OpenNebula
                 vm = OpenNebula::VirtualMachine.new_with_id(vm_id,
                                                             @service.client)
 
-                rc = vm.info
+                if do_offset
+                    offset = (index / vms_per_period.to_i).floor
+                    time_offset = offset * period.to_i
+                end
+
+                tmp_str = 'SCHED_ACTION = ['
+                tmp_str << "ACTION = #{action},"
+                tmp_str << "ARGS = \"#{args}\"," if args
+                tmp_str << "TIME = #{now + time_offset}]"
 
+                rc = vm.sched_action_add(tmp_str)
                 if OpenNebula.is_error?(rc)
-                    msg = "Role #{name} : VM #{vm_id} monitorization failed;"\
-                          " #{rc.message}"
+                    msg = "Role #{name} : VM #{vm_id} error scheduling "\
+                            "action; #{rc.message}"
 
                     error_msgs << msg
 
@@ -583,40 +592,7 @@ module OpenNebula
 
                     @service.log_error(msg)
                 else
-                    ids = vm.retrieve_elements('USER_TEMPLATE/SCHED_ACTION/ID')
-
-                    id = 0
-                    if !ids.nil? && !ids.empty?
-                        ids.map! {|e| e.to_i }
-                        id = ids.max + 1
-                    end
-
-                    tmp_str = vm.user_template_str
-
-                    if do_offset
-                        offset = (index / vms_per_period.to_i).floor
-                        time_offset = offset * period.to_i
-                    end
-
-                    tmp_str << "\nSCHED_ACTION = ["
-                    tmp_str << "ID = #{id},"
-                    tmp_str << "ACTION = #{action},"
-                    tmp_str << "ARGS = \"#{args}\"," if args
-                    tmp_str << "TIME = #{now + time_offset}]"
-
-                    rc = vm.update(tmp_str)
-                    if OpenNebula.is_error?(rc)
-                        msg = "Role #{name} : VM #{vm_id} error scheduling "\
-                              "action; #{rc.message}"
-
-                        error_msgs << msg
-
-                        Log.error LOG_COMP, msg, @service.id
-
-                        @service.log_error(msg)
-                    else
-                        vms_id << vm.id
-                    end
+                    vms_id << vm.id
                 end
             end
 

data/lib/models/service.rb

@@ -522,31 +522,40 @@ module OpenNebula
 
         # Check that changes values are correct
         #
-        # @param template_json [String] New template
+        # @param template_json [String]  New template
+        # @param append        [Boolean] True to append template to the current
         #
         # @return [Boolean, String] True, nil if everything is correct
         #                           False, attr if attr was changed
-        def check_new_template(template_json)
+        def check_new_template(template_json, append)
             template = JSON.parse(template_json)
 
-            if template['roles'].size != @roles.size
-                return [false, 'service/roles size']
-            end
+            if append
+                IMMUTABLE_ATTRS.each do |attr|
+                    next if template[attr].nil?
 
-            IMMUTABLE_ATTRS.each do |attr|
-                next if template[attr] == @body[attr]
+                    return [false, "service/#{attr}"]
+                end
+            else
+                if template['roles'].size != @roles.size
+                    return [false, 'service/roles size']
+                end
 
-                return [false, "service/#{attr}"]
-            end
+                IMMUTABLE_ATTRS.each do |attr|
+                    next if template[attr] == @body[attr]
 
-            template['roles'].each do |role|
-                # Role name can't be changed, if it is changed some problems
-                # may appear, as name is used to reference roles
-                return [false, 'name'] unless @roles[role['name']]
+                    return [false, "service/#{attr}"]
+                end
 
-                rc = @roles[role['name']].check_new_template(role)
+                template['roles'].each do |role|
+                    # Role name can't be changed, if it is changed some problems
+                    # may appear, as name is used to reference roles
+                    return [false, 'name'] unless @roles[role['name']]
 
-                return rc unless rc[0]
+                    rc = @roles[role['name']].check_new_template(role)
+
+                    return rc unless rc[0]
+                end
             end
 
             [true, nil]

data/lib/opennebula/flow/service_template.rb

@@ -307,10 +307,18 @@ module OpenNebula
 
             template = JSON.parse(template_json)
 
-            IMMUTABLE_ATTRS.each do |attr|
-                next if template[attr] == @body[attr]
+            if append
+                IMMUTABLE_ATTRS.each do |attr|
+                    unless template[attr].nil?
+                        return [false, "service_template/#{attr}"]
+                    end
+                end
+            else
+                IMMUTABLE_ATTRS.each do |attr|
+                    next if template[attr] == @body[attr]
 
-                return [false, "service_template/#{attr}"]
+                    return [false, "service_template/#{attr}"]
+                end
             end
 
             template = @body.merge(template) if append

data/lib/opennebula/ldap_auth.rb

@@ -15,7 +15,9 @@
 # ---------------------------------------------------------------------------- #
 
 require 'rubygems'
-require 'opennebula'
+require 'opennebula/xml_utils'
+require 'opennebula/client'
+require 'opennebula/group_pool'
 require 'net/ldap'
 require 'yaml'
 
@@ -161,7 +163,8 @@ class OpenNebula::LdapAuth
     end
 
     def is_in_group?(user, group)
-        username = user.first.force_encoding(Encoding::UTF_8)
+        username = Net::LDAP::Filter.escape(
+            user.first.force_encoding(Encoding::UTF_8))
         result=@ldap.search(
                     :base   => group,
                     :attributes => [@options[:group_field]],
@@ -273,6 +276,7 @@ def get_server_order(opts, user)
                 user = m[1] if m[1]
 
                 order << to_array(server)
+                break
             end
         end
 

data/lib/opennebula/marketplaceapp_ext.rb

@@ -461,7 +461,7 @@ module OpenNebula::MarketPlaceAppExt
             def export_recursive(xpath, options)
                 # Get marketplace apps pool to find roles apps
                 pool = OpenNebula::MarketPlaceAppPool.new(@client)
-                rc   = pool.info
+                rc   = pool.info_all
 
                 return rc if OpenNebula.is_error?(rc)
 

data/lib/opennebula/pool.rb

@@ -261,6 +261,8 @@ module OpenNebula
                 size = OpenNebula.pool_page_size if (!size || size == 0)
                 rc   = @client.call(method, @user_id, current, -size, state)
 
+                return rc if OpenNebula.is_error?(rc)
+
                 initialize_xml(rc, @pool_name)
             else
                 rc = info
@@ -276,11 +278,11 @@ module OpenNebula
             page    = OpenNebula::XMLElement.new
 
             loop do
-                page.initialize_xml(get_page(size,
-                                             current,
-                                             extended,
-                                             state),
-                                             @pool_name)
+                rc = get_page(size, current, extended, state)
+
+                break rc if OpenNebula.is_error?(rc)
+
+                page.initialize_xml(rc, @pool_name)
 
                 break if page["//#{element}"].nil?
 

data/lib/opennebula/server_cipher_auth.rb

@@ -41,8 +41,10 @@ class OpenNebula::ServerCipherAuth
         if !srv_passwd.empty?
             # truncate token to 32-bytes for Ruby >= 2.4
             @key = Digest::SHA256.hexdigest(@srv_passwd)[0..31]
-        else
+            @iv = @key[0..15]
+          else
             @key = ""
+            @iv = ""
         end
 
         @cipher = OpenSSL::Cipher.new(CIPHER)
@@ -112,6 +114,7 @@ class OpenNebula::ServerCipherAuth
         begin
             # truncate token to 32-bytes for Ruby >= 2.4
             @key = srv_pass[0..31]
+            @iv = srv_pass[0..15]
 
             token_array = decrypt(signed_text).split(':')
 
@@ -133,7 +136,7 @@ class OpenNebula::ServerCipherAuth
     def encrypt(data)
         @cipher.encrypt
         @cipher.key = @key
-
+        @cipher.iv = @iv
         rc = @cipher.update(data)
         rc << @cipher.final
 
@@ -143,7 +146,7 @@ class OpenNebula::ServerCipherAuth
     def decrypt(data)
         @cipher.decrypt
         @cipher.key = @key
-
+        @cipher.iv = @iv
         rc = @cipher.update(Base64::decode64(data))
         rc << @cipher.final
 

data/lib/opennebula/user.rb

@@ -89,8 +89,8 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given User.
-        def info()
-            super(USER_METHODS[:info], 'USER')
+        def info(decrypt = false)
+            super(USER_METHODS[:info], 'USER', decrypt)
         end
 
         alias_method :info!, :info

data/lib/opennebula/virtual_machine.rb

@@ -50,8 +50,11 @@ module OpenNebula
             :disksnapshotrename => "vm.disksnapshotrename",
             :diskresize     => "vm.diskresize",
             :updateconf     => "vm.updateconf",
-            :lock     => "vm.lock",
-            :unlock     => "vm.unlock"
+            :lock           => "vm.lock",
+            :unlock         => "vm.unlock",
+            :schedadd       => "vm.schedadd",
+            :scheddelete    => "vm.scheddelete",
+            :schedupdate    => "vm.schedupdate"
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
@@ -260,7 +263,7 @@ module OpenNebula
         # +id+ the id of the vm
         #
         # Example:
-        #   vnet = VirtualMachine.new(VirtualMachine.build_xml(3),rpc_client)
+        #   vm = VirtualMachine.new(VirtualMachine.build_xml(3),rpc_client)
         #
         def VirtualMachine.build_xml(pe_id=nil)
             if pe_id
@@ -710,18 +713,49 @@ module OpenNebula
             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
+        # 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}
+        # @param append, append template, do not delete empty attributes
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def updateconf(new_conf, append = false)
+            return call(VM_METHODS[:updateconf], @pe_id, new_conf, append ? 1 : 0)
+        end
+
+        # Add sched actions
+        #
+        # @param sched_template [String] Template with SCHED_ACTIONs
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def sched_action_add(sched_template)
+            return call(VM_METHODS[:schedadd], @pe_id, sched_template)
+        end
+
+        # Delete sched action
+        #
+        # @param sched_id [Int] id of the SCHED_ACTION
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def sched_action_delete(sched_id)
+            return call(VM_METHODS[:scheddelete], @pe_id, sched_id.to_i)
+        end
+
+        # Update sched_action
+        #
+        # @param sched_id [Int] id of the SCHED_ACTION
+        # @param sched_template [String] Template containing a SCHED_ACTION
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def updateconf(new_conf)
-            return call(VM_METHODS[:updateconf], @pe_id, new_conf)
+        def sched_action_update(sched_id, sched_template)
+            return call(VM_METHODS[:schedupdate], @pe_id, sched_id.to_i,
+                sched_template)
         end
 
         ########################################################################

data/lib/opennebula/virtual_machine_ext.rb

@@ -94,6 +94,35 @@ module OpenNebula::VirtualMachineExt
                     raise rc.message if OpenNebula.is_error?(rc)
                 end
 
+                # --------------------------------------------------------------
+                # Ask if source VM is linked clone
+                # --------------------------------------------------------------
+                use_linked_clones = self['USER_TEMPLATE/VCENTER_LINKED_CLONES']
+
+                if use_linked_clones && use_linked_clones.downcase == 'yes'
+                    # Delay the require until it is strictly needed
+                    # This way we can avoid the vcenter driver dependency
+                    # in no vCenter deployments
+                    require 'vcenter_driver'
+
+                    deploy_id = self['DEPLOY_ID']
+                    vm_id = self['ID']
+                    host_id = self['HISTORY_RECORDS/HISTORY[last()]/HID']
+                    vi_client = VCenterDriver::VIClient.new_from_host(host_id)
+
+                    vm = VCenterDriver::VirtualMachine.new(
+                        vi_client,
+                        deploy_id,
+                        vm_id
+                    )
+
+                    error, vm_template_ref = vm.save_as_linked_clones(name)
+
+                    raise error unless error.nil?
+
+                    return vm_template_ref
+                end
+
                 # --------------------------------------------------------------
                 # Clone the source template
                 # --------------------------------------------------------------
@@ -271,7 +300,7 @@ module OpenNebula::VirtualMachineExt
 
                 raise rc.message if OpenNebula.is_error?(rc)
 
-                binfo.merge!(backup_info) do |key, old_val, new_val|
+                binfo.merge!(backup_info) do |_key, old_val, new_val|
                     new_val.nil? ? old_val : new_val
                 end
 
@@ -472,7 +501,7 @@ module OpenNebula::VirtualMachineExt
                 end
 
                 binfo[:apps].each do |id|
-                    logger.info "Deleting applicance #{id}" if logger
+                    logger.info "Deleting appliance #{id}" if logger
 
                     papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
 

data/lib/opennebula/virtual_machine_pool.rb

@@ -450,6 +450,10 @@ module OpenNebula
         private
 
         def build_accounting(filter_flag, options, &block)
+
+            options[:start_time] = -1 if options[:start_time].nil?
+            options[:end_time]   = -1 if options[:end_time].nil?
+
             xml_str = @client.call(VM_POOL_METHODS[:accounting],
                         filter_flag,
                         options[:start_time],

data/lib/opennebula/zone.rb

@@ -31,7 +31,15 @@ module OpenNebula
             :delete         => "zone.delete",
             :addserver      => "zone.addserver",
             :delserver      => "zone.delserver",
-            :resetserver    => "zone.resetserver"
+            :resetserver    => "zone.resetserver",
+            :enable         => "zone.enable"
+        }
+
+        ZONE_STATES=%w{ENABLED DISABLED}
+
+        SHORT_ZONE_STATES={
+            "ENABLED"              => "on",
+            "DISABLED"             => "off"
         }
 
         # Creates a Zone description with just its identifier
@@ -179,6 +187,37 @@ module OpenNebula
             return call(ZONE_METHODS[:resetserver], @pe_id, server_id)
         end
 
+        # Enable zone
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def enable()
+            return call(ZONE_METHODS[:enable], @pe_id, true)
+        end
+
+        # Disable zone, only readonly commands can be executed in disabled
+        # state
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def disable()
+            return call(ZONE_METHODS[:enable], @pe_id, false)
+        end
+
+        #######################################################################
+        # Helpers to get Zone information
+        #######################################################################
+
+        # Returns the state of the Zone (numeric value)
+        def state
+            self['STATE'].to_i
+        end
+
+        # Returns the state of the Zone (string value)
+        def state_str
+            ZONE_STATES[state]
+        end
+
         private
 
         # These methods adds elements to the given node of the zone

data/lib/opennebula.rb

@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.0.3'
+    VERSION = '6.2.1'
 end