opennebula 5.13.90.pre → 6.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a8c00c023d39dac1d3d0c866851beca57f8b4a
-  data.tar.gz: e44c5056a014e41ba5f2f5f928d36d3bdfcafd15
+  metadata.gz: a444d034775d99b9c676a7718063ff71798eb2ee
+  data.tar.gz: aba015a7d6e223011bb9f33fd1a610dcc01b1379
 SHA512:
-  metadata.gz: 1efacac3e2a1dc06134672c69f3d563a89d2cdbbb810bd8289c0d7f5e7e7dbd7de1a247fe5976f36d9df796355160b0d1de3f9fb8013c0fe4c3e30116212ab96
-  data.tar.gz: 08304bf5ee0386bbef56d81e6a65668010452130b259ced25a75fdc5693109d7fa667248cb3cec5157636d1c965425fb44dfa043bdadcf821f4f6d3d2f9d1fdb
+  metadata.gz: 9dad15a530bfa73ffce417c4dc66f8f2118239de7396c7aa1cdae928869f69b994e1dc61a93ab410de9b74511d4a770eac922b07db1d29391758d91fb11b54e6
+  data.tar.gz: e00ba49630acf67ae3fbcc1c715a7164ede4b6aec81fa059ecbe6536f8d90c7477ece5c3e73a9e5a1aafc26508729e9fb390ecfef43815e93f1042f6594a1ca9

data/lib/cloud/CloudClient.rb

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

data/lib/datacenter.rb

@@ -500,7 +500,7 @@ module VCenterDriver
         end
 
         # Determine if a network must be excluded from the list
-        def exclude_network?(vc_network, one_host, args, vc_network_hash)
+        def exclude_network?(one_host, args, vc_network_hash, network_type)
             vc_network_name = vc_network_hash[:vc_network_name]
             vc_network_host = vc_network_hash[:vc_network_host]
             vc_network_tag = vc_network_hash[:vc_network_tag]
@@ -514,12 +514,6 @@ module VCenterDriver
                     ]
 
                     # Only NSX-V and NSX-T can be excluded
-                    network_type = VCenterDriver::Network
-                                   .get_network_type(
-                                       vc_network,
-                                       vc_network_name
-                                   )
-
                     return true if network_types.include? network_type
                 end
                 # Exclude networks without hosts
@@ -533,7 +527,7 @@ module VCenterDriver
                     return true
                 end
                 # Exclude portgroup used for VXLAN communication in NSX
-                if vc_network['name'].match(/^vxw-vmknicPg-dvs-(.*)/)
+                if vc_network_name.match(/^vxw-vmknicPg-dvs-(.*)/)
                     return true
                 end
 
@@ -543,7 +537,7 @@ module VCenterDriver
         end
 
         # Proccess each network
-        def process_network(params)
+        def process_network(params, networks_type, hosts_list, host_list_object)
             vc_network = params[:vc_network]
             vcenter_instance_name = params[:vcenter_instance_name]
             vcenter_uuid = params[:vcenter_uuid]
@@ -576,26 +570,32 @@ 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(
-                    vc_network,
-                    vc_network_name
-                )
+            if networks_type.key?(vc_network_hash[:vc_network_ref])
+                network_type = networks_type[vc_network_hash[:vc_network_ref]]
+            else
+                network_type =
+                    VCenterDriver::Network.get_network_type(
+                        vc_network,
+                        vc_network_name
+                    )
+                networks_type[vc_network_hash[:vc_network_ref]] = network_type
+            end
+
             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?(
-                vc_network,
                 one_host,
                 args,
-                vc_network_hash
+                vc_network_hash,
+                network_type
             )
 
-            return if network[vc_network_ref][:excluded] == true
+            if network[vc_network_ref][:excluded] == true
+                return [nil, networks_type, hosts_list, host_list_object]
+            end
 
             if full_process
                 case network[vc_network_ref][:network_type]
@@ -653,31 +653,50 @@ module VCenterDriver
             vc_hosts = vc_network.host
             vc_hosts.each do |vc_host|
                 # Get vCenter Cluster
