opennebula 5.13.80.pre → 6.0.0.2

data/lib/opennebula/wait_ext.rb

@@ -14,19 +14,117 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-require 'ffi-rzmq'
 
 require 'opennebula/host'
 require 'opennebula/image'
 require 'opennebula/virtual_machine'
 
+module OpenNebula::WaitExtEvent
+    def wait_event(ctx, event, timeout)
+        subscriber = ctx.socket(ZMQ::SUB)
+
+        # Create subscriber
+        key        = ''
+        content    = ''
+
+        subscriber.setsockopt(ZMQ::RCVTIMEO, timeout * 1000)
+        subscriber.setsockopt(ZMQ::SUBSCRIBE, event)
+        subscriber.connect(@client.one_zmq)
+
+        rc = subscriber.recv_string(key)
+        rc = subscriber.recv_string(content) if rc != -1
+
+        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
+
+            rco = info
+
+            return false if OpenNebula.is_error?(rco)
+
+            in_state = wfun[:in_state].call(self, sstr1, sstr2)
+
+            recvs += 1
+        end
+
+        in_state
+    end
+
+end
+
+module OpenNebula::WaitExtPolling
+    def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
+        wfun = OpenNebula::WaitExt::WAIT[self.class]
+
+        stime    = 5
+        recvs    = 0
+        cycles   = timeout / stime
+        in_state = false
+
+        loop do
+            rco = info
+
+            return false if OpenNebula.is_error?(rco)
+
+            in_state = wfun[:in_state].call(self, sstr1, sstr2)
+
+            recvs += 1
+
+            break if in_state || recvs >= cycles
+
+            sleep stime
+        end
+
+        in_state
+    end
+
+end
+
 # Module to decorate Wait classes with the following methods:
 #   - Wait
 #
 # rubocop:disable Style/ClassAndModuleChildren
 module OpenNebula::WaitExt
-
-    # Wait classes and the name published in ZMQ
+    # Wait classes and the name published in ZMQ/STATE
     WAIT = {
         OpenNebula::Host  => {
             :event => lambda {|o, s1, _s2|
@@ -78,7 +176,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'])
@@ -105,93 +203,30 @@ module OpenNebula::WaitExt
         wait?(obj)
 
         class << obj
+          begin
+            require 'ffi-rzmq'
 
-            # Wait until the element reaches some specific state
-            # It waits until the state can be found in ZMQ event message
-            #
-            # @param state_str [String]  State name to wait
-            # @param timeout   [Integer] Number of seconds to timeout event recv
-            # @param cycles    [Integer] Number of recv cycles. After each one
-            #                            object status is checked in OpenNebula.
-            #                            Use -1 (default) to wait forever.
-            def wait(state_str, timeout = 60, cycles = -1)
-                wait2(state_str, '', timeout, cycles)
-            end
-
-            def wait_event(ctx, event, timeout)
-                subscriber = ctx.socket(ZMQ::SUB)
-
-                # Create subscriber
-                key        = ''
-                content    = ''
-
-                subscriber.setsockopt(ZMQ::RCVTIMEO, timeout * 1000)
-                subscriber.setsockopt(ZMQ::SUBSCRIBE, event)
-                subscriber.connect('tcp://localhost:2101')
-
-                rc = subscriber.recv_string(key)
-                rc = subscriber.recv_string(content) if rc != -1
-
-                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 = 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
-
-                    rco = info
-
-                    return false if OpenNebula.is_error?(rco)
-
-                    in_state = wfun[:in_state].call(self, sstr1, sstr2)
-
-                    recvs += 1
-                end
-
-                in_state
-            end
-
+            include OpenNebula::WaitExtEvent
+          rescue LoadError
+            include OpenNebula::WaitExtPolling
+          end
         end
 
         super
     end
 
+    # Wait until the element reaches some specific state
+    # It waits until the state can be found in ZMQ event message
+    #
+    # @param state_str [String]  State name to wait
+    # @param timeout   [Integer] Number of seconds to timeout event recv
+    # @param cycles    [Integer] Number of recv cycles. After each one
+    #                            object status is checked in OpenNebula.
+    #                            Use -1 (default) to wait forever.
+    def wait(state_str, timeout = 60, cycles = -1)
+        wait2(state_str, '', timeout, cycles)
+    end
+
     # Check if object has the method wait or not
     #
     # @param obj [Object or Class] Object to check class

data/lib/scripts_common.rb

@@ -14,6 +14,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+require 'shellwords'
+
 module OpenNebula
 
     # Generic log function
@@ -76,6 +78,7 @@ module OpenNebula
     # If a second parameter is present it is used as the error message when
     # the command fails
     def self.exec_and_log(command, message=nil, allowed_return_code=0)
+        command = command.shellsplit.shelljoin # escape
         output=`#{command} 2>&1 1>/dev/null`
         code=$?.exitstatus
 

data/lib/vcenter_driver.rb

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

data/lib/vcenter_importer.rb

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

data/lib/vi_helper.rb

@@ -231,10 +231,11 @@ module VCenterDriver
             @ref_hash[attribute][refkey]
         end
 
+        require 'addressable'
         def self.find_image_by(att, the_class, path, ds_id, pool = nil)
             pool = one_pool(the_class, false) if pool.nil?
             pool.find do |e|
-                e[att] == path &&
+                e[att] == Addressable::URI.escape(path) &&
                     e['DATASTORE_ID'] == ds_id
             end
         end

data/lib/virtual_machine.rb

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