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

feature #1719: Added options hash paramater and timeout to OpenNebula::Client

Browse Source
This commit is contained in:
Javi Fontan 2013-02-01 17:05:21 +01:00
parent 047a3d4e26
commit 55beaab546
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,10 +51,24 @@ module OpenNebula
XMLPARSER=false
end
def initialize(secret=nil, endpoint=nil)
# Creates a new client object that will be used to call OpenNebula
# functions.
#
# @param [String, nil] secret user credentials ("user:password") or
# nil to get the credentials from user auth file
# @param [String, nil] endpoint OpenNebula server endpoint
# (http://host:2633/RPC2) or nil to get it form the environment
# variable ONE_XMLRPC or use the default endpoint
# @param [Hash] options
# @option params [Integer] :timeout connection timeout in seconds,
# defaults to 30
#
# @return [OpenNebula::Client]
def initialize(secret=nil, endpoint=nil, options={})
if secret
@one_auth = secret
elsif ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and File.file?(ENV["ONE_AUTH"])
elsif ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and
File.file?(ENV["ONE_AUTH"])
@one_auth = File.read(ENV["ONE_AUTH"])
elsif File.file?(ENV["HOME"]+"/.one/one_auth")
@one_auth = File.read(ENV["HOME"]+"/.one/one_auth")
@ -72,7 +86,10 @@ module OpenNebula
@one_endpoint = "http://localhost:2633/RPC2"
end
@server = XMLRPC::Client.new2(@one_endpoint)
timeout=nil
timeout=options[:timeout] if options[:timeout]
@server = XMLRPC::Client.new2(@one_endpoint, nil, timeout)
if OpenNebula::NOKOGIRI
@server.set_parser(NokogiriStreamParser.new)