mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
[rackspace|identity] added error handling to make service catalog more robust.
This commit is contained in:
Kyle Rames
parent
5e72c08bf5
commit
71f7c13efb
2 changed files with 87 additions and 45 deletions
|
|
@ -22,7 +22,7 @@ module Fog
|
|||
|
||||
def display_service_regions(service_type)
|
||||
endpoints = get_endpoints(service_type)
|
||||
endpoints.collect { |k,v| ":#{k}" }.join(", ")
|
||||
endpoints.collect { |k,v| ":#{k}" }.join(", ")
|
||||
end
|
||||
|
||||
def get_endpoint(service_type, region=nil)
|
||||
|
|
@ -32,7 +32,7 @@ module Fog
|
|||
return endpoint if endpoint.is_a?(String) #There is only one endpoint for service
|
||||
|
||||
unless region
|
||||
raise "There are multiple endpoints avaliable for #{service_type}. Please specify one of the following regions: #{display_service_regions(service_type)}."
|
||||
raise "There are multiple endpoints available for #{service_type}. Please specify one of the following regions: #{display_service_regions(service_type)}."
|
||||
end
|
||||
region = region.is_a?(String) ? region.to_sym : region
|
||||
endpoint = get_endpoints(service_type)[region]
|
||||
|
|
@ -48,10 +48,16 @@ module Fog
|
|||
|
||||
def self.from_response(service, hash)
|
||||
service_catalog = ServiceCatalog.new :service => service
|
||||
services = hash["access"]["serviceCatalog"]
|
||||
services.each do |serv|
|
||||
name = serv["name"].to_sym
|
||||
service_catalog.send(:add_endpoints, name, serv)
|
||||
begin
|
||||
services = hash["access"]["serviceCatalog"]
|
||||
services.each do |serv|
|
||||
name = serv["name"] ? serv["name"].to_sym : nil
|
||||
next unless name
|
||||
service_catalog.send(:add_endpoints, name, serv)
|
||||
end
|
||||
rescue => e
|
||||
Logger.warning "Exception occurred while loading service catalog - #{e.inspect}"
|
||||
Logger.warning "Unable to load service catalog. Please specify endpoints manually"
|
||||
end
|
||||
service_catalog
|
||||
end
|
||||
|
|
@ -59,21 +65,32 @@ module Fog
|
|||
private
|
||||
|
||||
def add_endpoints(service_name, hash)
|
||||
endpoints = hash["endpoints"]
|
||||
if endpoints.size == 1
|
||||
catalog[service_name] = endpoints[0]["publicURL"].freeze
|
||||
else
|
||||
catalog[service_name] = endpoints_from_array(endpoints)
|
||||
begin
|
||||
endpoints = hash["endpoints"]
|
||||
if endpoints.size == 1
|
||||
catalog[service_name] = endpoints[0]["publicURL"].freeze
|
||||
else
|
||||
catalog[service_name] = endpoints_from_array(service_name, endpoints)
|
||||
end
|
||||
rescue => e
|
||||
Logger.warning "Exception occurred while loading #{service_name} service endpoints - #{e.inspect}"
|
||||
Logger.warning "Unable to load service endpoints for #{service_name}. Please specify #{service_name} endpoints manually."
|
||||
end
|
||||
end
|
||||
|
||||
def endpoints_from_array(endpoints)
|
||||
def endpoints_from_array(service_name, endpoints)
|
||||
hash = {}
|
||||
endpoints.each do |endpoint|
|
||||
region_name = endpoint["region"]
|
||||
region = region_name ? region_name.downcase.to_sym : :global
|
||||
url = endpoint["publicURL"].freeze
|
||||
hash[region] = url
|
||||
begin
|
||||
region_name = endpoint["region"]
|
||||
region = region_name ? region_name.downcase.to_sym : :global
|
||||
url = endpoint["publicURL"].freeze
|
||||
hash[region] = url
|
||||
rescue => e
|
||||
Logger.warning "Exception occurred while loading #{service_name} service endpoints - #{e.inspect}"
|
||||
Logger.warning "Unable to parse #{service_name} endpoint - #{endpoint}"
|
||||
Logger.warning "You may need to specify #{service_name} endpoints manually."
|
||||
end
|
||||
end
|
||||
hash
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,35 +3,60 @@ require 'fog/rackspace/models/identity/service_catalog'
|
|||
Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
|
||||
|
||||
tests('#from_response') do
|
||||
before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"},
|
||||
"serviceCatalog"=>[{"type"=>"volume", "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777"},
|
||||
{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"},
|
||||
{"type"=>"rax:load-balancer", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"},
|
||||
{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudLoadBalancers"},
|
||||
{"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
|
||||
"tenantId"=>"Mosso777",
|
||||
"publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
|
||||
{"internalURL"=>"https://snet-storage101.ord1.clouddrive.com/v1/Mosso777", "region"=>"ORD",
|
||||
"tenantId"=>"Mosso777",
|
||||
"publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"}, {"type"=>"rax:database",
|
||||
"endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777"}, {"region"=>"ORD", "tenantId"=>"777",
|
||||
"publicURL"=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDatabases"}, {"type"=>"rax:dns", "endpoints"=>[{"tenantId"=>"777",
|
||||
"publicURL"=>"https://dns.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDNS"}, {"type"=>"compute", "endpoints"=>[{"versionId"=>"1.0", "tenantId"=>"777",
|
||||
"versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v1.0",
|
||||
"publicURL"=>"https://servers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudServers"}, {"type"=>"compute", "endpoints"=>[{"region"=>"DFW", "versionId"=>"2",
|
||||
"tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
|
||||
"publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
|
||||
"versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
|
||||
"publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
|
||||
"publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudMonitoring"}, {"type"=>"rax:object-cdn", "endpoints"=>[{"region"=>"DFW",
|
||||
"tenantId"=>"Mosso777", "publicURL"=>"https://cdn1.clouddrive.com/v1/Mosso777"},
|
||||
{"region"=>"ORD", "tenantId"=>"Mosso777",
|
||||
"publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"}], "user"=>{"roles"=>[{"description"=>"User Admin
|
||||
Role.", "name"=>"identity:user-admin", "id"=>"3"}], "name"=>"joe-racker", "RAX-AUTH:defaultRegion"=>"", "id"=>"TK421"}}}
|
||||
tests('missing serviceCatalog node') do
|
||||
before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}}}
|
||||
after_hash = {}
|
||||
service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
|
||||
returns(after_hash) { service_catalog.catalog }
|
||||
end
|
||||
|
||||
after_hash = {:cloudServers=>"https://servers.api.rackspacecloud.com/v1.0/777", :cloudServersOpenStack=>{:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, :cloudFiles=>{:dfw=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777", :ord=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}, :cloudBlockStorage=>{:dfw=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777", :ord=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}, :cloudMonitoring=>"https://monitoring.api.rackspacecloud.com/v1.0/777", :cloudLoadBalancers=>{:dfw=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, :cloudFilesCDN=>{:dfw=>"https://cdn1.clouddrive.com/v1/Mosso777", :ord=>"https://cdn2.clouddrive.com/v1/Mosso777"}, :cloudDatabases=>{:dfw=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}, :cloudDNS=>"https://dns.api.rackspacecloud.com/v1.0/777"}
|
||||
@service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
|
||||
returns(after_hash) { @service_catalog.catalog }
|
||||
tests('missing serviceCatalog node') do
|
||||
before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}, "serviceCatalog"=>[{"type"=>"volume", "name"=>"cloudBlockStorage", "endpoints" =>[{"region"=>"DFW", "tenantId"=>"777" }]}, {"type"=>"rax:load-balancer","name"=>"cloudLoadBalancers", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}] }] }}
|
||||
|
||||
after_hash = {:cloudBlockStorage=>nil, :cloudLoadBalancers=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}
|
||||
service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
|
||||
returns(after_hash) { service_catalog.catalog }
|
||||
end
|
||||
|
||||
tests('missing region ') do
|
||||
before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}, "serviceCatalog"=> [{"type"=>"rax:load-balancer","name"=>"cloudLoadBalancers", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, {"tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}] }] }}
|
||||
|
||||
after_hash = {:cloudLoadBalancers=>{:ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}}
|
||||
service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
|
||||
returns(after_hash) { service_catalog.catalog }
|
||||
end
|
||||
|
||||
tests('successful') do
|
||||
before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"},
|
||||
"serviceCatalog"=>[{"type"=>"volume", "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777"},
|
||||
{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"},
|
||||
{"type"=>"rax:load-balancer", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"},
|
||||
{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudLoadBalancers"},
|
||||
{"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
|
||||
"tenantId"=>"Mosso777",
|
||||
"publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
|
||||
{"internalURL"=>"https://snet-storage101.ord1.clouddrive.com/v1/Mosso777", "region"=>"ORD",
|
||||
"tenantId"=>"Mosso777",
|
||||
"publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"}, {"type"=>"rax:database",
|
||||
"endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777"}, {"region"=>"ORD", "tenantId"=>"777",
|
||||
"publicURL"=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDatabases"}, {"type"=>"rax:dns", "endpoints"=>[{"tenantId"=>"777",
|
||||
"publicURL"=>"https://dns.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDNS"}, {"type"=>"compute", "endpoints"=>[{"versionId"=>"1.0", "tenantId"=>"777",
|
||||
"versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v1.0",
|
||||
"publicURL"=>"https://servers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudServers"}, {"type"=>"compute", "endpoints"=>[{"region"=>"DFW", "versionId"=>"2",
|
||||
"tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
|
||||
"publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
|
||||
"versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
|
||||
"publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
|
||||
"publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudMonitoring"}, {"type"=>"rax:object-cdn", "endpoints"=>[{"region"=>"DFW",
|
||||
"tenantId"=>"Mosso777", "publicURL"=>"https://cdn1.clouddrive.com/v1/Mosso777"},
|
||||
{"region"=>"ORD", "tenantId"=>"Mosso777",
|
||||
"publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"}], "user"=>{"roles"=>[{"description"=>"User Admin
|
||||
Role.", "name"=>"identity:user-admin", "id"=>"3"}], "name"=>"joe-racker", "RAX-AUTH:defaultRegion"=>"", "id"=>"TK421"}}}
|
||||
|
||||
after_hash = {:cloudServers=>"https://servers.api.rackspacecloud.com/v1.0/777", :cloudServersOpenStack=>{:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, :cloudFiles=>{:dfw=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777", :ord=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}, :cloudBlockStorage=>{:dfw=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777", :ord=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}, :cloudMonitoring=>"https://monitoring.api.rackspacecloud.com/v1.0/777", :cloudLoadBalancers=>{:dfw=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, :cloudFilesCDN=>{:dfw=>"https://cdn1.clouddrive.com/v1/Mosso777", :ord=>"https://cdn2.clouddrive.com/v1/Mosso777"}, :cloudDatabases=>{:dfw=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}, :cloudDNS=>"https://dns.api.rackspacecloud.com/v1.0/777"}
|
||||
@service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
|
||||
returns(after_hash) { @service_catalog.catalog }
|
||||
end
|
||||
end
|
||||
|
||||
tests('services') do
|
||||
|
|
@ -75,7 +100,7 @@ Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
|
|||
returns("http:///fake-endpoint.com") { service.service_catalog.get_endpoint :fakeService }
|
||||
service_catalog.reload
|
||||
raises(RuntimeError) { service_catalog.get_endpoint :fakeService }
|
||||
raises(RuntimeError) { service.service_catalog.get_endpoint :fakeService }
|
||||
raises(RuntimeError) { service.service_catalog.get_endpoint :fakeService }
|
||||
|
||||
end
|
||||
end
|
||||
Loading…
Reference in a new issue