opennebula 5.11.85.pre → 5.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7c0463980bb481a313fecfe5d21893587dfddcb
-  data.tar.gz: f73c74b057353fa3bd81e33271f51ad7093fb2e2
+  metadata.gz: 96499142488225ad551ee8d92cf799f87253bd6b
+  data.tar.gz: ea7c24712ca84f090d36bd7c8cdd94b3a6df1235
 SHA512:
-  metadata.gz: f940626641eea5bb9d66aa1b5aa45a89b9c6e870173104308a30e53c52eed979777978acb23dd0094b746f7dbca26a59b4dd3a4fba1a0b930ec54969852e2c5e
-  data.tar.gz: 17f00e8678bca2183a3f897ff3705220cc5d8bc8ba5b36955fc85f081b0aeac11bfda3abeba6f0da68bd0539da7222205bffa3b4e2043ef723bae706a2e0b65c
+  metadata.gz: c29d00cfc89b6ce30941f87d5d19f6e30024532b2bba6f6942872a1d016f05a4589b0d2a3a08922fbaa89c9533b325142e8afd9ab348a545a6b0c1ac1621c10d
+  data.tar.gz: 4b3d3c880829e69d53c8f75d2e843c2e1a7d2f292bdb779df5851dba0c29d09863ec945193595938009b6d2c6dd8d9c2566914cbf237f32aed7f44e33a862f6a

data/lib/CommandManager.rb

@@ -179,13 +179,23 @@ private
             i.write stdin_data
             i.close
 
-            out = [out_reader.value, err_reader.value, t.value]
+            # blocking wait for process termination
+            t.value
+
+            # if reader threads are not dead yet, kill them
+            [out_reader, err_reader].each do |reader|
+                next unless reader.status
+
+                reader.join(0.1)
+                reader.kill
+            end
 
             mutex.lock
             terminator.kill
             raise terminator_e if terminator_e
 
-            out
+            # return values
+            [out_reader.value, err_reader.value, t.value]
         }
     end
 

data/lib/cloud/CloudClient.rb

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

data/lib/opennebula.rb

@@ -74,5 +74,5 @@ require 'opennebula/hook_log'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.11.85'
+    VERSION = '5.12.2'
 end

data/lib/opennebula/document_pool_json.rb

