From 169557f280ffb83038cb2da11a24b693489c6c22 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 16 Feb 2011 14:56:26 -0800 Subject: [PATCH] remove no longer used Terremark::Ecloud related stuff --- lib/fog/terremark.rb | 2 - lib/fog/terremark/ecloud.rb | 73 ------------------------------------- 2 files changed, 75 deletions(-) delete mode 100644 lib/fog/terremark/ecloud.rb diff --git a/lib/fog/terremark.rb b/lib/fog/terremark.rb index 64ecd8945..0f91c556b 100644 --- a/lib/fog/terremark.rb +++ b/lib/fog/terremark.rb @@ -5,12 +5,10 @@ require 'fog/core/parser' require 'fog/terremark/shared' require 'fog/terremark/parser' -require 'fog/terremark/ecloud' require 'fog/terremark/vcloud' module Fog module Terremark - ECLOUD_OPTIONS = [:terremark_ecloud_username, :terremark_ecloud_password] VCLOUD_OPTIONS = [:terremark_vcloud_username, :terremark_vcloud_password] end end diff --git a/lib/fog/terremark/ecloud.rb b/lib/fog/terremark/ecloud.rb deleted file mode 100644 index d5732a4f2..000000000 --- a/lib/fog/terremark/ecloud.rb +++ /dev/null @@ -1,73 +0,0 @@ -module Fog - module Terremark - module Ecloud - - module Bin - end - - module Defaults - HOST = 'services.enterprisecloud.terremark.com' - PATH = '/api/v0.8a-ext2.0' - PORT = 443 - SCHEME = 'https' - end - - extend Fog::Terremark::Shared - - def self.new(options={}) - location = caller.first - warning = "[yellow][WARN] Fog::Terremark::Ecloud is deprecated, use Fog::Compute.new(:provider => 'TerremarkEcloud')[/]" - warning << " [light_black](" << location << ")[/] " - Formatador.display_line(warning) - - unless @required - shared_requires - @required = true - end - - check_shared_options(options) - - if Fog.mocking? - Fog::Terremark::Ecloud::Mock.new(options) - else - Fog::Terremark::Ecloud::Real.new(options) - end - - end - - class Real - # requires :terremark_ecloud_password, :terremark_ecloud_username - # recognizes :host, :path, :port, :scheme, :persistent - - include Fog::Terremark::Shared::Real - include Fog::Terremark::Shared::Parser - - def initialize(options={}) - @terremark_password = options[:terremark_ecloud_password] - @terremark_username = options[:terremark_ecloud_username] - @host = options[:host] || Fog::Terremark::Ecloud::Defaults::HOST - @path = options[:path] || Fog::Terremark::Ecloud::Defaults::PATH - @port = options[:port] || Fog::Terremark::Ecloud::Defaults::PORT - @scheme = options[:scheme] || Fog::Terremark::Ecloud::Defaults::SCHEME - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent]) - end - - end - - class Mock - include Fog::Terremark::Shared::Mock - include Fog::Terremark::Shared::Parser - - def initialize(option = {}) - super - @base_url = Fog::Terremark::Ecloud::Defaults::SCHEME + "://" + - Fog::Terremark::Ecloud::Defaults::HOST + - Fog::Terremark::Ecloud::Defaults::PATH - @data = self.class.data[:terremark_ecloud_username] - end - end - - end - end -end -