opennebula 6.0.0.3 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a444d034775d99b9c676a7718063ff71798eb2ee
-  data.tar.gz: aba015a7d6e223011bb9f33fd1a610dcc01b1379
+  metadata.gz: f663dcec1594a07beb54bc3a4065b53818669846
+  data.tar.gz: 63d9ffe94c43fb81d6cc7e2a0563ed6d711ebc48
 SHA512:
-  metadata.gz: 9dad15a530bfa73ffce417c4dc66f8f2118239de7396c7aa1cdae928869f69b994e1dc61a93ab410de9b74511d4a770eac922b07db1d29391758d91fb11b54e6
-  data.tar.gz: e00ba49630acf67ae3fbcc1c715a7164ede4b6aec81fa059ecbe6536f8d90c7477ece5c3e73a9e5a1aafc26508729e9fb390ecfef43815e93f1042f6594a1ca9
+  metadata.gz: 905fbdea52975558d07f8720c64c5f37365672d487a1bb334c94e0e4ea5026be94468c3320b667c2d7acc6f31f312e0e58b951cbf136bf45ebfc1d4efaa7e857
+  data.tar.gz: ddb7dadb1c1d2df3454b11a4c7f91385049ee2b134de1d75c0c27b7e59b554b2f9db5ca6135e85a9d0e8ff3b0e0565f3f4e34dd121830c151a1f468347187ad6

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.0.0.3'
+    VERSION = '6.0.1'
 
     # #########################################################################
     # 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?(one_host, args, vc_network_hash, network_type)
+        def exclude_network?(vc_network, one_host, args, vc_network_hash)
             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,6 +514,12 @@ 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
@@ -527,7 +533,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
 
@@ -537,7 +543,7 @@ module VCenterDriver
         end
 
         # Proccess each network
-        def process_network(params, networks_type, hosts_list, host_list_object)
+        def process_network(params)
             vc_network = params[:vc_network]
             vcenter_instance_name = params[:vcenter_instance_name]
             vcenter_uuid = params[:vcenter_uuid]
@@ -571,31 +577,23 @@ module VCenterDriver
             opts = {}
 
             # Add network type to network hash
-            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_type = \
+                VCenterDriver::Network.get_network_type(
+                    vc_network,
+                    vc_network_name
+                )
             network[vc_network_ref][:network_type] = network_type
             network[vc_network_ref][:type] = network_type
 
             # Determine if the network must be excluded
             network[vc_network_ref][:excluded] = exclude_network?(
+                vc_network,
                 one_host,
                 args,
-                vc_network_hash,
-                network_type
+                vc_network_hash
             )
 
-            if network[vc_network_ref][:excluded] == true
-                return [nil, networks_type, hosts_list, host_list_object]
-            end
+            return if network[vc_network_ref][:excluded] == true
 
             if full_process
                 case network[vc_network_ref][:network_type]
@@ -653,50 +651,31 @@ module VCenterDriver
             vc_hosts = vc_network.host
             vc_hosts.each do |vc_host|
                 # Get vCenter Cluster
-                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
+                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)
                 # Check if network is excluded from each host
                 next if exclude_network?(
+                    vc_network,
                     one_host,
                     args,
-                    vc_network_hash,
-                    network_type
+                    vc_network_hash
                 )
 
                 # Insert vCenter cluster ref
-                network[vc_network_ref][:clusters][:refs] <<
-                    vc_cluster[:vc_cluster_ref]
-
+                network[vc_network_ref][:clusters][:refs] << 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[:vc_cluster_name]
-                opts[:dc_name] = vc_cluster[:vc_cluster_name]
+                network[vc_network_ref][:clusters][:names] << vc_cluster_name
+                opts[:dc_name] = vc_cluster_name
             end
 
             # Remove duplicate entries
@@ -727,7 +706,7 @@ module VCenterDriver
                     network[vc_network_ref]['name']
             end
 
-            [network, networks_type, hosts_list, host_list_object]
+            network
         end
 
         # rubocop:disable Style/GlobalVars
@@ -744,15 +723,13 @@ 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|
@@ -774,20 +751,7 @@ module VCenterDriver
                 params[:one_host]= one_host
                 params[:args] = args
 
-                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
+                network = process_network(params)
 
                 networks.merge!(network) unless network.nil?
             end

data/lib/distributed_firewall.rb

@@ -29,27 +29,14 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-# 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
+    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)
-        ensure
-            $VERBOSE = verb
         end
     end
-end
-# %%RUBYGEMS_SETUP_END%%
-# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/network.rb

@@ -534,13 +534,7 @@ module VCenterDriver
                     params[:one_host] = one_host
                     params[:args] = {}
 
-                    selected, _networks_type, _hosts_list, _clusters_list =
-                        dc_folder.process_network(
-                            params,
-                            {},
-                            {},
-                            {}
-                        )
+                    selected = dc_folder.process_network(params)
 
                     selected = selected[index]
 

