opennebula 5.11.90.pre → 5.12.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f5101f43db2d5926a91cf47d329b3195267d3c
-  data.tar.gz: 57d61ad0c4d687eadeb7521dc9e7a68c6214ec38
+  metadata.gz: 63d746c40cae457796346c6815881dfc3f7f69d7
+  data.tar.gz: 2351ef174d044ff75844a5abb074ec40fdeaf1fc
 SHA512:
-  metadata.gz: f3c263ed781184aad101a456e83909bb0c6c149e3b0e931d4560772bbae13e9888cd4e866e886548eccff3b89b8067e0ec2882052ff930e94da88e4d2c00d657
-  data.tar.gz: f79a5e7d90929e2a1fef95e615971d41a82d558597ccac349be2fb7c8ae81b2bcae46ceee57eb5059987ab993fed492887ecec772606d23243a37e81411a7665
+  metadata.gz: 626825395aceb4b95018653d1935b5317fd464f79e041317c70cd4269ed31a0e3a50831c426d6782e73f43b751ea92a5c74c6f59834943b87c6c95fa874c4ad2
+  data.tar.gz: bc6990eeddf1efc9ccf5f69ad95786a07ea14f6cc69cb5cb4f9feeb1eff4a14c065853e43c41914d5080f6449ec2702a913074010b100f6cf60ba6a37ee7e168

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.90'
+    VERSION = '5.12.0.4'
 
     # #########################################################################
     # 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.90'
+    VERSION = '5.12.0.4'
 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,8 +99,8 @@ module OpenNebula
 
         # Retrieves the monitoring data for all the Hosts in the pool, in XML
         #
-        # @param [Integer] num Optional number of monitoring records to be
-        #   retrieved. If nill all records are retrieved
+        # @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(num = nil)

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_pool.rb

@@ -23,14 +23,14 @@ module OpenNebula
         # Constants and Class attribute accessors
         #######################################################################
 
-
         VM_POOL_METHODS = {
-            :info               => "vmpool.info",
-            :info_extended      => "vmpool.infoextended",
-            :monitoring         => "vmpool.monitoring",
-            :accounting         => "vmpool.accounting",
-            :showback           => "vmpool.showback",
-            :calculate_showback => "vmpool.calculateshowback"
+            :info               => 'vmpool.info',
+            :info_extended      => 'vmpool.infoextended',
+            :info_set           => 'vmpool.infoset',
+            :monitoring         => 'vmpool.monitoring',
+            :accounting         => 'vmpool.accounting',
+            :showback           => 'vmpool.showback',
+            :calculate_showback => 'vmpool.calculateshowback'
         }
 
         # Constants for info queries (include/RequestManagerPoolInfoFilter.h)
@@ -41,7 +41,6 @@ module OpenNebula
         # Class constructor & Pool Methods
         #######################################################################
 
-
         # +client+ a Client object that represents a XML-RPC connection
         # +user_id+ is to refer to a Pool with VirtualMachines from that user
         def initialize(client, user_id=0)
@@ -102,21 +101,21 @@ module OpenNebula
         end
 
         # Define info methods shortcuts for different filters
-        # info_all() 
+        # info_all()
         # info_all!()
-        # info_all_extended 
+        # info_all_extended
         # info_all_extended!()
-        # info_mine() 
+        # info_mine()
         # info_mine!()
-        # info_mine_extended 
+        # info_mine_extended
         # info_mine_extended!()
-        # info_group() 
+        # info_group()
         # info_group!()
-        # info_group_extended 
+        # info_group_extended
         # info_group_extended!()
-        # info_primary_group() 
+        # info_primary_group()
         # info_primary_group!()
-        # info_primary_group_extended 
+        # info_primary_group_extended
         # info_primary_group_extended!()
         %w[mine all group primary_group].each do |ifilter|
             const_name = "OpenNebula::Pool::INFO_#{ifilter.upcase}"
@@ -160,6 +159,14 @@ module OpenNebula
                         default_args[:query])
         end
 
+        # Retrieves the set of VMs especified in vm_ids
+        #
+        # @param [String] comma separated list of vm ids.
+        # @param [Boolean] if true extended body is retrieved.
+        #
+        def info_set(vm_ids, extended)
+            xmlrpc_info(VM_POOL_METHODS[:info_set], vm_ids, extended)
+        end
 
         # Retrieves the monitoring data for all the VMs in the pool
         #
@@ -199,8 +206,8 @@ 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 number of monitoring records to be
-        #   retrieved. If nill all records are retrieved
+        # @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, num=nil)
             return @client.call(VM_POOL_METHODS[:monitoring], filter_flag) if num.nil?

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'
@@ -57,6 +58,7 @@ class VCenterConf < Hash
     }
 
     def initialize
+        super
         replace(DEFAULT_CONFIGURATION)
         begin
             vcenterrc_path = "#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"
@@ -81,7 +83,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.90.pre
+  version: 5.12.0.4
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -65,6 +65,30 @@ files:
 - lib/CommandManager.rb
 - lib/ActionManager.rb
 - lib/DriverExecHelper.rb
+- lib/opennebula/security_group_pool.rb
+- lib/opennebula/system.rb
+- lib/opennebula/template.rb
+- lib/opennebula/template_pool.rb
+- lib/opennebula/user.rb
+- lib/opennebula/user_pool.rb
+- 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
+- lib/opennebula/virtual_router.rb
+- lib/opennebula/virtual_router_pool.rb
+- lib/opennebula/vm_group.rb
+- lib/opennebula/vm_group_pool.rb
+- lib/opennebula/vntemplate.rb
+- lib/opennebula/vntemplate_pool.rb
+- lib/opennebula/xml_element.rb
+- lib/opennebula/xml_pool.rb
+- lib/opennebula/xml_utils.rb
+- lib/opennebula/zone.rb
+- lib/opennebula/zone_pool.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
 - lib/opennebula/client.rb
@@ -94,32 +118,8 @@ files:
 - lib/opennebula/pool.rb
 - lib/opennebula/pool_element.rb
 - lib/opennebula/security_group.rb
-- lib/opennebula/security_group_pool.rb
-- lib/opennebula/system.rb
-- lib/opennebula/template.rb
-- lib/opennebula/template_pool.rb
-- lib/opennebula/user.rb
-- lib/opennebula/user_pool.rb
-- 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
-- lib/opennebula/virtual_router.rb
-- lib/opennebula/virtual_router_pool.rb
-- lib/opennebula/vm_group.rb
-- lib/opennebula/vm_group_pool.rb
-- lib/opennebula/vntemplate.rb
-- lib/opennebula/vntemplate_pool.rb
-- lib/opennebula/xml_element.rb
-- lib/opennebula/xml_pool.rb
-- lib/opennebula/xml_utils.rb
-- lib/opennebula/zone.rb
-- lib/opennebula/zone_pool.rb
-- lib/opennebula/ldap_auth.rb
 - lib/opennebula/ldap_auth_spec.rb
+- lib/opennebula/ldap_auth.rb
 - lib/opennebula/server_cipher_auth.rb
 - lib/opennebula/server_x509_auth.rb
 - lib/opennebula/ssh_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