You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/05/22 22:19:37 UTC
[26/50] [abbrv] git commit: FGCP: Renamed :default to 'default' and
updated comment which points to entrypoints
FGCP: Renamed :default to 'default' and updated comment which points to entrypoints
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/ac1e1de0
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/ac1e1de0
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/ac1e1de0
Branch: refs/heads/master
Commit: ac1e1de05880958be1e4962bc0c870f8e77851fd
Parents: 7c0d391
Author: Michal Fojtik <mf...@redhat.com>
Authored: Wed May 16 12:44:58 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Tue May 22 22:17:37 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_client.rb | 2 +-
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ac1e1de0/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
index c544998..9072c84 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
@@ -35,7 +35,7 @@ class FGCPClient
@locale = locale
cert.subject.to_s =~ /\b[Cc]=(\w\w)\b/
country = $1.downcase
- endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints][:default][country] unless endpoint
+ endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints]['default'][country] unless endpoint
raise "API endpoint not found for region #{country}" if endpoint.nil?
#proxy settings:
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ac1e1de0/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
index 0729ae4..93ab8fa 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -1136,7 +1136,7 @@ eofwopxml
cert, key = convert_credentials(credentials)
cert.subject.to_s =~ /\b[Cc]=(\w\w)\b/
country = $1.downcase
- endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints][:default][country]
+ endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints]['default'][country]
[
Provider.new(
:id => "fgcp-#{country}",
@@ -1148,7 +1148,7 @@ eofwopxml
# following code enables region drop-down box on GUI. No need as retrieving region from cert (subject c)
# def configured_providers
-# Deltacloud::Drivers::driver_config[:fgcp][:entrypoints].keys
+# Deltacloud::Drivers::driver_config[:fgcp][:entrypoints]['default'].keys
# end
exceptions do