opennebula 3.9.90.rc → 4.0.0

data/lib/opennebula.rb

@@ -54,5 +54,5 @@ require 'opennebula/system'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '3.9.90'
+    VERSION = '4.0.0'
 end

data/lib/opennebula/acl.rb

@@ -69,7 +69,7 @@ module OpenNebula
 
         # Constructor
         #
-        # @param xml [String] must be an xml built with {#build_xml}
+        # @param xml [String] must be an xml built with {.build_xml}
         # @param client [Client] represents an XML-RPC connection
         def initialize(xml, client)
             super(xml,client)
@@ -79,7 +79,6 @@ module OpenNebula
         # specified.
         #
         # @param pe_id [Integer] rule ID
-        # @param client [Client] represents an XML-RPC connection
         #
         # @return [String] an empty XML representation
         def self.build_xml(pe_id=nil)

data/lib/opennebula/host.rb

@@ -33,7 +33,7 @@ module OpenNebula
             :monitoring => "host.monitoring"
         }
 
-        HOST_STATES=%w{INIT MONITORING_MONITORED MONITORED ERROR DISABLED MONITORING_ERROR}
+        HOST_STATES=%w{INIT MONITORING_MONITORED MONITORED ERROR DISABLED MONITORING_ERROR MONITORING_INIT MONITORING_DISABLED}
 
         SHORT_HOST_STATES={
             "INIT"                 => "init",
@@ -42,6 +42,8 @@ module OpenNebula
             "ERROR"                => "err",
             "DISABLED"             => "off",
             "MONITORING_ERROR"     => "retry",
+            "MONITORING_INIT"      => "init",
+            "MONITORING_DISABLED"  => "off"
         }
 
         # Creates a Host description with just its identifier
@@ -85,7 +87,7 @@ module OpenNebula
         # @param hostname [String] Name of the new Host.
         # @param im [String] Name of the im_driver (information/monitoring)
         # @param vmm [String] Name of the vmm_driver (hypervisor)
-        # @param tm [String] Name of the vnm_driver (networking)
+        # @param vnm [String] Name of the vnm_driver (networking)
         # @param cluster_id [String] Id of the cluster
         #
         # @return [Integer, OpenNebula::Error] the new ID in case of

data/lib/opennebula/ldap_auth.rb

@@ -29,6 +29,7 @@ class OpenNebula::LdapAuth
             :base => nil,
             :auth_method => :simple,
             :user_field => 'cn',
+            :user_group_field => 'dn',
             :group_field => 'member'
         }.merge(options)
 
@@ -56,24 +57,25 @@ class OpenNebula::LdapAuth
                 :filter => "#{@options[:user_field]}=#{name}")
 
             if result && result.first
-                result.first.dn
+                [result.first.dn, result.first[@options[:user_group_field]]]
             else
                 result=@ldap.search(:base => name)
 
                 if result && result.first
-                    name
+                    [name, result.first[@options[:user_group_field]]]
                 else
-                    nil
+                    [nil, nil]
                 end
             end
         rescue
-            nil
+            [nil, nil]
         end
     end
 
     def is_in_group?(user, group)
-        result=@ldap.search(:base => group,
-                            :filter => "(#{@options[:group_field]}=#{user})")
+        result=@ldap.search(
+                    :base   => group,
+                    :filter => "(#{@options[:group_field]}=#{user.first})")
 
         if result && result.first
             true

data/lib/opennebula/ldap_auth_spec.rb

@@ -29,17 +29,21 @@ describe LdapAuth do
     end
 
     it 'should find user dn' do
-        name=@ldap.find_user('user01')
+        name,group_name=@ldap.find_user('user01')
         name.should=='cn=user01,dc=localdomain'
+        group_name.should=='cn=user01,dc=localdomain'
 
-        name=@ldap.find_user('user02')
+        name,group_name=@ldap.find_user('user02')
         name.should=='cn=user02,dc=localdomain'
+        group_name.should=='cn=user02,dc=localdomain'
 
-        name=@ldap.find_user('user03')
+        name,group_name=@ldap.find_user('user03')
         name.should==nil
+        group_name.should==nil
 
         name=@ldap.find_user('cn=user01,dc=localdomain')
         name.should=='cn=user01,dc=localdomain'
+        group_name.should=='cn=user01,dc=localdomain'
     end
 
     it 'should tell if a user is in a group' do

