opennebula 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630fc82258e06265dd9308385f987452c2c9e97774f9c844567eb0512c699996
-  data.tar.gz: 4b19ee5faf356fc61ba4e8883dc7bb37137d54d34c251c6f0cbbfab5a8b0b27b
+  metadata.gz: 9492453d246b5d413a5902766bda7526160e953c1e6072d242509ebff8df73bc
+  data.tar.gz: eb349b7f7f2a87b29cbbae06ec35db4131db8baf96e5cbf4cf9875f3815e2db3
 SHA512:
-  metadata.gz: ea3eba7d99bfc70cb7b94a2c8c2548b130d50ec3cf73d3344e0ed12a05b2e83780eec32e4790cfeef00bde6a38164468a0cfe91bb62cd1325c20aac7f9cca235
-  data.tar.gz: eeb5c702a03ef47f5ad8e37f95b94259e49019a78d5b58f8ce560d3b2afd50cb8828a7512afe14b1f3e25e262ab3b3974f9174e3109a20a98d89140a90fbca96
+  metadata.gz: 546bd3075e73b2e73be4abe53dad5af5d27956dbb896182fd828a2794b510b5df71ea615915b82abbba506ff824f31091fb54afee8d8e67b3b50092714a15ffb
+  data.tar.gz: 6476073b7b334c8e746350760a0de9082770f45df57ee3c9db318b72ee9f1c72c86f8626d892e313c4d92387920e367a063878ac24237b017b66fecb7dc3d7fb

data/lib/cloud/CloudClient.rb

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

data/lib/host.rb

@@ -712,7 +712,7 @@ module VCenterDriver
 
                 # Only take care of VMs, not templates
                 if !hashed_properties['config.template']
-                    vms[r.obj._ref] = hashed_properties
+                    vms[r.obj._ref + '_' + vc_uuid] = hashed_properties
                     vm_objects << r.obj
                 end
             end
@@ -802,7 +802,8 @@ module VCenterDriver
                     found_vm =
                         host_vms
                         .select do |vm|
-                            vm['DEPLOY_ID'].eql? vm_ref
+                            vm['DEPLOY_ID'] == vm_ref ||
+                            vm['DEPLOY_ID'] == VIHelper.get_deploy_id(vm_ref)
                         end.first
                     id = found_vm['ID'] if found_vm
 

data/lib/opennebula/flow/service_pool.rb

@@ -55,8 +55,12 @@ module OpenNebula
             @one_pool   = nil
 
             if @client
-                info     = Nokogiri::XML(@client.call('user.info', -1))
-                @user_id = Integer(info.xpath('/USER/ID').text)
+                rc = @client.call('user.info', -1)
+
+                unless OpenNebula.is_error?(rc)
+                    info     = Nokogiri::XML(rc)
+                    @user_id = Integer(info.xpath('/USER/ID').text)
+                end
             end
 
             super('DOCUMENT_POOL', 'DOCUMENT', @client)

data/lib/opennebula/flow/service_template.rb

@@ -315,6 +315,12 @@ module OpenNebula
                 end
             else
                 IMMUTABLE_ATTRS.each do |attr|
+                    # Allows updating the template without
+                    # specifying the immutable attributes
+                    if template[attr].nil?
+                        template[attr] = @body[attr]
+                    end
+
                     next if template[attr] == @body[attr]
 
                     return [false, "service_template/#{attr}"]

data/lib/opennebula/host.rb

@@ -14,7 +14,6 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
 require 'opennebula/pool_element'
 require 'base64'
 require 'yaml'
@@ -217,10 +216,12 @@ module OpenNebula
         # Imports a wild VM from the host and puts it in running state
         #
         # @param name [String] Name of the VM to import
+        # @param ipv4 [Array]  Array with IP4s to set
+        # @param ipv6 [Array]  Array with IP6s to set
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def import_wild(name)
+        def import_wild(name, ipv4 = nil, ipv6 = nil)
             vms = importable_wilds.select {|vm| vm['VM_NAME'] == name }
 
             if vms.length == 0
@@ -247,8 +248,15 @@ module OpenNebula
                 vi_client = VCenterDriver::VIClient.new_from_host(self["ID"])
                 importer  = VCenterDriver::VmmImporter.new(@client, vi_client)
 
-                return importer.import({wild: wild, template: template,
-                                        one_item: vm, host: self['ID']})
+                return importer.import(
+                    { :wild     => wild,
+                      :template => template,
+                      :one_item => vm,
+                      :host     => self['ID'],
+                      :ipv4     => ipv4,
+                      :ipv6     => ipv6
+                    }
+                )
             else
                 rc = vm.allocate(template)
 

data/lib/opennebula/marketplaceapp_ext.rb

@@ -185,9 +185,22 @@ module OpenNebula::MarketPlaceAppExt
                 #---------------------------------------------------------------
                 # Created an associated VMTemplate if needed
                 #---------------------------------------------------------------
-                if (self['TEMPLATE/VMTEMPLATE64'].nil? && !is_vcenter) ||
-                    options[:notemplate] ||
-                    options[:template] == -1
+                if is_vcenter &&
+                    (!options[:template] || options[:template] == -1)
+                    tmpl = create_vcenter_template(ds, options, image)
+
+                    if OpenNebula.is_error?(tmpl)
+                        rc_info[:vmtemplate] = [tmpl]
+                    else
+                        rc_info[:vmtemplate] = [tmpl.id]
+                    end
+
+                    return rc_info
+                end
+
+                if self['TEMPLATE/VMTEMPLATE64'].nil? ||
+                   options[:notemplate] ||
+                   options[:template] == -1
                     return rc_info
                 end
 
@@ -286,33 +299,128 @@ module OpenNebula::MarketPlaceAppExt
                 rc
             end
 
-            def update_options_with_template(options, _validate = false)
-                vcenterrc_path =
-                    "#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"
+            # Create a VM template in vCenter in order to use it when
+            # deploying an app from the marketplace
+            #
+            # @param ds      [OpenNebula::Datastore] Datastore information
+            # @param options [Hash]                  Export options
+            # @param image   [OpenNebula::Image]     Image information
+            def create_vcenter_template(ds, options, image = nil)
+                ret  = {}
+                keys = %w[VCENTER_TEMPLATE_REF
+                          VCENTER_CCR_REF
+                          VCENTER_INSTANCE_ID]
+
+                if ds['//VCENTER_TEMPLATE_REF']
+                    keys.each do |key|
+                        ret[key] = ds["//#{key}"]
+                    end
+                else
+                    require 'vcenter_driver'
 
-                if File.file?(vcenterrc_path)
-                    config_vcenter = YAML.load_file(vcenterrc_path)
+                    # Get vi client for current datastore
+                    vi_client = VCenterDriver::VIClient.new_from_datastore(
+                        ds.id
+                    )
 
-                    if config_vcenter.key?(:default_template)
-                        options[:template] =
-                            config_vcenter[:default_template]
+                    # Get datastore object
+                    ds_ref    = ds['//VCENTER_DS_REF']
+                    datastore = VCenterDriver::Datastore.new_from_ref(
+                        ds_ref,
+                        vi_client
+                    )
 
-                        options
-                    else
-                        raise "Couldn't find default_template " \
-                              'configuration in vcenterrc conf ' \
-                              'file. Please use the --template ' \
-                              'file to define a VM Template ID if ' \
-                              'needed or add default_template to' \
-                              ' vcenterrc conf file'
+                    # Get resource pool
+                    host_ref          = datastore['host'].first.key.parent._ref
+                    vi_client.ccr_ref = host_ref
+
+                    host = VCenterDriver::ClusterComputeResource.new_from_ref(
+                        host_ref,
+                        vi_client
+                    )
+
+                    rp = host.resource_pools.first
+
+                    # Get vCentrer instance ID
+                    uuid = vi_client.vim.serviceContent.about.instanceUuid
+
+                    # Create VM folder it not exists
+                    dc        = datastore.obtain_dc.item
+                    vm_folder = dc.find_folder('one_default_template')
+
+                    if vm_folder.nil?
+                        dc.vmFolder.CreateFolder(
+                            :name => 'one_default_template'
+                        )
+                        vm_folder = dc.find_folder('one_default_template')
+                    end
+
+                    # Define default VM config
+                    vm_cfg = { :name     => "one_app_template-#{ds.id}",
+                            :guestId  => 'otherGuest',
+                            :numCPUs  => 1,
+                            :memoryMB => 128,
+                            :files    => {
+                                :vmPathName => "[#{datastore.item.name}]"
+                            } }
+
+                    # Create the VM
+                    vm = vm_folder.CreateVM_Task(
+                        :config => vm_cfg,
+                        :pool   => rp
+                    ).wait_for_completion
+
+                    # Create the VM template
+                    vm.MarkAsTemplate
+
+                    ret['VCENTER_TEMPLATE_REF'] = vm._ref
+                    ret['VCENTER_CCR_REF']      = host_ref
+                    ret['VCENTER_INSTANCE_ID']  = uuid
+
+                    ret.each do |key, value|
+                        ds.update("#{key}=\"#{value}\"", true)
                     end
