From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- 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(-) 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 <[email protected]> -require 'deltacloud/base_driver' require 'net/http' require 'net/https' require 'rubygems' 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 <[email protected]> -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 ] -- 1.7.10.1