data/lib/nsx_client.rb

@@ -29,27 +29,14 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-# 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
+    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)
-        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,27 +29,14 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-# 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
+    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)
-        ensure
-            $VERBOSE = verb
         end
     end
-end
-# %%RUBYGEMS_SETUP_END%%
-# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsx_driver.rb

@@ -36,27 +36,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     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,27 +33,14 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-# 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
+    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)
-        ensure
-            $VERBOSE = verb
         end
     end
-end
-# %%RUBYGEMS_SETUP_END%%
-# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsxt_client.rb

@@ -29,27 +29,14 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-# 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
+    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)
-        ensure
-            $VERBOSE = verb
         end
     end
-end
-# %%RUBYGEMS_SETUP_END%%
-# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsxv_client.rb

@@ -29,27 +29,14 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-# 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
+    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)
-        ensure
-            $VERBOSE = verb
         end
     end
-end
-# %%RUBYGEMS_SETUP_END%%
-# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/opennebula/flow/service_template.rb

@@ -361,8 +361,8 @@ module OpenNebula
                 # exceeds the limit
                 new_name = "#{template.name}-#{name}"
 
-                if new_name.size > 119
-                    new_name = "#{template.name[0..(119 - name.size)]}-#{name}"
+                if new_name.size > 128
+                    new_name = "#{template.name[0..(126 - name.size)]}-#{name}"
                 end
 
                 rc = template.clone(new_name, recursive)

data/lib/opennebula/virtual_machine_ext.rb

@@ -267,20 +267,17 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Check backup consistency
                 # --------------------------------------------------------------
-                rc = info
-
-                raise rc.message if OpenNebula.is_error?(rc)
+                unless binfo
+                    rc = 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
+                    binfo = backup_info
                 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
 
                 # --------------------------------------------------------------
@@ -322,12 +319,19 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Cleanup
                 # --------------------------------------------------------------
-                backup_cleanup(keep, logger, binfo, tmp)
-            rescue Error, StandardError => e
-                backup_cleanup(keep, logger, binfo, tmp)
+                logger.info "Deleting template #{tmp.id}" if logger
 
-                logger.fatal(e.inspect) 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]
+            rescue Error, StandardError => e
+                logger.fatal(e.inspect) if logger
                 raise
             end
 
@@ -417,9 +421,9 @@ module OpenNebula::VirtualMachineExt
 
             private
 
-            #-------------------------------------------------------------------
+            # --------------------------------------------------------------
             # Check an attribute is defined and valid
-            #-------------------------------------------------------------------
+            # --------------------------------------------------------------
             def valid?(att)
                 return false if att.nil?
 
@@ -450,9 +454,6 @@ module OpenNebula::VirtualMachineExt
                 binfo
             end
 
-            #-------------------------------------------------------------------
-            # Generate backup information string
-            #-------------------------------------------------------------------
             def backup_attr(binfo, ids)
                 'BACKUP=[' \
                 "  MARKETPLACE_APP_IDS = \"#{ids.join(',')}\"," \
@@ -461,25 +462,6 @@ 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 = '6.0.0.3'
+    VERSION = '6.0.1'
 end

data/lib/vcenter_driver.rb

@@ -36,25 +36,14 @@ 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/ }
-
-        # 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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     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/virtual_machine.rb

@@ -33,27 +33,14 @@ module VCenterDriver
         end
     end
 
-# 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
+    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)
-        ensure
-            $VERBOSE = verb
         end
     end
-end
-# %%RUBYGEMS_SETUP_END%%
-# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 
@@ -1054,8 +1041,7 @@ end
             else
                 if snapshots?
                     error = 'Disk metadata not present and snapshots exist. ' \
-                            'Please remove imported VM with "onevm recover ' \
-                            '--delete-db".'
+                            'OpenNebula cannot manage this VM.'
                     raise error
                 end
 
@@ -2415,15 +2401,6 @@ end
 
         # 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 = []
 
@@ -2605,12 +2582,6 @@ end
         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] = [{
@@ -2640,15 +2611,15 @@ end
             # - 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
@@ -2845,7 +2816,7 @@ end
             # 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,
@@ -2896,15 +2867,6 @@ end
             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?

data/lib/vm_template.rb

@@ -1573,8 +1573,9 @@ 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"

data/lib/vmm_importer.rb

@@ -54,14 +54,6 @@ 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: 6.0.0.3
+  version: 6.0.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-04-28 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/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/vmm_importer.rb
 - lib/nsx_driver.rb
 - lib/distributed_firewall.rb
 - lib/logical_port.rb
@@ -189,11 +189,13 @@ 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
@@ -201,11 +203,14 @@ 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
@@ -214,25 +219,20 @@ 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_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/flow/service_template.rb
-- lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/ldap_auth.rb
+- lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/server_cipher_auth.rb
 - lib/opennebula/server_x509_auth.rb
 - lib/opennebula/ssh_auth.rb