opennebula 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368b25e39516bc7f4cc4eb9a5d458596e044ff4a
-  data.tar.gz: 47fd8dc77024e585e2a0c37f5f04ac58e2151fad
+  metadata.gz: bef9b2183a0d6a9255fc9a4304f876b2bb46d7d3
+  data.tar.gz: ef4f6c545dd5d962ff6053c823e2c6933aa3057b
 SHA512:
-  metadata.gz: 2f928dc1d7ec80058752a9efdb421e9d3fffff0dec5a3e2733c40bf660eb5bd8fa000e2725ec14afb74c6fd26ab2bf5c54072f80e29eb2bc0d948feefe6be5c2
-  data.tar.gz: fb37b947efe168a8feaee8dd9e9031c23316665845d00fa6f7146f81aab93e412ed8e5a322de080c22ce79dfc41486fca6a20355e3d09ad149d66048db61ccb5
+  metadata.gz: 829850fa4829aacb804c0df3a585dbc6db72430c64f7d86be705a7b02a593a92f867a0e3d42fed0b58b7f6d978b6dbf775aefd7ef36151ccfd40c6169c3517e3
+  data.tar.gz: bd4f6776d73e0091545cc8afacd64a8bcb447a4b23604ed57cfd617bd1b0d9fac8f2594caba70daaf5342283200c1fccce20ede5687b80e5bbed8f82601ca343

data/lib/cloud/CloudClient.rb

@@ -50,7 +50,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.6.0'
+    VERSION = '5.6.1'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula.rb

@@ -69,5 +69,5 @@ require 'opennebula/vm_group_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.6.0'
+    VERSION = '5.6.1'
 end

data/lib/opennebula/ldap_auth.rb

@@ -131,7 +131,7 @@ class OpenNebula::LdapAuth
     end
 
     def find_user(name)