@@ -41,7 +41,7 @@ module OpenNebula
 
                 hash['DOCUMENT_POOL']['DOCUMENT'].each { |doc|
                     body = doc['TEMPLATE']["#{TEMPLATE_TAG}"]
-                    if body
+                    if body && !body.empty?
                         b_hash = JSON.parse(body)
                         doc['TEMPLATE']["#{TEMPLATE_TAG}"] = b_hash
                     end
@@ -55,4 +55,4 @@ module OpenNebula
             end
         end
     end
-end
+end

data/lib/opennebula/host.rb

@@ -125,6 +125,14 @@ module OpenNebula
             set_status("OFFLINE")
         end
 
+        #Resets monitoring forcing an update
+        def forceupdate()
+            rc = offline
+            return rc if OpenNebula.is_error?(rc)
+
+            enable
+        end
+
         def flush(action)
             self.disable
 
@@ -134,7 +142,7 @@ module OpenNebula
             rc = vm_pool.info
             if OpenNebula.is_error?(rc)
                  puts rc.message
-                 exit -1
+                 exit(-1)
             end
 
             vm_pool.each do |vm|

data/lib/opennebula/host_pool.rb

@@ -99,9 +99,16 @@ module OpenNebula
 
         # Retrieves the monitoring data for all the Hosts in the pool, in XML
         #
+        # @param [Integer] num Optional Retrieve monitor records in the last num
+        #   seconds. 0 just the last record, -1 or nil all records
+        #
         # @return [String] VM monitoring data, in XML
-        def monitoring_xml()
-            return @client.call(HOST_POOL_METHODS[:monitoring])
+        def monitoring_xml(num = nil)
+            return @client.call(HOST_POOL_METHODS[:monitoring]) if num.nil?
+
+            @client.call(HOST_POOL_METHODS[:monitoring], num.to_i)
         end
+
     end
+
 end

data/lib/opennebula/ldap_auth.rb

@@ -222,3 +222,68 @@ class OpenNebula::LdapAuth
         groups.compact.uniq
     end
 end
+
+
+# ---------------------------------------------------------------------------- #
+# Helper functions to parse ldap_auth.conf server entries
+# ---------------------------------------------------------------------------- #
+def to_array(name)
+    if name.is_a? Array
+        name
+    elsif name.is_a? Hash
+        if name.keys.size == 1
+            [name.values].flatten
+        else
+            STDERR.puts "invalid group configuration: #{name}"
+            exit(-1)
+        end
+    else
+        [name]
+    end
+end
+
+def get_server_order(opts, user)
+    order = []
+
+    if opts[:order] && opts[:match_user_regex]
+        STDERR.puts ":order and :match_user_regex are mutually exclusive"
+        exit(-1)
+    end
+
+    if opts[:order]
+        if opts[:order].class != Array
+            STDERR.puts ":order value malformed, must be an Array"
+            exit(-1)
+        end
+
+        opts[:order].each do |name|
+            order << to_array(name)
+        end
+
+    elsif opts[:match_user_regex]
+        if opts[:match_user_regex].class != Hash || opts[:match_user_regex].empty?
+            STDERR.puts ":match_user_regex value malformed, must be an Hash"
+            exit(-1)
+        end
+
+        opts[:match_user_regex].each do |regex, server|
+            if m = user.match(/#{regex}/i)
+
+                # update user with the capture
+                user = m[1] if m[1]
+
+                order << to_array(server)
+            end
+        end
+
+        if order.empty?
+            STDERR.puts "User #{user} does not mach any regex"
+        end
+
+    else
+        STDERR.puts "missing either :order or :match_user_regex in configuration"
+        exit(-1)
+    end
+
+    return [order, user]
+end

data/lib/opennebula/virtual_machine.rb

@@ -122,6 +122,7 @@ module OpenNebula
             DISK_RESIZE
             DISK_RESIZE_POWEROFF
             DISK_RESIZE_UNDEPLOYED
+            HOTPLUG_NIC_POWEROFF
         }
 
         SHORT_VM_STATES={
@@ -202,7 +203,8 @@ module OpenNebula
             "PROLOG_MIGRATE_UNKNOWN_FAILURE" => "fail",
             "DISK_RESIZE"            => "drsz",
             "DISK_RESIZE_POWEROFF"   => "drsz",
-            "DISK_RESIZE_UNDEPLOYED" => "drsz"
+            "DISK_RESIZE_UNDEPLOYED" => "drsz",
+            "HOTPLUG_NIC_POWEROFF"   => "hotp"
         }
 
         HISTORY_ACTION=%w{none migrate live-migrate shutdown shutdown-hard

data/lib/opennebula/virtual_machine_pool.rb

@@ -199,10 +199,13 @@ module OpenNebula
         #
         # @param [Integer] filter_flag Optional filter flag to retrieve all or
         #   part of the Pool. Possible values: INFO_ALL, INFO_GROUP, INFO_MINE.
-        #
+        # @param [Integer] num Optional Retrieve monitor records in the last num
+        #   seconds. 0 just the last record, -1 or nil all records
         # @return [String] VM monitoring data, in XML
-        def monitoring_xml(filter_flag=INFO_ALL)
-            return @client.call(VM_POOL_METHODS[:monitoring], filter_flag)
+        def monitoring_xml(filter_flag=INFO_ALL, num=nil)
+            return @client.call(VM_POOL_METHODS[:monitoring], filter_flag) if num.nil?
+
+            @client.call(VM_POOL_METHODS[:monitoring], filter_flag, num.to_i)
         end
 
         # Processes all the history records, and stores the monthly cost for

data/lib/vcenter_driver.rb

@@ -37,8 +37,9 @@ end
 ENV['LANG'] = 'C'
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
@@ -81,7 +82,7 @@ require 'resolv'
 # vCenter Library                                                              #
 # ---------------------------------------------------------------------------- #
 
-require 'vcenter_importer.rb'
+require 'vcenter_importer'
 require 'memoize'
 require 'vi_client'
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.11.85.pre
+  version: 5.12.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -142,9 +142,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1