opennebula 6.1.90.pre → 6.2.2

data/lib/vi_helper.rb

@@ -118,6 +118,16 @@ module VCenterDriver
             return_if_error(rc, item, exit_if_fail)
         end
 
+        # Since https://github.com/OpenNebula/one/issues/5689
+        # there two deploy_ids allowed:
+        #    * moref, eg: vm-567
+        #    * moref +"_" + vcenter uuid, eg:
+        #           2499952a-6c85-480e-b7df-4cbd2137eb69_vm-456
+        # This function will always return the moref
+        def self.get_deploy_id(deploy_id)
+            deploy_id.split('_')[0]
+        end
+
         def self.find_by_name(the_class, name, pool = nil, raise_if_fail = true)
             pool = one_pool(the_class, raise_if_fail) if pool.nil?
             element = pool.find {|e| e['NAME'] == name.to_s }
@@ -251,7 +261,7 @@ module VCenterDriver
             # Let's try to find the VM object only by its name
             # Let's build the VM name
             vm_prefix = host['TEMPLATE/VM_PREFIX']
-            vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? || vm_prefix.empty?
+            vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil?
             vm_prefix.gsub!('$i', one_vm['ID'])
             vm_name = vm_prefix + one_vm['NAME']
 

data/lib/virtual_machine.rb

@@ -103,6 +103,7 @@ end
 
         def initialize(vi_client, ref, one_id)
             if ref
+                ref = VCenterDriver::VIHelper.get_deploy_id(ref)
                 @item = RbVmomi::VIM::VirtualMachine.new(vi_client.vim, ref)
                 check_item(@item, RbVmomi::VIM::VirtualMachine)
             end
@@ -470,7 +471,7 @@ end
         # @return String vcenter name
         def vc_name
             vm_prefix = host['TEMPLATE/VM_PREFIX']
-            vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? || vm_prefix.empty?
+            vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil?
 
             if !one_item['USER_TEMPLATE/VM_PREFIX'].nil?
                 vm_prefix = one_item['USER_TEMPLATE/VM_PREFIX']
@@ -579,8 +580,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?
@@ -1715,8 +1714,13 @@ end
         def sync(deploy = {})
             extraconfig   = []
             device_change = []
+            sync_opt = nil
 
-            disks = sync_disks(:all, false)
+            # Disk are only synced with :all option when VM is first created
+            # NOTE: Detach actions are implemented through TM (not sync)
+            sync_opt = :all if deploy[:new] == true
+
+            disks = sync_disks(sync_opt, false)
             resize_unmanaged_disks
 
             if deploy[:boot] && !deploy[:boot].empty?
@@ -1983,7 +1987,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 +1997,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 +2136,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 +2144,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 = {}
@@ -2302,6 +2312,7 @@ end
             detach_disk_array = []
             extra_config      = []
             keys = disk_keys.invert
+
             ipool = VCenterDriver::VIHelper.one_pool(OpenNebula::ImagePool)
             disks_each(:detached?) do |d|
                 key = d.key.to_s
@@ -2377,8 +2388,7 @@ end
         # @param option  [symbol]  if :all is provided the
         # method will try to sync
         # all the disks (detached and not existing ones)
-        # otherwishe it will only sync
-        # the disks that are not existing
+        # otherwise it will only sync the disks that are not existing
         #
         # @param execute [boolean] indicates if the reconfigure operation
         # is going to
@@ -2428,8 +2438,8 @@ end
             # https://github.com/OpenNebula/one/issues/5409
             if snapshots? || one_snapshots?
                 error_msg =  'Existing sytem snapshots, cannot change disks. '
-                error_msg << 'Please remove all snapshots and try again.'
-                raise error_message
+                error_msg << 'Please remove all snapshots and try again'
+                raise error_msg
             end
 
             spec_hash     = {}
@@ -2615,7 +2625,7 @@ end
 
             if snapshots? || one_snapshots?
                 error_message =  'Existing sytem snapshots, cannot change disks'
-                error_message << '. Please remove all snapshots and try again.'
+                error_message << '. Please remove all snapshots and try again'
                 raise error_message
             end
 
@@ -3066,7 +3076,7 @@ end
             @item.ReconfigVM_Task(:spec => vm_config_spec).wait_for_completion
 
             devices.each do |device|
-                next unless first_ &&
+                next unless first_condition &&
                     device.key == scsi_key
 
                 controller = device.deviceInfo.label
@@ -3426,6 +3436,7 @@ end
                 config[:esx_migration_list] = 'Selected_by_DRS'
             end
 
+            vc_vm.reference_all_disks
             vc_vm.migrate(config)
 
             vm.replace({ 'VCENTER_CCR_REF' => ccr_ref })

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
@@ -539,6 +623,23 @@ module VCenterDriver
 
             network.info
 
