opennebula 6.2.0.1 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386d417b0331ab8ad16270e5ae78b27efc0a319a45dc3cbad2805c6eef0f638b
-  data.tar.gz: d27b0d68fdb8382d94b5b5dcd6d1139214147783e146496014edaa7c9b870f08
+  metadata.gz: 630fc82258e06265dd9308385f987452c2c9e97774f9c844567eb0512c699996
+  data.tar.gz: 4b19ee5faf356fc61ba4e8883dc7bb37137d54d34c251c6f0cbbfab5a8b0b27b
 SHA512:
-  metadata.gz: 177d4446ad29cdcf12b7485010909ba6954155cfe83a9948c6fd0673fe2c260470b41c512b279872212355bb3435c74a1762bc8ea39c028623b809df0cf83167
-  data.tar.gz: 7ba61e9e6c83aaeffc1f62e772be95028f8dba3bf7000397f8cf27d322fef9cee4c9c745d81d80c6763df336609b9aeebfbf23c5003507559726cef432f6a7d7
+  metadata.gz: ea3eba7d99bfc70cb7b94a2c8c2548b130d50ec3cf73d3344e0ed12a05b2e83780eec32e4790cfeef00bde6a38164468a0cfe91bb62cd1325c20aac7f9cca235
+  data.tar.gz: eeb5c702a03ef47f5ad8e37f95b94259e49019a78d5b58f8ce560d3b2afd50cb8828a7512afe14b1f3e25e262ab3b3974f9174e3109a20a98d89140a90fbca96

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.2.0.1'
+    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

@@ -881,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
@@ -908,7 +908,8 @@ module VCenterDriver
                  .get_unimported_datastores(
                      dpool,
                      @vi_client.vc_name,
-                     hpool
+                     hpool,
+                     args
                  )
             @list = rs
         end
@@ -948,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|
@@ -1011,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/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'
 

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/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_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.rb

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

data/lib/vcenter_importer.rb

@@ -202,7 +202,7 @@ module VCenterDriver
         # index associated to his own resource opt
         #
         # Example:
-        # {"vm-343" => {linked: '0', copy: '0'...}
+        # {"vm-343" => {:linked_clone: '0', :copy: '0'...}
         #
         # @ return [Hash] the list of unimported resources
         #
@@ -263,7 +263,10 @@ module VCenterDriver
 
                 cluster_list = {}
                 cpool.each do |c|
-                    cluster_list[c['ID']] = c['NAME'] if c['ID'].to_i != 0
+                    name = VCenterDriver::VcImporter.sanitize(
+                        c['NAME']
+                    )
+                    cluster_list[c['ID']] = name if c['ID'].to_i != 0
                 end
 
                 # Get OpenNebula's host pool
@@ -312,10 +315,13 @@ module VCenterDriver
 
                                 cluster_list_str = "\n"
                                 cluster_list.each do |key, value|
+                                    name = VCenterDriver::VcImporter.sanitize(
+                                        value
+                                    )
                                     cluster_list_str << "      - \e[94mID: " \
                                                      << key \
                                                      << "\e[39m - NAME: " \
-                                                     << value << "\n"
+                                                     << name << "\n"
                                 end
 
                                 STDOUT.print "\n    #{cluster_list_str}"
@@ -330,15 +336,19 @@ module VCenterDriver
                             end
                         end
 
+                        cluster_name = VCenterDriver::VcImporter.sanitize(
+                            cluster[:cluster_name]
+                        )
+
                         # Check if the OpenNebula Cluster exists, and reuse it
                         one_cluster_id ||= cluster_list
-                                           .key(cluster[:cluster_name])
+                                           .key(cluster_name)
 
                         if !one_cluster_id
                             one_cluster = VCenterDriver::VIHelper
                                           .new_one_item(OpenNebula::Cluster)
                             rc = one_cluster
-                                 .allocate((cluster[:cluster_name]).to_s)
+                                 .allocate(cluster_name.to_s)
                             if ::OpenNebula.is_error?(rc)
                                 # rubocop:disable Layout/LineLength
                                 STDOUT.puts "    Error creating OpenNebula cluster: #{rc.message}\n"
@@ -355,7 +365,7 @@ module VCenterDriver
                                            rpool,
                                            one_cluster_id)
                         # rubocop:disable Layout/LineLength
