You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2011/06/27 14:14:37 UTC
svn commit: r1140133 - in /incubator/deltacloud/trunk/server/lib/deltacloud:
base_driver/ drivers/ec2/ drivers/eucalyptus/ drivers/mock/ drivers/rhevm/
drivers/vsphere/
Author: lutter
Date: Mon Jun 27 12:14:37 2011
New Revision: 1140133
URL: http://svn.apache.org/viewvc?rev=1140133&view=rev
Log:
Unify access to the selected provider with an api_provider helper method
Modified:
incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/mock/mock_driver.rb
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb?rev=1140133&r1=1140132&r2=1140133&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/base_driver.rb Mon Jun 27 12:14:37 2011
@@ -226,6 +226,10 @@ module Deltacloud
{ :error => [], :auth => [], :glob => [] }
end
+ def api_provider
+ Thread.current[:provider] || ENV['API_PROVIDER']
+ end
+
end
end
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb?rev=1140133&r1=1140132&r2=1140133&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb Mon Jun 27 12:14:37 2011
@@ -676,7 +676,7 @@ module Deltacloud
end
def endpoint_for_service(service)
- endpoint = (Thread.current[:provider] || ENV['API_PROVIDER'] || DEFAULT_REGION)
+ endpoint = (api_provider || DEFAULT_REGION)
# return the endpoint if it does not map to a default endpoint, allowing
# the endpoint to be a full hostname instead of a region.
Deltacloud::Drivers::driver_config[:ec2][:entrypoints][service.to_s][endpoint] || endpoint
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb?rev=1140133&r1=1140132&r2=1140133&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb Mon Jun 27 12:14:37 2011
@@ -143,7 +143,7 @@ module Deltacloud
def endpoint_for_service(service)
service = service.to_s
- endpoint = (Thread.current[:provider] || ENV['API_PROVIDER'])
+ endpoint = api_provider
if endpoint && endpoint.include?(service)
# example endpoint: 'ec2=192.168.1.1; s3=192.168.1.2'
addr = Hash[endpoint.split(";").map { |svc| svc.strip.split("=") }][service]
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/mock/mock_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/mock/mock_driver.rb?rev=1140133&r1=1140132&r2=1140133&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/mock/mock_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/mock/mock_driver.rb Mon Jun 27 12:14:37 2011
@@ -26,8 +26,7 @@ class MockDriver < Deltacloud::BaseDrive
# If the provider is set to storage, pretend to be a storage-only
# driver
def supported_collections
- endpoint = Thread.current[:provider] || ENV['API_PROVIDER']
- if endpoint == 'storage'
+ if api_provider == 'storage'
[:buckets]
else
DEFAULT_COLLECTIONS + [:buckets, :keys]
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb?rev=1140133&r1=1140132&r2=1140133&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb Mon Jun 27 12:14:37 2011
@@ -202,7 +202,7 @@ class RHEVMDriver < Deltacloud::BaseDriv
private
def new_client(credentials)
- url = (Thread.current[:provider] || ENV['API_PROVIDER'] || provider_uri)
+ url = api_provider || provider_uri
safely do
::RHEVM::Client.new(credentials.user, credentials.password, url)
end
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb?rev=1140133&r1=1140132&r2=1140133&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb Mon Jun 27 12:14:37 2011
@@ -282,7 +282,7 @@ module Deltacloud::Drivers::VSphere
end
def host_endpoint
- endpoint = (Thread.current[:provider] || ENV['API_PROVIDER'])
+ endpoint = api_provider
endpoint || Deltacloud::Drivers::driver_config[:vsphere][:entrypoints]['default']['default']
end