-                vc_cluster = vc_host.parent
-                vc_cluster_ref = vc_cluster._ref
-                vc_cluster_name = vc_cluster.name
-                # Get one host from each vCenter cluster
-                one_host = VCenterDriver::VIHelper
-                           .find_by_ref(OpenNebula::HostPool,
-                                        'TEMPLATE/VCENTER_CCR_REF',
-                                        vc_cluster_ref,
-                                        vcenter_uuid)
+                vc_host_ref = vc_host._ref
+                if !host_list_object.key?(vc_host_ref)
+                    vc_cluster = vc_host.parent
+                    vc_cluster_ref = vc_cluster._ref
+                    vc_cluster_name = vc_cluster.name
+                    host_list_object[vc_host_ref] = {
+                        :vc_cluster_ref => vc_cluster_ref,
+                        :vc_cluster_name => vc_cluster_name
+                    }
+                end
+
+                vc_cluster = host_list_object[vc_host_ref]
+
+                if hosts_list.key? vc_cluster[:vc_cluster_ref]
+                    one_host = hosts_list[vc_cluster[:vc_cluster_ref]]
+                else
+                    one_host = VCenterDriver::VIHelper
+                               .find_by_ref(OpenNebula::HostPool,
+                                            'TEMPLATE/VCENTER_CCR_REF',
+                                            vc_cluster[:vc_cluster_ref],
+                                            vcenter_uuid)
+                    hosts_list[vc_cluster[:vc_cluster_ref]] = one_host
+                end
                 # Check if network is excluded from each host
                 next if exclude_network?(
-                    vc_network,
                     one_host,
                     args,
-                    vc_network_hash
+                    vc_network_hash,
+                    network_type
                 )
 
                 # Insert vCenter cluster ref
-                network[vc_network_ref][:clusters][:refs] << vc_cluster_ref
+                network[vc_network_ref][:clusters][:refs] <<
+                    vc_cluster[:vc_cluster_ref]
+
                 # Insert OpenNebula cluster id
                 cluster_id = one_cluster_id(one_host)
-                network[vc_network_ref][:clusters][:one_ids] << cluster_id
+                network[vc_network_ref][:clusters][:one_ids] <<
+                    cluster_id
+
                 # Insert vCenter cluster name
-                network[vc_network_ref][:clusters][:names] << vc_cluster_name
-                opts[:dc_name] = vc_cluster_name
+                network[vc_network_ref][:clusters][:names] <<
+                    vc_cluster[:vc_cluster_name]
+                opts[:dc_name] = vc_cluster[:vc_cluster_name]
             end
 
             # Remove duplicate entries
@@ -708,7 +727,7 @@ module VCenterDriver
                     network[vc_network_ref]['name']
             end
 
-            network
+            [network, networks_type, hosts_list, host_list_object]
         end
 
         # rubocop:disable Style/GlobalVars
@@ -725,13 +744,15 @@ module VCenterDriver
                     $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
 
             # Get all networks in vcenter cluster (one_host)
             vc_cluster_networks = cluster_networks(one_host)
+            networks_type = {}
+            hosts_list = {}
+            host_list_object = {}
 
             # Iterate over vcenter networks
             vc_cluster_networks.each do |vc_cluster_network|
@@ -753,7 +774,20 @@ module VCenterDriver
                 params[:one_host]= one_host
                 params[:args] = args
 
-                network = process_network(params)
+                network,
+                    networks_type_new,
+                    hosts_list_new,
+                    host_list_object_new =
+                    process_network(
+                        params,
+                        networks_type,
+                        hosts_list,
+                        host_list_object
+                    )
+
+                networks_type = networks_type_new
+                hosts_list = hosts_list_new
+                host_list_object = host_list_object_new
 
                 networks.merge!(network) unless network.nil?
             end

data/lib/distributed_firewall.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

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,27 @@ 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, _networks_type, _hosts_list, _clusters_list =
+                        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 +642,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/nsx_client.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsx_constants.rb

@@ -6,7 +6,7 @@
 # a copy of the License at                                                   #
 #                                                                            #
 # http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                             #
+#                                                                            #
 # Unless required by applicable law or agreed to in writing, software        #
 # distributed under the License is distributed on an "AS IS" BASIS,          #
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsx_driver.rb

@@ -36,14 +36,27 @@ end
 
 ENV['LANG'] = 'C'
 
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
 $LOAD_PATH << LIB_LOCATION + '/ruby'
 $LOAD_PATH << LIB_LOCATION + '/ruby/nsx_driver'

data/lib/nsx_rule.rb

@@ -33,14 +33,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsxt_client.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsxv_client.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/opennebula/flow/service_template.rb

@@ -357,7 +357,15 @@ module OpenNebula
 
                 break rc if OpenNebula.is_error?(rc)
 
