opennebula 4.9.80.beta → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42545275d236ad905c7717b1927435e9a488a90f
-  data.tar.gz: 816f67281352c3d865624c23192837ebb5f37fa6
+  metadata.gz: 82ab43ef0a7087ed43b6c4d8ffe865a2a2ceacbd
+  data.tar.gz: 78dba1712d3497bc69c477d9148d30682267f408
 SHA512:
-  metadata.gz: c4ae1c7e5d8165a72102eb2aaca7c483b7cf14b5fba21a7397c8fe0ccf429b492b729e259bdf33aa4087b7f9a7f08a2ff0dbbbbabd8a8c63996f47a45e3a5491
-  data.tar.gz: ba6fecc6ab0d1aa568196d10e23a6c4e8ef9940f62934ebb77405c44eeed2093b5d7ce9204cacbd4ae9d0d7539a5a7b8542460ed9d7bfd19cefe5d407da1557f
+  metadata.gz: d577db87ccac6fbbfe545d812599feaf9dee940f1881085640b9cbbab211095cf52762a554cd3d27640dc8bfb31632f5ed2f21a32fbb1da0154c0f8698882fed
+  data.tar.gz: 5a4e4f547a0c25213ac3d0af35d4aa6ab3540b71e0ac37f3ca5879c79ccff99771f657fddbad6425f1e745990e26683c1989edded4215385eac371bc82402f93

data/lib/opennebula.rb

@@ -56,5 +56,5 @@ require 'opennebula/system'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '4.9.80'
+    VERSION = '4.10.0'
 end

data/lib/opennebula/client.rb

@@ -17,6 +17,7 @@
 require 'xmlrpc/client'
 require 'bigdecimal'
 require 'stringio'
+require 'openssl'
 
 
 module OpenNebula
@@ -105,6 +106,14 @@ module OpenNebula
         #   defaults to 30
         # @option params [String] :http_proxy HTTP proxy string used for
         #  connecting to the endpoint; defaults to no proxy
+        # @option params [Boolean] :sync Use only one http connection for
+        #  all calls. It should not be used for multithreaded programs.
+        #  It's the only mode that can be used with :cert_dir and
+        #  :disable_ssl_verify
+        # @option params [String] :cert_dir Extra directory where to import
+        #  trusted issuer certificates. Use with :sync = true
+        # @option params [String] :disable_ssl_verify Disable SSL certificate
+        #  verification. Use only for testing and with :sync = true
         #
         # @return [OpenNebula::Client]
         def initialize(secret=nil, endpoint=nil, options={})
@@ -135,6 +144,8 @@ module OpenNebula
                 @one_endpoint = "http://localhost:2633/RPC2"
             end
 
+            @async = !options[:sync]
+
             timeout=nil
             timeout=options[:timeout] if options[:timeout]
 
@@ -144,6 +155,27 @@ module OpenNebula
             @server = XMLRPC::Client.new2(@one_endpoint, http_proxy, timeout)
             @server.http_header_extra = {'accept-encoding' => 'identity'}
 
+            http = @server.instance_variable_get("@http")
+
+            if options[:cert_dir] || ENV['ONE_CERT_DIR']
+                raise "SSL options don't work in async mode" if @async
+
+                cert_dir = options[:cert_dir] || ENV['ONE_CERT_DIR']
+                cert_files = Dir["#{cert_dir}/*"]
+
+                cert_store = OpenSSL::X509::Store.new
+                cert_store.set_default_paths
+                cert_files.each {|cert| cert_store.add_file(cert) }
+
+                http.cert_store = cert_store
+            end
+
+            if options[:disable_ssl_verify] || ENV['ONE_DISABLE_SSL_VERIFY']
+                raise "SSL options don't work in async mode" if @async
+
+                http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            end
+
             if defined?(OxStreamParser)
                 @server.set_parser(OxStreamParser.new)
             elsif OpenNebula::NOKOGIRI
@@ -155,7 +187,11 @@ module OpenNebula
 
         def call(action, *args)
             begin
-                response = @server.call_async("one."+action, @one_auth, *args)
+                if @async
+                    response = @server.call_async("one."+action, @one_auth, *args)
+                else
+                    response = @server.call("one."+action, @one_auth, *args)
+                end
 
                 if response[0] == false
                     Error.new(response[1], response[2])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 4.9.80.beta
+  version: 4.10.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -89,7 +89,8 @@ files:
 - lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
 homepage: http://opennebula.org
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -102,9 +103,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.2.2