kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

vcloud-token on instantiation

Browse source
This commit is contained in:
Miguel Martinez 2015-04-30 11:28:32 -07:00
parent 77197e8291
commit f8c747cfca
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/fog/vcloud_director/compute.rb
View file

@ -44,7 +44,7 @@ module Fog
class TaskError < Fog::VcloudDirector::Errors::TaskError; end
requires :vcloud_director_username, :vcloud_director_password, :vcloud_director_host
recognizes :vcloud_director_api_version, :vcloud_director_show_progress, :path
recognizes :vcloud_director_api_version, :vcloud_director_show_progress, :path, :vcloud_token
secrets :vcloud_director_password
@ -346,6 +346,7 @@ module Fog
@api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
@show_progress = options[:vcloud_director_show_progress]
@show_progress = $stdin.tty? if @show_progress.nil?
@vcloud_token = options[:vcloud_token]
end
def vcloud_token
@ -460,7 +461,8 @@ module Fog
private
def login
if @vcloud_token = ENV['FOG_VCLOUD_TOKEN']
@vcloud_token ||= ENV['FOG_VCLOUD_TOKEN']
if @vcloud_token
response = get_current_session
session_org = response.body[:org]
session_user = response.body[:user]
@ -768,8 +770,9 @@ module Fog
@port = options[:port] || Fog::Compute::VcloudDirector::Defaults::PORT
@scheme = options[:scheme] || Fog::Compute::VcloudDirector::Defaults::SCHEME
#@connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@end_point = "#{@scheme}://#{@host}#{@path}/"
@api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
@end_point = "#{@scheme}://#{@host}#{@path}/"
@api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
@vcloud_token = options[:vcloud_token]
end
def vcloud_token