+            if nic[:ipv4] || nic[:ipv6]
+                ar_array = network.to_hash['VNET']['AR_POOL']['AR']
+                ar_array = [ar_array] if ar_array.is_a?(Hash)
+
+                ipv4, _ipv6, _arid = find_ip_in_ar(
+                    IPAddr.new(nic[:ipv4]),
+                    ar_array
+                ) if ar_array && nic[:ipv4]
+
+                _ipv4, ipv6, _arid = find_ip_in_ar(
+                    IPAddr.new(nic[:ipv6]),
+                    ar_array
+                ) if ar_array && nic[:ipv6]
+
+                return [ipv4, ipv6]
+            end
+
             # Iterate over Retrieve vCenter VM NICs
             unless vm_object.item.guest.net.empty?
                 vm_object.item.guest.net.each do |net|
@@ -671,9 +772,10 @@ module VCenterDriver
             nic_tmp = "NIC=[\n"
             nic_tmp << "NETWORK_ID=\"#{one_vn.id}\",\n"
             nic_tmp << "NAME =\"VC_NIC#{nic_index}\",\n"
+            nic_tmp << "IP = \"#{nic[:ipv4]}\",\n" if nic[:ipv4]
 
             if vm?
-                if nic[:mac]
+                if nic[:mac] && !nic[:ipv4]
                     nic_tmp << "MAC=\"#{nic[:mac]}\",\n"
                 end
                 if nic[:ipv4_additionals]
@@ -729,6 +831,7 @@ module VCenterDriver
                     ar_tmp = create_ar(nic)
                     network_found.add_ar(ar_tmp)
                 end
+
                 ipv4, ipv6 = find_ips_in_network(network_found, vm_object,
                                                  nic, true)
                 network_found.info
@@ -740,8 +843,10 @@ module VCenterDriver
                 if nic[:mac] && ipv4.empty? && ipv6.empty?
                     nic_tmp << "MAC=\"#{nic[:mac]}\",\n"
                 end
+
                 nic_tmp << "IP=\"#{ipv4}\"," unless ipv4.empty?
                 nic_tmp << "IP6=\"#{ipv6}\"," unless ipv6.empty?
+
                 if nic[:ipv4_additionals]
                     nic_tmp <<
                         'VCENTER_ADDITIONALS_IP4'\
@@ -969,7 +1074,13 @@ module VCenterDriver
             ar_tmp << "]\n"
 
             if vm?
-                ar_tmp << create_ar(nic, true)
+                ar_tmp << create_ar(nic, false, nic[:ipv4]) if nic[:ipv4]
+
+                if nic[:ipv6]
+                    ar_tmp << create_ar(nic, false, nil, nic[:ipv6])
+                end
+
+                ar_tmp << create_ar(nic, true) if !nic[:ipv4] && !nic[:ipv6]
             end
 
             one_vnet[:one] << ar_tmp
@@ -1024,6 +1135,23 @@ module VCenterDriver
                 nic_index = 0
 
                 vc_nics.each do |nic|
+                    [:ipv4, :ipv6].each do |type|
+                        if nic[type]
+                            opts[type].shift if opts[type]
+                            next
+                        end
+
+                        begin
+                            ip = opts[type].shift if opts[type]
+
+                            # Check if it is a valid IP
+                            IPAddr.new(ip)
+
+                            nic[type] = ip
+                        rescue StandardError
+                        end
+                    end
+
                     # Check if the network already exists
                     network_found =
                         VCenterDriver::VIHelper
@@ -1835,12 +1963,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 +2019,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

data/lib/vmm_importer.rb

@@ -46,7 +46,8 @@ module VCenterDriver
             vm_ref     = selected['DEPLOY_ID'] || selected[:wild]['DEPLOY_ID']
             vm         = selected[:one_item]   || build
             template   = selected[:template]   || import_tmplt
-            host_id    = selected[:host]       || @list.keys[0]
+            template = "DEPLOY_ID = #{vm_ref}\n" + template
+            host_id    = selected[:host] || @list.keys[0]
 
             vc_uuid    = @vi_client.vim.serviceContent.about.instanceUuid
             vc_name    = @vi_client.vim.host
@@ -72,13 +73,15 @@ module VCenterDriver
             template << template_disks
 
             opts = {
-                :vi_client => @vi_client,
-                :vc_uuid => vc_uuid,
-                :npool => npool,
-                :hpool => hpool,
-                :vcenter => vc_name,
+                :vi_client      => @vi_client,
+                :vc_uuid        => vc_uuid,
+                :npool          => npool,
+                :hpool          => hpool,
+                :vcenter        => vc_name,
                 :template_moref => vm_ref,
-                :vm_object => vc_vm
+                :vm_object      => vc_vm,
+                :ipv4           => selected[:ipv4],
+                :ipv6           => selected[:ipv6]
             }
 
             # Create images or get nics information for template