-                        STDOUT.puts "\n    OpenNebula host \e[92m#{cluster[:cluster_name]}\e[39m with"\
+                        STDOUT.puts "\n    OpenNebula host \e[92m#{cluster_name}\e[39m with"\
                                     " ID \e[94m#{one_host.id}\e[39m successfully created."
                         STDOUT.puts
                         # rubocop:enable Layout/LineLength

data/lib/virtual_machine.rb

@@ -579,8 +579,6 @@ end
                 end
             end
 
-            dc = cluster.datacenter
-
             vcenter_vm_folder = drv_action['USER_TEMPLATE/VCENTER_VM_FOLDER']
 
             if !vcenter_vm_folder.nil? && !vcenter_vm_folder.empty?
@@ -1983,7 +1981,7 @@ end
             end
 
             card_spec = {
-                :key => Time.now.utc.strftime('%Y%m%d%M%S%L').to_i,
+                :key => 0,
                 :deviceInfo => {
                     :label => 'net' + card_num.to_s,
                     :summary => pg_name
@@ -1993,6 +1991,9 @@ end
                 :macAddress  => mac,
                 :unitNumber  => unumber
             }
+            if @vi_client.vim.serviceContent.about.apiVersion.to_f >= 7.0
+                card_spec[:key] = Time.now.utc.strftime('%m%d%M%S%L').to_i
+            end
 
             if (limit || rsrv) && (limit > 0)
                 ra_spec = {}
@@ -2129,7 +2130,7 @@ end
             end
 
             card_spec = {
-                :key => Time.now.utc.strftime('%Y%m%d%M%S%L').to_i,
+                :key => 0,
                 :deviceInfo => {
                     :label => 'net' + card_num.to_s,
                     :summary => pg_name
@@ -2137,6 +2138,9 @@ end
                 :backing     => backing,
                 :addressType => 'generated'
             }
+            if @vi_client.vim.serviceContent.about.apiVersion.to_f >= 7.0
+                card_spec[:key] = Time.now.utc.strftime('%m%d%M%S%L').to_i
+            end
 
             if (limit || rsrv) && (limit > 0)
                 ra_spec = {}

data/lib/vm_template.rb

@@ -96,6 +96,90 @@ module VCenterDriver
             @vi_client.vim.serviceContent.about.instanceUuid rescue nil
         end
 
+        def save_as_linked_clones(name)
+            error = nil
+
+            disks = @item.config.hardware.device.grep(
+                RbVmomi::VIM::VirtualMachine
+            )
+            disks.select {|x| x.backing.parent.nil? }.each do |disk|
+                spec = {
+                    :deviceChange => [
+                        {
+                            :operation => :remove,
+                            :device => disk
+                        },
+                        {
+                            :operation => :add,
+                            :fileOperation => :create,
+                            :device => disk.dup.tap do |x|
+                                x.backing = x.backing.dup
+                                x.backing.fileName =
+                                    "[#{disk.backing.datastore.name}]"
+                                x.backing.parent = disk.backing
+                            end
+                        }
+                    ]
+                }
+                @item.ReconfigVM_Task(
+                    :spec => spec
+                ).wait_for_completion
+            end
+
+            relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(
+                :diskMoveType => :moveChildMostDiskBacking
+            )
+
+            spec = RbVmomi::VIM.VirtualMachineCloneSpec(
+                :location => relocateSpec,
+                :powerOn => false,
+                :template => true
+            )
+
+            new_template = @item.CloneVM_Task(
+                :folder => @item.parent,
+                :name => name,
+                :spec => spec
+            ).wait_for_completion
+
+            new_vm_template_ref = new_template._ref
+
+            one_client = OpenNebula::Client.new
+            importer = VCenterDriver::VmImporter.new(
+                one_client,
+                @vi_client
+            )
+
+            importer.retrieve_resources({})
+            importer.get_indexes(new_vm_template_ref)
+
+            importer.process_import(
+                new_vm_template_ref,
+                {
+                    new_vm_template_ref.to_s => {
+                        :type => 'default',
+                        :linked_clone => '1',
+                        :copy => '0',
+                        :name => '',
+                        :folder => ''
+                    }
+                }
+            )
+
+            begin
+                importer.output[:success][0][:id][0]
+            rescue StandardError => e
+                error = 'Creating linked clone VM Template' \
+                    " failed due to \"#{e.message}\".\n"
+
+                if VCenterDriver::CONFIG[:debug_information]
+                    error += " #{e.backtrace}\n"
+                end
+            end
+
+            [error, new_vm_template_ref]
+        end
+
         def create_template_copy(template_name)
             error = nil
             template_ref = nil
@@ -1835,12 +1919,10 @@ module VCenterDriver
                 # the template if something go wrong
                 if copy
                     error, template_copy_ref =
-                        selected[:template]
-                        .create_template_copy(
-                            opts[:name]
-                        )
+                        selected[:template].save_as_linked_clones(opts[:name])
+
                     unless template_copy_ref
-                        raise 'There is a problem creating creating' \
+                        raise 'There is a problem creating ' \
                               "your copy: #{error}"
                     end
 
@@ -1893,68 +1975,70 @@ module VCenterDriver
             working_template[:one] <<
                 "VCENTER_TEMPLATE_NAME=\"#{selected[:name]}\"\n"
 
-            create(working_template[:one]) do |one_object, id|
-                res[:id] << id
+            unless copy
+                create(working_template[:one]) do |one_object, id|
+                    res[:id] << id
 
-                type = { :object => 'template', :id => id }
-                error, template_disks, allocated_images =
-                    template
-                    .import_vcenter_disks(
-                        vc_uuid,
-                        dpool,
-                        ipool,
-                        type
-                    )
+                    type = { :object => 'template', :id => id }
+                    error, template_disks, allocated_images =
+                        template
+                        .import_vcenter_disks(
+                            vc_uuid,
+                            dpool,
+                            ipool,
+                            type
+                        )
 
-                if allocated_images
-                    # rollback stack
-                    allocated_images.reverse.each do |i|
-                        @rollback.unshift(Raction.new(i, :delete))
+                    if allocated_images
+                        # rollback stack
+                        allocated_images.reverse.each do |i|
+                            @rollback.unshift(Raction.new(i, :delete))
+                        end
                     end
-                end
-                raise error unless error.empty?
+                    raise error unless error.empty?
 
-                working_template[:one] << template_disks
+                    working_template[:one] << template_disks
 
-                if template_copy_ref
-                    template_moref = template_copy_ref
-                else
-                    template_moref = selected[:vcenter_ref]
-                end
+                    if template_copy_ref
+                        template_moref = template_copy_ref
+                    else
+                        template_moref = selected[:vcenter_ref]
+                    end
 
-                opts_nics = {
-                    :vi_client => @vi_client,
-                    :vc_uuid => vc_uuid,
-                    :npool => npool,
-                    :hpool => hpool,
-                    :vcenter => vcenter,
-                    :template_moref => template_moref,
-                    :vm_object => nil
-                }
+                    opts_nics = {
+                        :vi_client => @vi_client,
+                        :vc_uuid => vc_uuid,
+                        :npool => npool,
+                        :hpool => hpool,
+                        :vcenter => vcenter,
+                        :template_moref => template_moref,
+                        :vm_object => nil
+                    }
 
-                error, template_nics, _ar_ids, allocated_nets =
-                    template
-                    .import_vcenter_nics(
-                        opts_nics,
-                        id,
-                        dc
-                    )
+                    error, template_nics, _ar_ids, allocated_nets =
+                        template
+                        .import_vcenter_nics(
+                            opts_nics,
+                            id,
+                            dc
+                        )
 
-                if allocated_nets
-                    # rollback stack
-                    allocated_nets.reverse.each do |n|
-                        @rollback.unshift(Raction.new(n, :delete))
+                    if allocated_nets
+                        # rollback stack
+                        allocated_nets.reverse.each do |n|
+                            @rollback.unshift(Raction.new(n, :delete))
+                        end
                     end
-                end
-                raise error unless error.empty?
+                    raise error unless error.empty?
 
-                working_template[:one] << template_nics
-                working_template[:one] << rp_opts(
-                    opts[:type],
-                    opts[:resourcepool]
-                )
+                    working_template[:one] << template_nics
+                    working_template[:one] << rp_opts(
+                        opts[:type],
+                        opts[:resourcepool]
+                    )
 
-                one_object.update(working_template[:one])
+                    one_object.update(working_template[:one])
+                end
             end
 
             res

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.2.0.1
+  version: 6.2.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri