opennebula 5.13.90.pre → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a8c00c023d39dac1d3d0c866851beca57f8b4a
-  data.tar.gz: e44c5056a014e41ba5f2f5f928d36d3bdfcafd15
+  metadata.gz: 6198250d78ce52345198a1d86230f430589cef5c
+  data.tar.gz: 3caf470ee5faab9e3c09576f79ad781db3653803
 SHA512:
-  metadata.gz: 1efacac3e2a1dc06134672c69f3d563a89d2cdbbb810bd8289c0d7f5e7e7dbd7de1a247fe5976f36d9df796355160b0d1de3f9fb8013c0fe4c3e30116212ab96
-  data.tar.gz: 08304bf5ee0386bbef56d81e6a65668010452130b259ced25a75fdc5693109d7fa667248cb3cec5157636d1c965425fb44dfa043bdadcf821f4f6d3d2f9d1fdb
+  metadata.gz: 4695c98d18bdd50b28c5f185e7bdb6e2bc1ef153562d5c690635af667a954edd78ab3073f014aa5c9059e755d9f1ab34859004bf88ffd6e99853a47acb5a0bc4
+  data.tar.gz: ada07168177c2121930a8f0707329f23a34cc91a28f2e3f45d0f24a926bd0682d188a7ba04b4b144c1d9ad1427ebe9b41cedf6a523e84e0eefc1f141966513fc

data/lib/cloud/CloudClient.rb

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

data/lib/datacenter.rb

@@ -576,7 +576,6 @@ module VCenterDriver
             # Initialize opts hash used to inject data into one template
             opts = {}
 
-            # if full_process
             # Add network type to network hash
             network_type = \
                 VCenterDriver::Network.get_network_type(
@@ -585,7 +584,6 @@ module VCenterDriver
                 )
             network[vc_network_ref][:network_type] = network_type
             network[vc_network_ref][:type] = network_type