data/lib/opennebula/pool_element.rb

@@ -62,7 +62,6 @@ module OpenNebula
         #
         # @param [String] xml_method the name of the XML-RPC method
         # @param [String] root_element Base XML element name
-        # @param [Array] args additional arguments
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
@@ -243,9 +242,8 @@ module OpenNebula
     # @param [String] root_elem Root for each individual PoolElement
     # @param [String] timestamp_elem Name of the XML element with the last
     #   monitorization timestamp
-    # @param [Integer] Id of the object to process
+    # @param [Integer] oid Id of the object to process
     # @param [Array<String>] xpath_expressions Elements to retrieve.
-    # @param args arguemnts for the xml_method call
     #
     # @return [Hash<String, Array<Array<int>>, OpenNebula::Error] Hash with
     #   the requested xpath expressions, and an Array of [timestamp, value].

data/lib/opennebula/ssh_auth.rb

@@ -37,29 +37,33 @@ class OpenNebula::SshAuth
         @private_key = nil
         @public_key  = nil
 
+        # Initialize the private key
         if options[:private_key]
             begin
                 @private_key = File.read(options[:private_key])
             rescue Exception => e
                 raise "Cannot read #{options[:private_key]}"
             end
+
+            @private_key_rsa = OpenSSL::PKey::RSA.new(@private_key)
         end
 
+        # Initialize the public key
         if options[:public_key]
             @public_key = options[:public_key]
         elsif @private_key != nil
             # Init ssh keys using private key. public key is extracted in a
             # format compatible with openssl. The public key does not contain
-            # "---- BEGIN/END RSA PUBLIC KEY ----" and is in a single line
-            key = OpenSSL::PKey::RSA.new(@private_key)
-
-            @public_key = key.public_key.to_pem.split("\n")
-            @public_key = @public_key.reject {|l| l.match(/RSA PUBLIC KEY/) }.join('')
+            # "---- BEGIN/END PUBLIC KEY ----" and is in a single line
+            @public_key = @private_key_rsa.public_key.to_pem.split("\n")
+            @public_key = @public_key.reject {|l| l.match(/PUBLIC KEY/) }.join('')
         end
 
         if @private_key.nil? && @public_key.nil?
             raise "You have to define at least one of the keys"
         end
+
+        @public_key_rsa = OpenSSL::PKey::RSA.new(Base64::decode64(@public_key))
     end
 
     # Creates the login file for ssh authentication at ~/.one/one_ssh.
@@ -89,7 +93,7 @@ class OpenNebula::SshAuth
         file.close
 
         File.chmod(0600,LOGIN_PATH)
-        
+
         secret_crypted
     end
 
@@ -127,13 +131,11 @@ class OpenNebula::SshAuth
     # Encrypts data with the private key of the user and returns
     # base 64 encoded output in a single line
     def encrypt(data)
-        rsa=OpenSSL::PKey::RSA.new(@private_key)
-        Base64::encode64(rsa.private_encrypt(data)).gsub!(/\n/, '').strip
+        Base64::encode64(@private_key_rsa.private_encrypt(data)).gsub!(/\n/, '').strip
     end
 
     # Decrypts base 64 encoded data with pub_key (public key)
     def decrypt(data)
-        rsa=OpenSSL::PKey::RSA.new(Base64::decode64(@public_key))
-        rsa.public_decrypt(Base64::decode64(data))
+        @public_key_rsa.public_decrypt(Base64::decode64(data))
     end
 end

data/lib/opennebula/virtual_machine.rb

@@ -306,7 +306,7 @@ module OpenNebula
 
         # Detaches a NIC from a running VM
         #
-        # @param disk_id [Integer] Id of the NIC to be detached
+        # @param nic_id [Integer] Id of the NIC to be detached
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def nic_detach(nic_id)

metadata

@@ -1,54 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: opennebula
-version: !ruby/object:Gem::Version
-  version: 3.9.90.rc
-  prerelease: 7
+version: !ruby/object:Gem::Version 
+  hash: 63
+  prerelease: 
+  segments: 
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
-authors:
+authors: 
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Libraries needed to talk to OpenNebula
 email: contact@opennebula.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/opennebula.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
@@ -92,27 +97,36 @@ files:
 - LICENSE
 homepage: http://opennebula.org
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OpenNebula Client API
 test_files: []
-has_rdoc: 
+