opennebula 6.0.0.1 → 6.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9aa7355cf72de3df70da8d7fceb82907f97396
-  data.tar.gz: 749eef5d47ae22112fb3c8c1a1dc1d7f313ab5a7
+  metadata.gz: f022212cfa3668cae363f0592a9423a77f3f0a63
+  data.tar.gz: f1aa5e2a2d9c2f7d06f8c63defc79b004fdd21a8
 SHA512:
-  metadata.gz: ba3c4cfcf52af7756cdc67ccefb827e773bf60c5b38a2b8ba32e1dc232582edbb57e1e45994168052e0cc572f14b9d70c4504cb7ea82796122df5f6564609d56
-  data.tar.gz: 40ecec9f0e8f2cd10ea50241e97a0554eb6e14204feaf0780879990373415d5eaaceea254efb7cb09b112ffb464ebc7324a17fb980d6306edfef92816c29a745
+  metadata.gz: eb414c6b219cdbcd4217d69219ba161273a1e7ba802fd4c94936a83aba776d2f781661fa684372e77c86fd18d707823cc7f172bc23f2b794dcbb8984cab63b93
+  data.tar.gz: 9d6c490f638e47dcb1f4aa558853806a92b835a9c0217a1bb2a6c84207bd375b4406e13702a4423d733ee4f8294d796a50ecd40045a2f5ca66c046d8eb1a2ede

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.0.0.1'
+    VERSION = '6.0.0.2'
 
     # #########################################################################
     # 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]
@@ -577,23 +571,31 @@ module VCenterDriver
             opts = {}
 
             # 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
 
             # 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]
@@ -651,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
@@ -706,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
@@ -723,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|
@@ -751,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

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

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

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

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 > 128
-                    new_name = "#{template.name[0..(126 - name.size)]}-#{name}"
+                if new_name.size > 119
+                    new_name = "#{template.name[0..(119 - name.size)]}-#{name}"
                 end
 
                 rc = template.clone(new_name, recursive)

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/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/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?

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"

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: 6.0.0.1
+  version: 6.0.0.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -227,10 +227,10 @@ files:
 - 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.rb
 - lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/server_cipher_auth.rb