-        filter = Net::LDAP::Filter.eq(@options[:user_field], escape(name))
+        filter = Net::LDAP::Filter.equals(@options[:user_field], name)
 
         result = @ldap.search(
             :base       => @options[:base],
@@ -194,7 +194,7 @@ class OpenNebula::LdapAuth
                 end
             end
         else
-            filter = "(#{@options[:group_field]}=#{@user[@options[:user_group_field]].first})"
+            filter = Net::LDAP::Filter.equals(@options[:group_field], @user[@options[:user_group_field]].first)
             @ldap.search(
                 :base       => @options[:base],
                 :attributes => [ "dn" ],
@@ -209,23 +209,4 @@ class OpenNebula::LdapAuth
         groups.delete(false)
         groups.compact.uniq
     end
-
-private
-
-    # The escapes code has been copied from <net-ldap>/lib/net/ldap/filter.rb
-    FILTER_ESCAPES = {
-      "\0" => '00',
-      '*'  => '2A',
-      '('  => '28',
-      ')'  => '29',
-      '\\' => '5C',
-      '?'  => '3F',
-      '='  => '3D'
-    }
-
-    FILTER_ESCAPE_RE = Regexp.new("[" + FILTER_ESCAPES.keys.map { |e| Regexp.escape(e) }.join + "]")
-
-    def escape(string)
-      string.gsub(FILTER_ESCAPE_RE) { |char| "\\" + FILTER_ESCAPES[char] }
-    end
 end

data/lib/opennebula/pool.rb

@@ -24,6 +24,9 @@ module OpenNebula
         include Enumerable
         alias_method :each_with_xpath, :each
 
+        attr_reader :pool_name
+        attr_reader :element_name
+
         PAGINATED_POOLS=%w{VM_POOL IMAGE_POOL TEMPLATE_POOL VN_POOL
                            DOCUMENT_POOL SECGROUP_POOL}
 
@@ -132,12 +135,13 @@ module OpenNebula
         # xml_method:: _String_ the name of the XML-RPC method
         # args:: _Array_ with additional arguments for the info call
         # [return] nil in case of success or an Error object
-        def xmlrpc_info(xml_method,*args)
-            rc = @client.call(xml_method,*args)
+        def xmlrpc_info(xml_method, *args)
+            rc = @client.call(xml_method, *args)
 
             if !OpenNebula.is_error?(rc)
-                initialize_xml(rc,@pool_name)
-                rc   = nil
+                initialize_xml(rc, @pool_name)
+
+                rc = nil
             end
 
             return rc
@@ -179,14 +183,17 @@ module OpenNebula
 
             if OpenNebula.pool_page_size && allow_paginated &&
                     ( ( size && size >= 2 ) || !size )
+
                 size = OpenNebula.pool_page_size if !size
-                hash=info_paginated(size)
+                hash = info_paginated(size)
 
                 return hash if OpenNebula.is_error?(hash)
+
                 { @pool_name => { @element_name => hash } }
             else
-                rc=info
+                rc = info
                 return rc if OpenNebula.is_error?(rc)
+
                 to_hash
             end
         end
@@ -195,14 +202,15 @@ module OpenNebula
         #
         # size:: _Integer_ size of each page
         def info_paginated(size)
-            array=Array.new
-            current=0
+            array   = Array.new
+            current = 0
 
-            parser=ParsePoolSax.new(@pool_name, @element_name)
+            parser = ParsePoolSax.new(@pool_name, @element_name)
 
             while true
-                a=@client.call("#{@pool_name.delete('_').downcase}.info",
-                    @user_id, current, -size, -1)
+                a = @client.call("#{@pool_name.delete('_').downcase}.info",
+                        @user_id, current, -size, -1)
+
                 return a if OpenNebula.is_error?(a)
 
                 a_array=parser.parse(a)
@@ -214,9 +222,35 @@ module OpenNebula
             end
 
             array.compact!
-            array=nil if array.length == 0
+            array = nil if array.length == 0
 
             array
         end
+
+        # Gets a hash from a info page from pool
+        # size:: nil => default page size
+        #        > 0 => page size    
+        # current first element of the page
+        # hash:: return page as a hash
+        def get_page(size, current)
+            rc = nil
+
+            if PAGINATED_POOLS.include?(@pool_name) 
+                size = OpenNebula.pool_page_size if (!size || size == 0)
+                rc   = @client.call("#{@pool_name.delete('_').downcase}.info",
+                            @user_id, current, -size, -1)
+
+                initialize_xml(rc, @pool_name)
+            else
+                rc = info
+            end
+
+            return rc 
+        end
+
+        # Return true if pool is paginated
+        def is_paginated?
+            PAGINATED_POOLS.include?(@pool_name) 
+        end
     end
 end

data/lib/opennebula/xml_element.rb

@@ -430,30 +430,5 @@ module OpenNebula
             return attr
         end
     end
-
-    # The XMLUtilsPool module provides an abstraction of the underlying
-    # XML parser engine. It provides XML-related methods for the Pools
-    class XMLPool < XMLElement
-
-        def initialize(xml=nil)
-            super(xml)
-        end
-
-        #Executes the given block for each element of the Pool
-        #block:: _Block_
-        def each_element(block)
-            if NOKOGIRI
-                @xml.xpath(
-                    "#{@element_name}").each {|pelem|
-                    block.call self.factory(pelem)
-                }
-            else
-                @xml.elements.each(
-                    "#{@element_name}") {|pelem|
-                    block.call self.factory(pelem)
-                }
-            end
-        end
-    end
-
 end
+

data/lib/vcenter_driver.rb

@@ -18,25 +18,25 @@
 # Set up the environment for the driver                                        #
 # ---------------------------------------------------------------------------- #
 
-ONE_LOCATION = ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
+ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION)
 
 if !ONE_LOCATION
-   BIN_LOCATION = "/usr/bin" if !defined?(BIN_LOCATION)
-   LIB_LOCATION = "/usr/lib/one" if !defined?(LIB_LOCATION)
-   ETC_LOCATION = "/etc/one/" if !defined?(ETC_LOCATION)
-   VAR_LOCATION = "/var/lib/one" if !defined?(VAR_LOCATION)
+   BIN_LOCATION = '/usr/bin'     unless defined?(BIN_LOCATION)
+   LIB_LOCATION = '/usr/lib/one' unless defined?(LIB_LOCATION)
+   ETC_LOCATION = '/etc/one/'    unless defined?(ETC_LOCATION)
+   VAR_LOCATION = '/var/lib/one' unless defined?(VAR_LOCATION)
 else
-   BIN_LOCATION = ONE_LOCATION + "/bin"  if !defined?(BIN_LOCATION)
-   LIB_LOCATION = ONE_LOCATION + "/lib"  if !defined?(LIB_LOCATION)
-   ETC_LOCATION = ONE_LOCATION + "/etc/" if !defined?(ETC_LOCATION)
-   VAR_LOCATION = ONE_LOCATION + "/var/" if !defined?(VAR_LOCATION)
+   BIN_LOCATION = ONE_LOCATION + '/bin'  unless defined?(BIN_LOCATION)
+   LIB_LOCATION = ONE_LOCATION + '/lib'  unless defined?(LIB_LOCATION)
+   ETC_LOCATION = ONE_LOCATION + '/etc/' unless defined?(ETC_LOCATION)
+   VAR_LOCATION = ONE_LOCATION + '/var/' unless defined?(VAR_LOCATION)
 end
 
 ENV['LANG'] = 'C'
 
-$: << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
-$: << LIB_LOCATION + '/ruby'
-$: << LIB_LOCATION + '/ruby/vcenter_driver'
+$LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
+$LOAD_PATH << LIB_LOCATION + '/ruby'
+$LOAD_PATH << LIB_LOCATION + '/ruby/vcenter_driver'
 
 require 'rbvmomi'
 require 'yaml'
@@ -70,13 +70,13 @@ def error_message(message)
     error_str << message
     error_str << "\nERROR MESSAGE ------>8--"
 
-    return error_str
+    error_str
 end
 
 def check_valid(parameter, label)
     if parameter.nil? || parameter.empty?
         STDERR.puts error_message("The parameter '#{label}' is required for this action.")
-        exit -1
+        exit(-1)
     end
 end
 
@@ -85,11 +85,11 @@ def check_item(item, target_class)
         item.name if CHECK_REFS
         if target_class
             if !item.instance_of?(target_class)
-                raise "Expecting type 'RbVmomi::VIM::#{target_class}'. " <<
+                raise "Expecting type 'RbVmomi::VIM::#{target_class}'. " \
                         "Got '#{item.class} instead."
             end
         end
     rescue RbVmomi::Fault => e
-        raise "Reference \"#{item._ref}\" error. The reference does not exist"
+        raise "Reference \"#{item._ref}\" error [#{e.message}]. The reference does not exist"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-15 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri