opennebula 6.0.1 → 6.1.90.pre

data/lib/opennebula/wait_ext.rb

@@ -14,107 +14,118 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
 require 'opennebula/host'
 require 'opennebula/image'
 require 'opennebula/virtual_machine'
 
-module OpenNebula::WaitExtEvent
-    def wait_event(ctx, event, timeout)
-        subscriber = ctx.socket(ZMQ::SUB)
+module OpenNebula
 
-        # Create subscriber
-        key        = ''
-        content    = ''
+    # Module to wait OpenNebula objects events using ZMQ
+    module WaitExtEvent
 
-        subscriber.setsockopt(ZMQ::RCVTIMEO, timeout * 1000)
-        subscriber.setsockopt(ZMQ::SUBSCRIBE, event)
-        subscriber.connect(@client.one_zmq)
+        def wait_event(ctx, event, timeout)
+            subscriber = ctx.socket(ZMQ::SUB)
 
-        rc = subscriber.recv_string(key)
-        rc = subscriber.recv_string(content) if rc != -1
+            # Create subscriber
+            key        = ''
+            content    = ''
 
-        return if ZMQ::Util.errno == ZMQ::EAGAIN || rc == -1
+            subscriber.setsockopt(ZMQ::RCVTIMEO, timeout * 1000)
+            subscriber.setsockopt(ZMQ::SUBSCRIBE, event)
+            subscriber.connect(@client.one_zmq)
 
-        content
-    ensure
-        subscriber.setsockopt(ZMQ::UNSUBSCRIBE, event)
-        subscriber.close
-    end
+            rc = subscriber.recv_string(key)
+            rc = subscriber.recv_string(content) if rc != -1
 
-    def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
-        wfun = OpenNebula::WaitExt::WAIT[self.class]
-
-        # Start with a timeout of 2 seconds, to wait until the first
-        # info.
-        #
-        # The timeout is increased later, to avoid multiple info calls.
-        c_timeout = 2
-        recvs     = 0
-        in_state  = false
-
-        # Subscribe with timeout seconds
-        #
-        # Subscribe string:
-        #
-        #   EVENT STATE element_name/state_str//self.ID
-        #
-        #   - element_name: is the element name to find in the message
-        #   - self.ID: returns element ID to find in the message
-        ctx = ZMQ::Context.new(1)
-
-        until in_state || (cycles != -1 && recvs >= cycles)
-            content = wait_event(ctx,
-                                 wfun[:event].call(self, sstr1, sstr2),
-                                 c_timeout)
-
-            if content && !content.empty?
-                in_state = wfun[:in_state_e].call(sstr1, sstr2, content)
-
-                break if in_state
-            end
+            return if ZMQ::Util.errno == ZMQ::EAGAIN || rc == -1
+
+            content
+        ensure
+            subscriber.setsockopt(ZMQ::UNSUBSCRIBE, event)
+            subscriber.close
+        end
+
+        def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
+            wfun = OpenNebula::WaitExt::WAIT[self.class]
+
+            # Start with a timeout of 2 seconds, to wait until the first
+            # info.
+            #
+            # The timeout is increased later, to avoid multiple info calls.
+            c_timeout = 2
+            recvs     = 0
+            in_state  = false
+
+            # Subscribe with timeout seconds
+            #
+            # Subscribe string:
+            #
+            #   EVENT STATE element_name/state_str//self.ID
+            #
+            #   - element_name: is the element name to find in the message
+            #   - self.ID: returns element ID to find in the message
+            ctx = ZMQ::Context.new(1)
+
+            until in_state || (cycles != -1 && recvs >= cycles)
+                content = wait_event(ctx,
+                                     wfun[:event].call(self, sstr1, sstr2),
+                                     c_timeout)
+
+                if content && !content.empty?
+                    in_state = wfun[:in_state_e].call(sstr1, sstr2, content)
+
+                    break if in_state
+                end
 
-            c_timeout *= 10
-            c_timeout  = timeout if c_timeout > timeout
+                c_timeout *= 10
+                c_timeout  = timeout if c_timeout > timeout
 
-            rco = info
+                rco = info
 
-            return false if OpenNebula.is_error?(rco)
+                return false if OpenNebula.is_error?(rco)
 
-            in_state = wfun[:in_state].call(self, sstr1, sstr2)
+                in_state = wfun[:in_state].call(self, sstr1, sstr2)
 
-            recvs += 1
+                recvs += 1
+            end
+
+            in_state
         end
 
-        in_state
     end
 
 end
 
-module OpenNebula::WaitExtPolling
-    def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
-        wfun = OpenNebula::WaitExt::WAIT[self.class]
+module OpenNebula
+
+    # Module to wait OpenNebula objects events using polling
+    module WaitExtPolling
+
+        def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
+            wfun = OpenNebula::WaitExt::WAIT[self.class]
+
+            stime    = 5
+            recvs    = 0
+            cycles   = timeout / stime if cycles == -1
+            in_state = false
 
-        stime    = 5
-        recvs    = 0
-        cycles   = timeout / stime
-        in_state = false
+            loop do
+                rco = info
 
-        loop do
-            rco = info
+                return false if OpenNebula.is_error?(rco)
 
-            return false if OpenNebula.is_error?(rco)
+                in_state = wfun[:in_state].call(self, sstr1, sstr2)
 
-            in_state = wfun[:in_state].call(self, sstr1, sstr2)
+                recvs += 1
 
-            recvs += 1
+                break if in_state || recvs >= cycles
 
-            break if in_state || recvs >= cycles
+                sleep stime
+            end
 
-            sleep stime
+            in_state
         end
 
-        in_state
     end
 
 end
@@ -124,6 +135,7 @@ end
 #
 # rubocop:disable Style/ClassAndModuleChildren
 module OpenNebula::WaitExt
