opennebula 5.11.80.pre → 5.12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2d83b29c5331f619c3b5aa1213b82f3e078663
-  data.tar.gz: bc41b7188c837d471cec3644d6a8aa780b60b4bd
+  metadata.gz: 9b77dc0532f6cfb629081a6de695a1255d5d0afd
+  data.tar.gz: 7568d30195b4a031c263300279f3c98602bf3fe0
 SHA512:
-  metadata.gz: c20c193b8023d56b1a5c3d44a1468a0d9c90bc0d4f234f451a6e8f9a1444d0bfc6fc2e85d40763cf82fac95ab833167c03b8f212b81e5feb9a991057e81c9d82
-  data.tar.gz: 6b57f21dad920d7fe9d159d2cc46d9e55f50b8fbf8063790d2fd48ebbd75d6aade3051f7d0902e40764f95d632b938a2de2ac1058b490c0b290b4d5520fbb6cc
+  metadata.gz: 8fb01acb555f25d1e3e0578c321c054fcb83f7a6f25b841defa07ba633a6540547dac67f96c7270b271336164f2db04f2aac4104eb9eac018bd71ef47c50dc80
+  data.tar.gz: 265caa4291b12f82446d82d74aea931796451babba552bad80c3b8fe05e0d4a088a0080cf9ae7c7530927201dc4cce6dc1caf3004d848408dbece181dd986dd5

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

@@ -97,7 +97,7 @@ class OpenNebulaDriver < ActionManager
         command = action_command_line(aname, params, options[:script_name])
 
         if action_is_local?(aname)
-            stdin = Base64.strict_encode64(options[:stdin])
+            stdin = Base64.strict_encode64(options[:stdin].to_s)
             execution = LocalCommand.run(command,
                                          log_method(id),
                                          stdin,

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.11.80'
+    VERSION = '5.12.0.1'
 
     # #########################################################################
     # 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.80'
+    VERSION = '5.12.0.1'
 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|
@@ -239,7 +247,8 @@ module OpenNebula
                 vi_client = VCenterDriver::VIClient.new_from_host(self["ID"])
                 importer  = VCenterDriver::VmmImporter.new(@client, vi_client)
 
-                return importer.import({wild: wild, template: template, one_item: vm, host: self['ID']})
+                return importer.import({wild: wild, template: template,
+                                        one_item: vm, host: self['ID']})
             else
                 rc = vm.allocate(template)
 

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

@@ -64,9 +64,8 @@ class OpenNebula::LdapAuth
             }
         end
 
-        if !@options[:rfc2307bis]
-            @options[:attributes] << @options[:user_field]
-        end
+        # always fetch user_filed to compare whitespace diff
+        @options[:attributes] << @options[:user_field]
 
         # fetch the user group field only if we need that
         if @options[:group] or !@options[:rfc2307bis]
@@ -143,15 +142,20 @@ class OpenNebula::LdapAuth
 
         if result && result.first
             @user = result.first
-            [@user.dn, @user[@options[:user_group_field]]]
+
+            [@user.dn,
+             @user[@options[:user_field]].first,
+             @user[@options[:user_group_field]]]
         else
             result=@ldap.search(:base => name)
 
             if result && result.first
                 @user = result.first
-                [name, @user[@options[:user_group_field]]]
+                [name,
+                 @user[@options[:user_field]].first,
+                 @user[@options[:user_group_field]]]
             else
-                [nil, nil]
+                [nil, nil, nil]
             end
         end
     end
@@ -218,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/marketplaceapp.rb

@@ -192,8 +192,9 @@ module OpenNebula
             options[:vmtemplate_name] = name unless options[:vmtemplate_name]
 
             tmpl << "\n"
-            tmpl << "NAME=\"" << name << "\"\n"
-            tmpl << "FROM_APP=\"" << self['ID'] << "\"\n"
+            tmpl << 'NAME="' << name << "\"\n"
+            tmpl << 'FROM_APP="' << self['ID'] << "\"\n"
+            tmpl << 'URL_ARGS="' << options[:url_args] << "\"\n" if options[:url_args]
 
             case type_str
             when 'IMAGE'

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.80.pre
+  version: 5.12.0.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -88,10 +88,8 @@ files:
 - lib/opennebula/image_pool.rb
 - lib/opennebula/marketplace.rb
 - lib/opennebula/marketplace_pool.rb
-- lib/opennebula/marketplaceapp.rb
 - lib/opennebula/marketplaceapp_pool.rb
 - lib/opennebula/oneflow_client.rb
-- lib/opennebula/pool.rb
 - lib/opennebula/pool_element.rb
 - lib/opennebula/security_group.rb
 - lib/opennebula/security_group_pool.rb
@@ -103,7 +101,6 @@ files:
 - lib/opennebula/utils.rb
 - lib/opennebula/vdc.rb
 - lib/opennebula/vdc_pool.rb
-- lib/opennebula/virtual_machine.rb
 - lib/opennebula/virtual_machine_pool.rb
 - lib/opennebula/virtual_network.rb
 - lib/opennebula/virtual_network_pool.rb
@@ -118,6 +115,9 @@ files:
 - lib/opennebula/xml_utils.rb
 - lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
+- lib/opennebula/marketplaceapp.rb
+- lib/opennebula/pool.rb
+- lib/opennebula/virtual_machine.rb
 - lib/opennebula/ldap_auth.rb
 - lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/server_cipher_auth.rb
@@ -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