-            # end
 
             # Determine if the network must be excluded
             network[vc_network_ref][:excluded] = exclude_network?(

data/lib/network.rb

@@ -486,7 +486,7 @@ module VCenterDriver
             @defaults = { :size => '255', :type => 'ether' }
         end
 
-        def process_import(indexes, opts = {}, &block)
+        def process_import(indexes, opts = {}, &_block)
             indexes = indexes.gsub(/\s*\,\s*/, ',').strip.split(',')
 
             dc_folder = VCenterDriver::DatacenterFolder.new(@vi_client)
@@ -526,30 +526,21 @@ module VCenterDriver
                               "#{hpool.message}"
                     end
 
-                    opts = {}
-
                     params = {}
                     params[:vc_network] = vc_cluster_network
                     params[:vcenter_instance_name] = vcenter_instance_name
                     params[:vcenter_uuid] = vcenter_uuid
                     params[:_hpool] = hpool
                     params[:one_host] = one_host
-                    params[:args] = opts
+                    params[:args] = {}
 
                     selected = dc_folder.process_network(params)
 
                     selected = selected[index]
 
-                    if block_given?
-                        @info[index][:opts] = block.call(selected)
-                    elsif opts[index]
-                        @info[index][:opts] = opts[index]
-                    else
-                        @info[index][:opts] = defaults
-                    end
-
                     # import the object
-                    @info[:success] << import(selected)
+                    opts[index] ||= @defaults
+                    @info[:success] << import(selected, opts[index])
                 rescue StandardError => e
                     @info[:error] << { index => e.message }
                     @info[index][:e] = e
@@ -645,8 +636,8 @@ module VCenterDriver
             str
         end
 
-        def import(selected)
-            opts = @info[selected[:ref]][:opts]
+        def import(selected, opts = nil)
+            opts = @info[selected[:ref]][:opts] if opts.nil?
 
             net = VCenterDriver::Network
                   .new_from_ref(selected[:ref], @vi_client)

data/lib/opennebula.rb

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

data/lib/opennebula/marketplaceapp_ext.rb

@@ -155,6 +155,10 @@ module OpenNebula::MarketPlaceAppExt
                 is_vcenter = !OpenNebula.is_error?(rc) &&
                              (ds['TEMPLATE/DRIVER'] == 'vcenter')
 
+                if is_vcenter && options[:template].nil?
+                    options = update_options_with_template(options)
+                end
+
                 #---------------------------------------------------------------
                 # Allocate the image in OpenNebula
                 #---------------------------------------------------------------
@@ -181,15 +185,17 @@ module OpenNebula::MarketPlaceAppExt
                 #---------------------------------------------------------------
                 # Created an associated VMTemplate if needed
                 #---------------------------------------------------------------
-                if self['TEMPLATE/VMTEMPLATE64'].nil? || options[:notemplate]
+                if (self['TEMPLATE/VMTEMPLATE64'].nil? && !is_vcenter) ||
+                    options[:notemplate] ||
+                    options[:template] == -1
                     return rc_info
                 end
 
                 if !options[:template].nil?
                     template_id = options[:template]
 
-                    if template_id == -1
-                        template_id = options[:default_template]
+                    if template_id < 0
+                        raise 'Invalid option, template_id must be a valid ID'
                     end
 
                     template = Template.new_with_id(template_id, @client)
@@ -280,6 +286,33 @@ module OpenNebula::MarketPlaceAppExt
                 rc
             end
 
+            def update_options_with_template(options, _validate = false)
+                vcenterrc_path =
+                    "#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"
+
+                if File.file?(vcenterrc_path)
+                    config_vcenter = YAML.load_file(vcenterrc_path)
+
+                    if config_vcenter.key?(:default_template)
+                        options[:template] =
+                            config_vcenter[:default_template]
+
+                        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'
+                    end
+                else
+                    raise "Couldn't find vcenterrc conf file. " \
+                          ' Please use the --template file to define' \
+                          ' a VM Template ID if needed.'
+                end
+            end
+
             # Creates a VM template based on the APPTEMPLATE64 attribute
             #    @param [Hash] options
             #       :export_name [String] name of the vm template
@@ -288,19 +321,50 @@ module OpenNebula::MarketPlaceAppExt
             #
             #    @return [Integer, OpenNebula::Error] template id or error
             def create_vm_template(options, disks)
-                # --------------------------------------------------------------
-                # Allocate Template
-                # --------------------------------------------------------------
-                if self['TEMPLATE/APPTEMPLATE64'].nil?
-                    return Error.new("Missing APPTEMPLATE64 for App #{id}")
-                end
+                dsid = options[:dsid]
+                ds = OpenNebula::Datastore.new_with_id(dsid, @client)
+                rc = ds.info
 
-                tmpl = Base64.decode64(self['TEMPLATE/APPTEMPLATE64'])
+                is_vcenter =
+                    !OpenNebula.is_error?(rc) &&
+                        (ds['TEMPLATE/DRIVER'] == 'vcenter')
+
+                if is_vcenter
+                    if options[:template].nil?
+                        options = update_options_with_template(options)
+                    end
+
+                    template_id = options[:template]
+
+                    if template_id < 0
+                        return
+                    end
+
+                    template = Template.new_with_id(template_id, @client)
+
+                    vmtpl_id = template.clone(
+                        options[:vmtemplate_name] || options[:name]
+                    )
+
+                    vmtpl = Template.new_with_id(vmtpl_id, @client)
+                    rc = vmtpl.info
+                else
+                    # ----------------------------------------------------------
+                    # Allocate Template
+                    # ----------------------------------------------------------
+                    if self['TEMPLATE/APPTEMPLATE64'].nil?
+                        return Error.new(
+                            "Missing APPTEMPLATE64 for App #{id}"
+                        )
+                    end
+
+                    tmpl = Base64.decode64(self['TEMPLATE/APPTEMPLATE64'])
 
-                tmpl << "\nNAME=\"#{options[:name]}\"\n"
+                    tmpl << "\nNAME=\"#{options[:name]}\"\n"
 
-                vmtpl = Template.new(Template.build_xml, @client)
-                rc    = vmtpl.allocate(tmpl)
+                    vmtpl = Template.new(Template.build_xml, @client)
+                    rc    = vmtpl.allocate(tmpl)
+                end
 
                 return rc if OpenNebula.is_error?(rc)
 

data/lib/scripts_common.rb

@@ -14,6 +14,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+require 'shellwords'
+
 module OpenNebula
 
     # Generic log function
@@ -76,6 +78,7 @@ module OpenNebula
     # If a second parameter is present it is used as the error message when
     # the command fails
     def self.exec_and_log(command, message=nil, allowed_return_code=0)
+        command = command.shellsplit.shelljoin # escape
         output=`#{command} 2>&1 1>/dev/null`
         code=$?.exitstatus
 

data/lib/vi_helper.rb

@@ -231,10 +231,11 @@ module VCenterDriver
             @ref_hash[attribute][refkey]
         end
 
+        require 'addressable'
         def self.find_image_by(att, the_class, path, ds_id, pool = nil)
             pool = one_pool(the_class, false) if pool.nil?
             pool.find do |e|
-                e[att] == path &&
+                e[att] == Addressable::URI.escape(path) &&
                     e['DATASTORE_ID'] == ds_id
             end
         end

data/lib/virtual_machine.rb

@@ -3032,7 +3032,7 @@ module VCenterDriver
         # Create a snapshot for the VM
         def create_snapshot(snap_id, snap_name)
             memory_dumps = true
-            memory_dumps = CONFIG[:memory_dumps] if CONFIG[:memory_dumps]
+            memory_dumps = CONFIG[:memory_dumps] unless CONFIG[:memory_dumps].nil?
 
             snapshot_hash = {
                 :name        => snap_id,

data/lib/vm_template.rb

@@ -1659,10 +1659,12 @@ module VCenterDriver
                 folders = []
                 until item.instance_of? RbVmomi::VIM::Datacenter
                     item = item.parent
-                    first_condition = item.instance_of? RbVmomi::VIM::Datacenter
-                    second_condition = item.name != 'vm'
+                    first_condition =
+                        !(item.instance_of? RbVmomi::VIM::Datacenter)
+                    second_condition =
+                        item.name != 'vm'
 
-                    unless first_condition && second_condition
+                    if first_condition && second_condition
                         folders << item.name
                     end
                     if item.nil?
@@ -1693,8 +1695,8 @@ module VCenterDriver
                 one_tmp[:dc_name]               = dc_name
                 one_tmp[:template_name]         = template_name
                 one_tmp[:sunstone_template_name]=
-                    "#{template_name} [ Cluster: #{template_ccr_name} \
-                    - Template location: #{location} ]"
+                    "#{template_name} [ Cluster: #{template_ccr_name}" \
+                    " - Template location: #{location} ]"
                 one_tmp[:template_location]     = location
                 one_tmp[:vcenter_ccr_ref]       = template_ccr_ref
                 one_tmp[:vcenter_ref]           = template_ref

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.13.90.pre
+  version: 6.0.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1