deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@redhat.com
Subject [PATCH core 32/51] FGCP: Renamed :default to 'default' and updated comment which points to entrypoints
Date Mon, 21 May 2012 10:07:13 GMT
From: Michal Fojtik <mfojtik@redhat.com>


Signed-off-by: Michal fojtik <mfojtik@redhat.com>
---
 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(-)

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:
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
-- 
1.7.10.1


Mime
View raw message