opennebula 6.0.0.1 → 6.0.3

data/lib/scripts_common.rb

@@ -45,16 +45,7 @@ module OpenNebula
 
     # This function is used to pass error message to the mad
     def self.error_message(message)
-        STDERR.puts format_error_message(message)
-    end
-
-    #This function formats an error message for OpenNebula
-    def self.format_error_message(message)
-        error_str = "ERROR MESSAGE --8<------\n"
-        error_str << message
-        error_str << "\nERROR MESSAGE ------>8--"
-
-        return error_str
+        STDERR.puts message
     end
 
     def self.is_disk?(arg)

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'
@@ -122,19 +133,10 @@ end
 # Helper functions                                                             #
 # ---------------------------------------------------------------------------- #
 
-def error_message(message)
-    error_str = "ERROR MESSAGE --8<------\n"
-    error_str << message
-    error_str << "\nERROR MESSAGE ------>8--"
-
-    error_str
-end
-
 def check_valid(parameter, label)
     return unless parameter.nil? || parameter.empty?
 
-    STDERR.puts error_message("The parameter '#{label}'\
-                               is required for this action.")
+    STDERR.puts "The parameter '#{label}' is required for this action."
     exit(-1)
 end
 

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? || one_snapshots?
+                error_msg =  'Existing system snapshots, cannot change disks. '
+                error_msg << 'Please remove all snapshots and try again.'
+                raise error_message
+            end
+
             spec_hash     = {}
             device_change = []
 
@@ -2582,6 +2605,13 @@ module VCenterDriver
         def detach_disk(disk)
             return unless disk.exists?
 
+            if snapshots? || one_snapshots?
+                error_message =  'Existing system snapshots, cannot change '
+                error_message << 'disks . Please remove all snapshots and '
+                error_message << 'try again.'
+                raise error_message
+            end
+
             spec_hash = {}
             spec_hash[:extraConfig] = [disk.config(:delete)]
             spec_hash[:deviceChange] = [{
@@ -2611,15 +2641,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 +2846,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 +2897,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 +3071,8 @@ module VCenterDriver
         # Create a snapshot for the VM
         def create_snapshot(snap_id, snap_name)
             memory_dumps = true
-            memory_dumps = CONFIG[:memory_dumps] unless CONFIG[:memory_dumps].nil?
+            memory_dumps = CONFIG[:memory_dumps] \
+                                     unless CONFIG[:memory_dumps].nil?
 
             snapshot_hash = {
                 :name        => snap_id,

data/lib/vm_monitor.rb

@@ -175,8 +175,6 @@ module VirtualMachineMonitor
         @monitor[:diskwrbytes] = previous_diskwrbytes +
                                  (write_kbpersec * 1024 * refresh_rate).to_i
     end
-    # rubocop:enable Naming/VariableName
-    # rubocop:enable Style/FormatStringToken
 
     #  Generates a OpenNebula IM Driver valid string with the monitor info
     def info

data/lib/vm_template.rb

@@ -550,6 +550,10 @@ module VCenterDriver
                     net.ipConfig.ipAddress.each do |ip_config|
                         ip = IPAddr.new(ip_config.ipAddress)
 
+                        if ip.ipv6? && get_ipv6_prefix(ip.to_s, 10) == 'fe80'
+                            next
+                        end
+
                         if force
                             ipv4 = ip.to_s if ip.ipv4?
                             ipv6 = ip.to_s if ip.ipv6?
@@ -1573,9 +1577,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.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -126,7 +126,6 @@ files:
 - 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
@@ -135,6 +134,7 @@ files:
 - lib/vm_folder.rb
 - lib/vm_template.rb
 - lib/vmm_importer.rb
+- lib/virtual_machine.rb
 - lib/nsx_driver.rb
 - lib/distributed_firewall.rb
 - lib/logical_port.rb
@@ -164,8 +164,8 @@ files:
 - lib/DriverExecHelper.rb
 - lib/scripts_common.rb
 - lib/models.rb
-- lib/models/role.rb
 - lib/models/service.rb
+- lib/models/role.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
 - lib/opennebula/client.rb
@@ -208,7 +208,6 @@ files:
 - 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
@@ -224,6 +223,7 @@ files:
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
 - lib/opennebula/zone_pool.rb
+- lib/opennebula/virtual_machine.rb
 - lib/opennebula/zone.rb
 - lib/opennebula/flow/grammar.rb
 - lib/opennebula/flow/service_pool.rb