-                rc = template.clone("#{template.name}-#{name}", recursive)
+                # The maximum size is 128, so crop the template name if it
+                # exceeds the limit
+                new_name = "#{template.name}-#{name}"
+
+                if new_name.size > 119
+                    new_name = "#{template.name[0..(119 - name.size)]}-#{name}"
+                end
+
+                rc = template.clone(new_name, recursive)
 
                 break rc if OpenNebula.is_error?(rc)
 
@@ -384,6 +392,9 @@ module OpenNebula
                 return rc
             end
 
+            # add registration time, as the template is new
+            body['registration_time'] = Integer(Time.now)
+
             # update the template with the new body
             doc.update(body.to_json)
 
@@ -391,6 +402,31 @@ module OpenNebula
             new_id
         end
 
+        # Clones a service template
+        #
+        # @param name [Stirng] New name
+        #
+        # @return [Integer] New template ID
+        def clone(name)
+            new_id = super
+
+            doc = OpenNebula::ServiceTemplate.new_with_id(new_id, @client)
+            rc  = doc.info
+
+            return rc if OpenNebula.is_error?(rc)
+
+            body = JSON.parse(doc["TEMPLATE/#{TEMPLATE_TAG}"])
+
+            # add registration time, as the template is new
+            body['registration_time'] = Integer(Time.now)
+
+            # update the template with the new body
+            DocumentJSON.instance_method(:update).bind(doc).call(body.to_json)
+
+            # return the new document ID
+            new_id
+        end
+
         # Replaces the raw template contents
         #
         # @param template [String] New template contents, in the form KEY = VAL

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/opennebula/virtual_machine_ext.rb

@@ -267,17 +267,20 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Check backup consistency
                 # --------------------------------------------------------------
-                unless binfo
-                    rc = info
-                    raise rc.message if OpenNebula.is_error?(rc)
+                rc = info
 
-                    binfo = backup_info
+                raise rc.message if OpenNebula.is_error?(rc)
+
+                binfo.merge!(backup_info) do |key, old_val, new_val|
+                    new_val.nil? ? old_val : new_val
                 end
 
                 raise 'No backup information' if binfo.nil?
 
                 raise 'No frequency defined' unless valid?(binfo[:freq])
 
+                raise 'No marketplace defined' unless valid?(binfo[:market])
+
                 return if Time.now.to_i - binfo[:last].to_i < binfo[:freq].to_i
 
                 # --------------------------------------------------------------
@@ -319,19 +322,12 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Cleanup
                 # --------------------------------------------------------------
-                logger.info "Deleting template #{tmp.id}" if logger
-
-                tmp.delete(true)
-
-                binfo[:apps].each do |id|
-                    logger.info "Deleting applicance #{id}" if logger
-
-                    papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
-
-                    papp.delete
-                end if !keep && binfo[:apps]
+                backup_cleanup(keep, logger, binfo, tmp)
             rescue Error, StandardError => e
+                backup_cleanup(keep, logger, binfo, tmp)
+
                 logger.fatal(e.inspect) if logger
+
                 raise
             end
 
@@ -421,9 +417,9 @@ module OpenNebula::VirtualMachineExt
 
             private
 
-            # --------------------------------------------------------------
+            #-------------------------------------------------------------------
             # Check an attribute is defined and valid
-            # --------------------------------------------------------------
+            #-------------------------------------------------------------------
             def valid?(att)
                 return false if att.nil?
 
@@ -454,6 +450,9 @@ module OpenNebula::VirtualMachineExt
                 binfo
             end
 
+            #-------------------------------------------------------------------
+            # Generate backup information string
+            #-------------------------------------------------------------------
             def backup_attr(binfo, ids)
                 'BACKUP=[' \
                 "  MARKETPLACE_APP_IDS = \"#{ids.join(',')}\"," \
@@ -462,6 +461,25 @@ module OpenNebula::VirtualMachineExt
                 "  MARKETPLACE_ID      = \"#{binfo[:market]}\" ]"
             end
 
+            #-------------------------------------------------------------------
+            # Cleanup backup leftovers in case of failure
+            #-------------------------------------------------------------------
+            def backup_cleanup(keep, logger, binfo, template)
+                if template
+                    logger.info "Deleting template #{template.id}" if logger
+
+                    template.delete(true)
+                end
+
+                binfo[:apps].each do |id|
+                    logger.info "Deleting applicance #{id}" if logger
+
+                    papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
+
+                    papp.delete
+                end if !keep && binfo[:apps]
+            end
+
         end
     end
 