+
     # Wait classes and the name published in ZMQ/STATE
     WAIT = {
         OpenNebula::Host  => {
@@ -176,7 +188,7 @@ module OpenNebula::WaitExt
             },
 
             :in_state => lambda {|o, s1, s2|
-              obj_s1 = Integer(o['STATE'])
+                obj_s1 = Integer(o['STATE'])
                 inx_s1 = OpenNebula::VirtualMachine::VM_STATE.index(s1)
 
                 obj_s2 = Integer(o['LCM_STATE'])
@@ -203,13 +215,15 @@ module OpenNebula::WaitExt
         wait?(obj)
 
         class << obj
-          begin
-            require 'ffi-rzmq'
 
-            include OpenNebula::WaitExtEvent
-          rescue LoadError
-            include OpenNebula::WaitExtPolling
-          end
+            begin
+                require 'ffi-rzmq'
+
+                include OpenNebula::WaitExtEvent
+            rescue LoadError
+                include OpenNebula::WaitExtPolling
+            end
+
         end
 
         super

data/lib/opennebula/zone.rb

@@ -31,7 +31,15 @@ module OpenNebula
             :delete         => "zone.delete",
             :addserver      => "zone.addserver",
             :delserver      => "zone.delserver",
-            :resetserver    => "zone.resetserver"
+            :resetserver    => "zone.resetserver",
+            :enable         => "zone.enable"
+        }
+
+        ZONE_STATES=%w{ENABLED DISABLED}
+
+        SHORT_ZONE_STATES={
+            "ENABLED"              => "on",
+            "DISABLED"             => "off"
         }
 
         # Creates a Zone description with just its identifier
@@ -179,6 +187,37 @@ module OpenNebula
             return call(ZONE_METHODS[:resetserver], @pe_id, server_id)
         end
 
+        # Enable zone
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def enable()
+            return call(ZONE_METHODS[:enable], @pe_id, true)
+        end
+
+        # Disable zone, only readonly commands can be executed in disabled
+        # state
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def disable()
+            return call(ZONE_METHODS[:enable], @pe_id, false)
+        end
+
+        #######################################################################
+        # Helpers to get Zone information
+        #######################################################################
+
+        # Returns the state of the Zone (numeric value)
+        def state
+            self['STATE'].to_i
+        end
+
+        # Returns the state of the Zone (string value)
+        def state_str
+            ZONE_STATES[state]
+        end
+
         private
 
         # These methods adds elements to the given node of the zone

data/lib/opennebula.rb

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

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

@@ -369,9 +369,11 @@ module VCenterDriver
                 error_msg = "\nError: #{e.message}\n"
                 error_msg << "#{e.backtrace}\n" \
                               if VCenterDriver::CONFIG[:debug_information]
-                STDOUT.puts error_msg
+                STDERR.puts error_msg
+                raise_error = true
             ensure
                 vi_client.close_connection if vi_client
+                raise if raise_error
             end
         end
 
@@ -496,9 +498,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
 
@@ -1076,14 +1090,22 @@ module VCenterDriver
         #
         # @return [Hash ("String" => self.Nic)] Model representation of nics
         def info_nics
+            keep_mac_on_imported = false
+            keep_mac_on_imported = CONFIG[:keep_mac_on_imported] \
+                                     unless CONFIG[:keep_mac_on_imported].nil?
+
             @nics = { :macs => {} }
 
             vc_nics  = vcenter_nics_list
             one_nics = one_nics_get
 
             one_nics.each do |one_nic|
-                index  = one_nic['NIC_ID']
-                mac    = one_nic['MAC']
+                index = one_nic['NIC_ID']
+                if keep_mac_on_imported && one_nic['MAC_IMPORTED']
+                    mac = one_nic['MAC_IMPORTED']
+                else
+                    mac = one_nic['MAC']
+                end
                 vc_dev = query_nic(mac, vc_nics)
 
                 if vc_dev
@@ -2401,6 +2423,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 sytem snapshots, cannot change disks. '
+                error_msg << 'Please remove all snapshots and try again.'
+                raise error_message
+            end
+
             spec_hash     = {}
             device_change = []
 
@@ -2582,6 +2613,12 @@ module VCenterDriver
         def detach_disk(disk)
             return unless disk.exists?
 
+            if snapshots? || 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 +2648,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 +2853,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 +2904,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 +3078,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

@@ -40,7 +40,7 @@ module VCenterDriver
         def lock
             return unless @locking
 
-            @locking_file = File.open('/tmp/vcenter-importer-lock', 'w')
+            @locking_file = File.open('/var/tmp/vcenter-importer-lock', 'w')
             @locking_file.flock(File::LOCK_EX)
         end
 
@@ -50,9 +50,9 @@ module VCenterDriver
 
             @locking_file.close
 
-            return unless File.exist?('/tmp/vcenter-importer-lock')
+            return unless File.exist?('/var/tmp/vcenter-importer-lock')
 
-            File.delete('/tmp/vcenter-importer-lock')
+            File.delete('/var/tmp/vcenter-importer-lock')
         end
 
         def vm?
@@ -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?
@@ -729,6 +733,9 @@ module VCenterDriver
                                                  nic, true)
                 network_found.info
 
+                if nic[:mac]
+                    nic_tmp << "MAC_IMPORTED=\"#{nic[:mac]}\",\n"
+                end
                 # This is the existing nic info
                 if nic[:mac] && ipv4.empty? && ipv6.empty?
                     nic_tmp << "MAC=\"#{nic[:mac]}\",\n"
@@ -1573,9 +1580,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.1
+  version: 6.1.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -223,8 +223,8 @@ files:
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
-- lib/opennebula/zone_pool.rb
 - lib/opennebula/zone.rb
+- lib/opennebula/zone_pool.rb
 - lib/opennebula/flow/grammar.rb
 - lib/opennebula/flow/service_pool.rb
 - lib/opennebula/flow/service_template.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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1