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
[9/50] [abbrv] git commit: FGCP: Renamed the driver class to be
loadable and removed DEFAULT_CONFIG constant, because it's not longer set
FGCP: Renamed the driver class to be loadable and removed DEFAULT_CONFIG constant, because it's not longer set
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/1a66ceed
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/1a66ceed
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/1a66ceed
Branch: refs/heads/master
Commit: 1a66ceedd9f43148ccd58cd208d66f29cc190817
Parents: 1a8223f
Author: Michal Fojtik <mf...@redhat.com>
Authored: Fri May 18 14:40:33 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Tue May 22 22:17:39 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_client.rb | 1 -
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1a66ceed/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 9072c84..b0e1897 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
@@ -15,7 +15,6 @@
#
# Author: Dies Koper <di...@fast.au.fujitsu.com>
-require 'deltacloud/base_driver'
require 'net/http'
require 'net/https'
require 'rubygems'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1a66ceed/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 93ab8fa..4d65e7c 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -15,17 +15,16 @@
#
# Author: Dies Koper <di...@fast.au.fujitsu.com>
-require 'deltacloud/base_driver'
-require 'deltacloud/drivers/fgcp/fgcp_client'
+require_relative 'fgcp_client'
require 'openssl'
require 'xmlsimple'
module Deltacloud
module Drivers
- module FGCP
-class FGCPDriver < Deltacloud::BaseDriver
+ module Fgcp
+class FgcpDriver < Deltacloud::BaseDriver
- CERT_DIR = ENV['FGCP_CERT_DIR'] || File::expand_path(File::join(DEFAULT_CONFIG, 'fgcp'))
+ CERT_DIR = ENV['FGCP_CERT_DIR']
def supported_collections
DEFAULT_COLLECTIONS + [ :addresses, :load_balancers, :firewalls ]