ACK to the combination of this patch with 26/51 and 31/51. Tested and worked fine with FGCP.
Regards, Dies Koper > -----Original Message----- > From: [email protected] [mailto:[email protected]] > Sent: Monday, 21 May 2012 8:07 PM > To: [email protected] > Subject: [PATCH core 32/51] FGCP: Renamed :default to 'default' and > updated comment which points to entrypoints > > From: Michal Fojtik <[email protected]> > > > Signed-off-by: Michal fojtik <[email protected]> > --- > 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][countr y] > unless endpoint > + endpoint = > Deltacloud::Drivers::driver_config[:fgcp][:entrypoints]['default'][count ry] > 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][countr y] > + endpoint = > Deltacloud::Drivers::driver_config[:fgcp][:entrypoints]['default'][count ry] > [ > 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 >
