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

Retrofit HP Storage provider to work with both legacy and CS authentication schemes.

Browse source
This commit is contained in:
Rupak Ganguly 2012-01-13 20:12:39 -05:00
parent 1b905c782f
commit 1e88a9801a
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/fog/hp/storage.rb
View file

@ -6,7 +6,7 @@ module Fog
class HP < Fog::Service
requires :hp_secret_key, :hp_account_id
recognizes :hp_auth_uri, :hp_servicenet, :hp_cdn_ssl, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_tenant_id, :hp_service_type
recognizes :hp_auth_uri, :hp_servicenet, :hp_cdn_ssl, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_tenant_id, :hp_service_type, :hp_auth_version
model_path 'fog/hp/models/storage'
model :directory
@ -144,13 +144,21 @@ module Fog
@hp_cdn_ssl = options[:hp_cdn_ssl]
@hp_cdn_uri = options[:hp_cdn_uri]
@connection_options = options[:connection_options] || {}
### Pass the service type for object storage via the options hash
### Set an option to use the style of authentication desired; :v1 or :v2 (default)
auth_version = options[:hp_auth_version] || :v2
### Pass the service type for object storage to the authentication call
options[:hp_service_type] ||= "object-store"
### Call the control services authentication
credentials = Fog::HP.authenticate_v2(options, @connection_options)
@auth_token = credentials[:auth_token]
### Make the authentication call
if (auth_version == :v2)
# Call the control services authentication
credentials = Fog::HP.authenticate_v2(options, @connection_options)
else
# Call the legacy v1.0/v1.1 authentication
credentials = Fog::HP.authenticate_v1(options, @connection_options)
end
@auth_token = credentials[:auth_token]
uri = URI.parse(credentials[:endpoint_url])
@host = options[:hp_servicenet] == true ? "snet-#{uri.host}" : uri.host
@path = uri.path