data/lib/opennebula.rb

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

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

@@ -36,14 +36,25 @@ end
 
 ENV['LANG'] = 'C'
 
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
 $LOAD_PATH << LIB_LOCATION + '/ruby'

data/lib/vcenter_importer.rb

@@ -496,9 +496,9 @@ module VCenterDriver
         end
 
         #
-        # Create and allocate a Opennebula Object.
+        # Create and allocate a OpenNebula Object.
         #
-        # @param info [String] Info passed to opennebula Core.
+        # @param info [String] Info passed to OpenNebula Core.
         #
         # @return [&block] the allocated object through a block.
         #

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

@@ -33,14 +33,27 @@ module VCenterDriver
         end
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 
@@ -1041,7 +1054,8 @@ module VCenterDriver
             else
                 if snapshots?
                     error = 'Disk metadata not present and snapshots exist. ' \
-                            'OpenNebula cannot manage this VM.'
+                            'Please remove imported VM with "onevm recover ' \
+                            '--delete-db".'
                     raise error
                 end
 
@@ -2401,6 +2415,15 @@ module VCenterDriver
 
         # Attach DISK to VM (hotplug)
         def attach_disk(disk)
+            # Adding a new disk in newer vSphere versions
+            # automatically cleans all system snapshots
+            # https://github.com/OpenNebula/one/issues/5409
+            if snapshots? or one_snapshots?
+              error_message =  'Existing sytem snapshots, cannot change disks. '
+              error_message << 'Please remove all snapshots and try again.'
+              raise error_message
+            end
+
             spec_hash     = {}
             device_change = []
 
@@ -2582,6 +2605,12 @@ module VCenterDriver
         def detach_disk(disk)
             return unless disk.exists?
 