+                end
+
+                tmpl = <<-EOT
+                NAME   = "#{options[:vmtemplate_name] || options[:name]}"
+                CPU    = "1"
+                VCPU   = "1"
+                MEMORY = "128"
+                HYPERVISOR = "vcenter"
+                EOT
+
+                tmpl << "DISK = [ IMAGE_ID = \"#{image.id}\" ]" if image
+
+                ret.each do |key, value|
+                    tmpl << "#{key}=\"#{value}\"\n"
+                end
+
+                vmtpl = Template.new(Template.build_xml, @client)
+
+                rc = vmtpl.allocate(tmpl)
+
+                if OpenNebula.is_error?(rc)
+                    rc
                 else
-                    raise "Couldn't find vcenterrc conf file. " \
-                          ' Please use the --template file to define' \
-                          ' a VM Template ID if needed.'
+                    Template.new_with_id(vmtpl.id, @client)
                 end
             end
 
+            def update_options_with_template(options)
+                path = "#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"
+
+                return options unless File.file?(path)
+
+                config = YAML.load_file(path)
+
+                return options unless config.key?(:default_template)
+
+                options[:template] = config[:default_template]
+
+                options
+            end
+
             # Creates a VM template based on the APPTEMPLATE64 attribute
             #    @param [Hash] options
             #       :export_name [String] name of the vm template
@@ -334,19 +442,19 @@ module OpenNebula::MarketPlaceAppExt
                         options = update_options_with_template(options)
                     end
 
-                    template_id = options[:template]
-
-                    if template_id < 0
-                        return
-                    end
+                    if !options[:template] || options[:template] == -1
+                        vmtpl = create_vcenter_template(ds, options)
+                    else
+                        template_id = options[:template]
+                        template    = Template.new_with_id(template_id, @client)
 
-                    template = Template.new_with_id(template_id, @client)
+                        vmtpl_id = template.clone(
+                            options[:vmtemplate_name] || options[:name]
+                        )
 
-                    vmtpl_id = template.clone(
-                        options[:vmtemplate_name] || options[:name]
-                    )
+                        vmtpl = Template.new_with_id(vmtpl_id, @client)
+                    end
 
-                    vmtpl = Template.new_with_id(vmtpl_id, @client)
                     rc = vmtpl.info
                 else
                     # ----------------------------------------------------------

data/lib/opennebula/oneflow_client.rb

@@ -319,10 +319,21 @@ module Service
 
     class Client
         def initialize(opts={})
+            endpoint  = '/.one/oneflow_endpoint'
             @username = opts[:username] || ENV['ONEFLOW_USER']
             @password = opts[:password] || ENV['ONEFLOW_PASSWORD']
 
-            url = opts[:url] || ENV['ONEFLOW_URL'] || 'http://localhost:2474'
+            if opts[:url]
+                url = opts[:url]
+            elsif ENV['ONEFLOW_URL']
+                url = ENV['ONEFLOW_URL']
+            elsif ENV['HOME'] && File.exists?(ENV['HOME'] + endpoint)
+                url = File.read(ENV['HOME'] + endpoint).strip
+            elsif File.exists?('/var/lib/one/.one/oneflow_endpoint')
+                url = File.read('/var/lib/one/.one/oneflow_endpoint').strip
+            else
+                url = 'http://localhost:2474'
+            end
 
             if @username.nil? && @password.nil?
                 if ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and File.file?(ENV["ONE_AUTH"])

data/lib/opennebula.rb

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

data/lib/scripts_common.rb

@@ -28,6 +28,11 @@ module OpenNebula
         log_function("INFO", message)
     end
 
+    # Logs an info message
+    def self.log_warning(message)
+        log_function('WARNING', message)
+    end
+
     # Logs an error message
     def self.log_error(message)
         log_function("ERROR", message)

data/lib/vcenter_importer.rb

@@ -279,6 +279,15 @@ module VCenterDriver
                 rs = dc_folder.get_unimported_hosts(hpool,
                                                     vcenter_instance_name)
 
+                # Select just cluster with this reference
+                if options[:cluster_ref]
+                    rs.each do |_, clusters|
+                        clusters.select! do |c|
+                            c[:cluster_ref] == options[:cluster_ref]
+                        end
+                    end
+                end
+
                 STDOUT.print "done!\n\n"
 
                 rs.each do |dc, clusters|

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']
@@ -1713,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?
@@ -2306,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
@@ -2381,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
@@ -2432,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     = {}
@@ -2619,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
 
@@ -3070,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
@@ -3430,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

@@ -623,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|
@@ -755,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]
@@ -813,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
@@ -824,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'\
@@ -1053,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
@@ -1108,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

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

metadata

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