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
[1/50] [abbrv] git commit: FGCP: Fixed client name error and added
configuration loading
Updated Branches:
refs/heads/master f1785fe88 -> 9d9ca266d
FGCP: Fixed client name error and added configuration loading
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/9d9ca266
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/9d9ca266
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/9d9ca266
Branch: refs/heads/master
Commit: 9d9ca266d1d022120c0dbefa55ffdf51116de054
Parents: d7c7c81
Author: Michal Fojtik <mf...@redhat.com>
Authored: Tue May 22 18:41:48 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Tue May 22 22:17:40 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_client.rb | 4 ++--
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/9d9ca266/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 b0e1897..3e53a8f 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
@@ -25,9 +25,9 @@ require 'uri'
module Deltacloud
module Drivers
- module FGCP
+ module Fgcp
-class FGCPClient
+class FgcpClient
def initialize(cert, key, endpoint = nil, version = '2011-01-31', locale = 'en')
@version = version
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/9d9ca266/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 4d65e7c..179ea72 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -24,7 +24,7 @@ module Deltacloud
module Fgcp
class FgcpDriver < Deltacloud::BaseDriver
- CERT_DIR = ENV['FGCP_CERT_DIR']
+ CERT_DIR = ENV['FGCP_CERT_DIR'] || File::expand_path('~/.deltacloud/config/fgcp')
def supported_collections
DEFAULT_COLLECTIONS + [ :addresses, :load_balancers, :firewalls ]
@@ -1202,7 +1202,7 @@ eofwopxml
def new_client(credentials)
cert, key = convert_credentials(credentials)
- FGCPClient.new(cert, key, api_provider)
+ FgcpClient.new(cert, key, api_provider)
end
def convert_credentials(credentials)