+            if snapshots? or one_snapshots?
+              error_message =  'Existing sytem snapshots, cannot change disks. '
+              error_message << 'Please remove all snapshots and try again.'
+              raise error_message
+            end
+
             spec_hash = {}
             spec_hash[:extraConfig] = [disk.config(:delete)]
             spec_hash[:deviceChange] = [{
@@ -2611,15 +2640,15 @@ module VCenterDriver
             # - The disk is managed by OpenNebula
             detachable= !(one_vm['LCM_STATE'].to_i == 11 && !disk.managed?)
             detachable &&= disk.exists?
-            
+
             return unless detachable
 
             detach_disk(disk)
 
             # Check if we want to keep the non persistent disk
             keep_non_persistent_disks =
-                VCenterDriver::CONFIG[:keep_non_persistent_disks]  
-            
+                VCenterDriver::CONFIG[:keep_non_persistent_disks]
+
             return if keep_non_persistent_disks == true
 
             disk.destroy
@@ -2816,7 +2845,7 @@ module VCenterDriver
             # Convert VM to template in vCenter
             mark_as_template
 
-            # Edit the Opennebula template
+            # Edit the OpenNebula template
             one_client = OpenNebula::Client.new
             template_id = one_item['TEMPLATE/TEMPLATE_ID']
             new_template = OpenNebula::Template.new_with_id(template_id,
@@ -2867,6 +2896,15 @@ module VCenterDriver
             self['rootSnapshot'] && !self['rootSnapshot'].empty?
         end
 
+        def one_snapshots?
+            begin
+                !one_item['TEMPLATE/SNAPSHOT'].nil?
+            rescue StandardError
+                # one_item may not be retrieved if deploy_id hasn't been set
+                false
+            end
+        end
+
         def instantiated_as_persistent?
             begin
                 !one_item['TEMPLATE/CLONING_TEMPLATE_ID'].nil?
@@ -3032,7 +3070,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

@@ -1573,9 +1573,8 @@ module VCenterDriver
             str << "]\n"
 
             if annotation.nil? || annotation.empty?
-                str << 'DESCRIPTION = "vCenter Template \
-                imported by OpenNebula' \
-                    " from Cluster #{ccr_name}\"\n"
+                str << 'DESCRIPTION = "vCenter Template imported by OpenNebula'\
+                       " from Cluster #{ccr_name}\"\n"
             else
                 notes = annotation.gsub('\\', '\\\\').gsub('"', '\\"')
                 str << "DESCRIPTION = \"#{notes}\"\n"
@@ -1659,10 +1658,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 +1694,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

data/lib/vmm_importer.rb

@@ -54,6 +54,14 @@ module VCenterDriver
 
             vc_vm = VCenterDriver::VirtualMachine.new_without_id(@vi_client,
                                                                  vm_ref)
+
+            # Importing Wild VMs with snapshots is not supported
+            # https://github.com/OpenNebula/one/issues/1268
+            if vc_vm.snapshots? && vc_vm.disk_keys.empty?
+                raise 'Disk metadata not present and snapshots exist, '\
+                      'cannot import this VM'
+            end
+
             vname = vc_vm['name']
 
             type = { :object => 'VM', :id => vname }

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.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -117,24 +117,24 @@ files:
 - lib/opennebula.rb
 - lib/vcenter_driver.rb
 - lib/datacenter.rb
-- lib/datastore.rb
-- lib/file_helper.rb
-- lib/host.rb
 - lib/memoize.rb
 - lib/network.rb
 - lib/rest_client.rb
-- lib/vcenter_importer.rb
 - lib/vi_client.rb
 - lib/vi_helper.rb
-- lib/virtual_machine.rb
 - lib/vm_device.rb
 - lib/vm_disk.rb
 - lib/vm_nic.rb
 - lib/vm_helper.rb
 - lib/vm_monitor.rb
 - lib/vm_folder.rb
-- lib/vm_template.rb
 - lib/vmm_importer.rb
+- lib/datastore.rb
+- lib/file_helper.rb
+- lib/host.rb
+- lib/vcenter_importer.rb
+- lib/virtual_machine.rb
+- lib/vm_template.rb
 - lib/nsx_driver.rb
 - lib/distributed_firewall.rb
 - lib/logical_port.rb
@@ -189,13 +189,11 @@ files:
 - lib/opennebula/image.rb
 - lib/opennebula/image_pool.rb
 - lib/opennebula/lockable_ext.rb
-- lib/opennebula/marketplace.rb
 - lib/opennebula/marketplace_pool.rb
 - lib/opennebula/marketplaceapp.rb
 - lib/opennebula/marketplaceapp_ext.rb
 - lib/opennebula/marketplaceapp_pool.rb
 - lib/opennebula/oneflow_client.rb
-- lib/opennebula/pool.rb
 - lib/opennebula/pool_element.rb
 - lib/opennebula/security_group.rb
 - lib/opennebula/security_group_pool.rb
@@ -203,14 +201,11 @@ files:
 - lib/opennebula/template.rb
 - lib/opennebula/template_ext.rb
 - lib/opennebula/template_pool.rb
-- lib/opennebula/user.rb
 - lib/opennebula/user_pool.rb
 - lib/opennebula/utils.rb
 - lib/opennebula/vdc.rb
 - lib/opennebula/vdc_pool.rb
-- lib/opennebula/virtual_machine.rb
 - lib/opennebula/virtual_machine_ext.rb
-- lib/opennebula/virtual_machine_pool.rb
 - lib/opennebula/virtual_network.rb
 - lib/opennebula/virtual_network_pool.rb
 - lib/opennebula/virtual_router.rb
@@ -219,20 +214,25 @@ files:
 - lib/opennebula/vm_group_pool.rb
 - lib/opennebula/vntemplate.rb
 - lib/opennebula/vntemplate_pool.rb
-- lib/opennebula/wait_ext.rb
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
-- lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
+- lib/opennebula/marketplace.rb
+- lib/opennebula/pool.rb
+- lib/opennebula/user.rb
+- lib/opennebula/virtual_machine.rb
+- lib/opennebula/virtual_machine_pool.rb
+- lib/opennebula/wait_ext.rb
+- lib/opennebula/zone.rb
 - lib/opennebula/flow/grammar.rb
 - lib/opennebula/flow/service_pool.rb
-- lib/opennebula/flow/service_template.rb
 - lib/opennebula/flow/service_template_ext.rb
 - lib/opennebula/flow/service_template_pool.rb
 - lib/opennebula/flow/validator.rb
-- lib/opennebula/ldap_auth.rb
+- lib/opennebula/flow/service_template.rb
 - lib/opennebula/ldap_auth_spec.rb
+- lib/opennebula/ldap_auth.rb
 - lib/opennebula/server_cipher_auth.rb
 - lib/opennebula/server_x509_auth.rb
 - lib/opennebula/ssh_auth.rb
@@ -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