opennebula 5.13.80.pre → 5.13.85.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc16996ef3b6218367420d87066688a52ee86042
-  data.tar.gz: dae462f84f7ec7bfed459506c56981be1e27974e
+  metadata.gz: 8a310ceb9e0f7774f113a0c0ad808a4ffeee42c5
+  data.tar.gz: 3024b6d5dbd9fa7c78b2ba1a37dad209a0275945
 SHA512:
-  metadata.gz: d6a40c0cbf0a2125a07d18348d0d13471562d81581c06318126a7d671025bdcf34a30c5228af30bd37014af65329714ada099de91fcde70db29198b2731c0fc8
-  data.tar.gz: 4a53d311862746b7712066d355120306a5b3d4311315dabf24513f5e20dc509acb4254e5d58556090b768f3aa33e89df2311c10127d87c918f7c0befe2b6c8a1
+  metadata.gz: f5c51baccf26fda19df4d7a74a70ac8ce9ea0cc93e4b6242294d89c38b2d00c5effcc4ff1d21f7e72527ee2850b087ca57a72e59349dfa4d10d077561927d74d
+  data.tar.gz: 59a563064db5aad4e3f95370d283b1212b103e0ae092ac356f473be97843659d26ab56d7b4ac2e40aed91ffe5571a37addfa7dd4f47bc813c50dfc6b55b04c40

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.13.80'
+    VERSION = '5.13.85'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/datastore.rb

@@ -653,8 +653,8 @@ module VCenterDriver
 
             wout.close
             size = rout.readlines.select do |l|
-                l.start_with?('Content-Length')
-            end[0].sub('Content-Length: ', '')
+                l.downcase.start_with?('content-length')
+            end[0].downcase.sub('content-length: ', '')
             rout.close
             size.chomp.to_i < 4096 # If <4k, then is a descriptor
         end

data/lib/opennebula.rb

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

data/lib/opennebula/client.rb

@@ -88,7 +88,7 @@ module OpenNebula
         NO_ONE_AUTH_ERROR = "ONE_AUTH file not present"
 
         attr_accessor :one_auth
-        attr_reader   :one_endpoint
+        attr_reader   :one_endpoint, :one_zmq
 
         begin
             require 'xmlparser'
@@ -152,6 +152,14 @@ module OpenNebula
 
             @async = !options[:sync]
 
+            if options[:subscriber_endpoint]
+                @one_zmq = options[:subscriber_endpoint]
+            elsif ENV["ONE_ZMQ"]
+                @one_zmq = ENV["ONE_ZMQ"]
+            else
+                @one_zmq = 'tcp://localhost:2101'
+            end
+
             timeout=nil
             if options[:timeout]
                 timeout = options[:timeout]

data/lib/opennebula/image.rb

@@ -308,6 +308,8 @@ module OpenNebula
         end
 
         def wait_state(state, timeout=120)
+            require 'opennebula/wait_ext'
+
             extend OpenNebula::WaitExt
 
             rc = wait(state, timeout)

data/lib/opennebula/pool.rb

@@ -322,5 +322,7 @@ module OpenNebula
         def is_paginated?
             PAGINATED_POOLS.include?(@pool_name)
         end
+
     end
+
 end

data/lib/opennebula/template_ext.rb

@@ -75,6 +75,17 @@ module OpenNebula::TemplateExt
                         return [image, ids]
                     end
 
+                    i_state = OpenNebula::Image::IMAGE_STATES[
+                        image['STATE'].to_i
+                    ]
+
+                    unless %w[LOCKED READY USED].include?(i_state)
+                        logger.fatal "Wrong image state #{i_state}" if logger
+
+                        rollback(ids)
+                        return [image, ids]
+                    end
+
                     logger.info "Adding disk with image #{image.id}" if logger
 
                     tmpl, main = create_app_template(image, idx)
@@ -209,8 +220,14 @@ module OpenNebula::TemplateExt
             #   - content for VM template
             #-------------------------------------------------------------------
             def create_app_template(image, idx = 0)
-                # Wait until the image is READY to safe copy it to the MP
-                image.wait('READY') if Integer(image['STATE']) != 1
+                i_state = OpenNebula::Image::IMAGE_STATES[image['STATE'].to_i]
+
+                # If the image is used, there is no need to wait until it is
+                # ready because the image is already ready to be copied
+                if i_state != 'USED' && Integer(image['STATE']) != 1
+                    # Wait until the image is READY to safe copy it to the MP
+                    image.wait('READY')
+                end
 
                 # Rename to avoid clashing names
                 app_name = "#{image['NAME']}-#{SecureRandom.hex[0..9]}"

data/lib/opennebula/virtual_machine.rb

@@ -771,6 +771,8 @@ module OpenNebula
         end
 
         def wait_state(state, timeout=120)
+            require 'opennebula/wait_ext'
+
             extend OpenNebula::WaitExt
 
             rc = wait2(state, 'LCM_INIT', timeout)

data/lib/opennebula/virtual_machine_ext.rb

@@ -324,7 +324,7 @@ module OpenNebula::VirtualMachineExt
                 tmp.delete(true)
 
                 binfo[:apps].each do |id|
-                    log "Deleting applicance #{id}" if logger
+                    logger.info "Deleting applicance #{id}" if logger
 
                     papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
 

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

@@ -1961,7 +1961,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 +2107,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

data/lib/vm_template.rb

@@ -602,7 +602,7 @@ module VCenterDriver
         def nic_alias_from_nic(id, nic, nic_index, network_found, vm_object)
             nic_tmp = ''
 
-            nic_alias_index = 1
+            nic_alias_index = 0
             if nic[:ipv4_additionals]
                 nic[:ipv4_additionals].split(',').each do |ipv4_additional|
                     ipv4, ipv6 =
@@ -1014,7 +1014,7 @@ module VCenterDriver
                 # Track allocated networks for rollback
                 allocated_networks = []
 
-                nic_index = 1
+                nic_index = 0
 
                 vc_nics.each do |nic|
                     # Check if the network already exists

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.13.80.pre
+  version: 5.13.85.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri