shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-19 06:50:07 +03:00
Code Releases Wiki Activity

Merge branch 'feature-2732' of https://github.com/lyklev/one

Browse Source
This commit is contained in:
Javi Fontan 2014-02-18 11:17:21 +01:00
commit ae4ef6d2b2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/oca/ruby/opennebula/client.rb
View File

@ -101,6 +101,8 @@ module OpenNebula
# @param [Hash] options
# @option params [Integer] :timeout connection timeout in seconds,
# defaults to 30
# @option params [String] :http_proxy HTTP proxy string used for
# connecting to the endpoint; defaults to no proxy
#
# @return [OpenNebula::Client]
def initialize(secret=nil, endpoint=nil, options={})
@ -130,7 +132,10 @@ module OpenNebula
timeout=nil
timeout=options[:timeout] if options[:timeout]
@server = XMLRPC::Client.new2(@one_endpoint, nil, timeout)
http_proxy=nil
http_proxy=options[:http_proxy] if options[:http_proxy]
@server = XMLRPC::Client.new2(@one_endpoint, http_proxy, timeout)
if defined?(OxStreamParser)
@server.set_parser(OxStreamParser.new)