opennebula 6.0.3 → 6.2.1

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
@@ -369,9 +379,11 @@ module VCenterDriver
                 error_msg = "\nError: #{e.message}\n"
                 error_msg << "#{e.backtrace}\n" \
                               if VCenterDriver::CONFIG[:debug_information]
-                STDOUT.puts error_msg
+                STDERR.puts error_msg
+                raise_error = true
             ensure
                 vi_client.close_connection if vi_client
+                raise if raise_error
             end
         end
 

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?
@@ -1090,14 +1088,22 @@ end
         #
         # @return [Hash ("String" => self.Nic)] Model representation of nics
         def info_nics
+            keep_mac_on_imported = false
+            keep_mac_on_imported = CONFIG[:keep_mac_on_imported] \
+                                     unless CONFIG[:keep_mac_on_imported].nil?
+
             @nics = { :macs => {} }
 
             vc_nics  = vcenter_nics_list
             one_nics = one_nics_get
 
             one_nics.each do |one_nic|
-                index  = one_nic['NIC_ID']
-                mac    = one_nic['MAC']
+                index = one_nic['NIC_ID']
+                if keep_mac_on_imported && one_nic['MAC_IMPORTED']
+                    mac = one_nic['MAC_IMPORTED']
+                else
+                    mac = one_nic['MAC']
+                end
                 vc_dev = query_nic(mac, vc_nics)
 
                 if vc_dev
@@ -1975,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
@@ -1985,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 = {}
@@ -2121,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
@@ -2129,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 = {}
@@ -2419,7 +2431,7 @@ end
             # automatically cleans all system snapshots
             # https://github.com/OpenNebula/one/issues/5409
             if snapshots? || one_snapshots?
-                error_msg =  'Existing system snapshots, cannot change disks. '
+                error_msg =  'Existing sytem snapshots, cannot change disks. '
                 error_msg << 'Please remove all snapshots and try again.'
                 raise error_message
             end
@@ -2606,9 +2618,8 @@ end
             return unless disk.exists?
 
             if snapshots? || one_snapshots?
-                error_message =  'Existing system snapshots, cannot change '
-                error_message << 'disks . Please remove all snapshots and '
-                error_message << 'try again.'
+                error_message =  'Existing sytem snapshots, cannot change disks'
+                error_message << '. Please remove all snapshots and try again.'
                 raise error_message
             end
 

data/lib/vm_template.rb

@@ -40,7 +40,7 @@ module VCenterDriver
         def lock
             return unless @locking
 
-            @locking_file = File.open('/tmp/vcenter-importer-lock', 'w')
+            @locking_file = File.open('/var/tmp/vcenter-importer-lock', 'w')
             @locking_file.flock(File::LOCK_EX)
         end
 
@@ -50,9 +50,9 @@ module VCenterDriver
 
             @locking_file.close
 
-            return unless File.exist?('/tmp/vcenter-importer-lock')
+            return unless File.exist?('/var/tmp/vcenter-importer-lock')
 
-            File.delete('/tmp/vcenter-importer-lock')
+            File.delete('/var/tmp/vcenter-importer-lock')
         end
 
         def vm?
@@ -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
@@ -733,6 +817,9 @@ module VCenterDriver
                                                  nic, true)
                 network_found.info
 
+                if nic[:mac]
+                    nic_tmp << "MAC_IMPORTED=\"#{nic[:mac]}\",\n"
+                end
                 # This is the existing nic info
                 if nic[:mac] && ipv4.empty? && ipv6.empty?
                     nic_tmp << "MAC=\"#{nic[:mac]}\",\n"
@@ -1832,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
 
@@ -1890,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