fog 0.0.77 → 0.0.78

data/lib/fog/terremark/bin.rb

@@ -1,35 +1,45 @@
 module Terremark
   class << self
-    if Fog.credentials[:terremark_password] && Fog.credentials[:terremark_username]
+    if (Fog::Terremark::ECLOUD_OPTIONS.all? { |option| Fog.credentials.has_key?(option) } ) ||
+       (Fog::Terremark::VCLOUD_OPTIONS.all? { |option| Fog.credentials.has_key?(option) } )
 
       def initialized?
         true
       end
 
-      def terremark_service
-        @terremark_service ||= begin
-          Fog.credentials[:terremark_service] || :vcloud
+      def terremark_service(service)
+        case service
+        when :ecloud
+          Fog::Terremark::Ecloud
+        when :vcloud
+          Fog::Terremark::Vcloud
+        else
+          raise "Unsupported Terremark Service"
         end
       end
 
       def [](service)
         @@connections ||= Hash.new do |hash, key|
           credentials = Fog.credentials.reject do |k,v|
-            ![:terremark_username, :terremark_password].include?(k)
+            case key
+            when :ecloud
+              !Fog::Terremark::ECLOUD_OPTIONS.include?(k)
+            when :vcloud
+              !Fog::Terremark::VCLOUD_OPTIONS.include?(k)
+            end
+          end
+          case key
+          when :ecloud
+            hash[key] = Fog::Terremark::Ecloud.new(credentials)
+          when :vcloud
+            hash[key] = Fog::Terremark::Vcloud.new(credentials)
+          else
+            raise "Unsupported Terremark Service"
           end
-          hash[key] = Fog::Terremark.new(credentials.merge(:terremark_service => terremark_service))
         end
         @@connections[service]
       end
 
-      def servers
-        self[terremark_service].servers
-      end
-
-      def tasks
-        self[terremark_service].tasks
-      end
-
     else
 
       def initialized?

data/lib/fog/terremark/ecloud.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Terremark
+   module Ecloud
+
+     module Bin
+     end
+
+     extend Fog::Terremark::Shared
+
+     def self.new(options={})
+
+       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
+
+       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]   || "services.enterprisecloud.terremark.com"
+          @path   = options[:path]   || "/api/v0.8a-ext2.0"
+          @port   = options[:port]   || 443
+          @scheme = options[:scheme] || 'https'
+          @cookie = get_organizations.headers['Set-Cookie']
+        end
+
+      end
+
+     class Mock
+       include Fog::Terremark::Shared::Mock
+       include Fog::Terremark::Shared::Parser
+     end
+
+    end
+  end
+end
+

data/lib/fog/terremark/models/shared/address.rb

@@ -0,0 +1,29 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class Address < Fog::Model
+
+        identity :id
+
+        attribute :ip, 'name'
+
+        def destroy
+         requires :id
+         connection.delete_public_ip(@id)
+         true
+        end
+
+        private
+
+        def href=(new_href)
+          @id = new_href.split('/').last.to_i
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/addresses.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def addresses(options = {})
+          Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self))
+        end
+      end
+
+      module Real
+        def addresses(options = {})
+          Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self))
+        end
+      end
+
+      class Addresses < Fog::Collection
+
+        model Fog::Terremark::Shared::Address
+
+        def all
+          load(connection.get_public_ips(vdc_id).body['PublicIpAddresses'])
+        end
+
+        def get(ip_id)
+          if ip_id && ip = connection.get_public_ip(ip_id).body
+            new(ip)
+          elsif !ip_id
+            nil
+          end
+        rescue Excon::Errors::Forbidden
+          nil
+        end
+
+        def vdc_id
+          @vdc_id ||= connection.default_vdc_id
+        end
+
+        private
+
+        def vdc_id=(new_vdc_id)
+          @vdc_id = new_vdc_id
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/network.rb

@@ -0,0 +1,30 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class Network < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :subnet
+        attribute :gateway
+        attribute :netmask
+        attribute :fencemode
+        attribute :links
+
+        private
+
+        def href=(new_href)
+          @id = new_href.split('/').last.to_i
+        end
+
+        def type=(new_type); end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/networks.rb

@@ -0,0 +1,52 @@
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def networks(options = {})
+          Fog::Terremark::Shared::Networks.new(options.merge(:connection => self))
+        end
+      end
+
+      module Real
+        def networks(options = {})
+          Fog::Terremark::Shared::Networks.new(options.merge(:connection => self))
+        end
+      end
+
+      class Networks < Fog::Collection
+
+        model Fog::Terremark::Shared::Network
+
+        def all
+          data = connection.get_vdc(vdc_id).body['AvailableNetworks'].map do |network|
+            connection.get_network(network["href"].split("/").last).body
+          end
+          load(data)
+        end
+
+        def get(network_id)
+          if network_id && network = connection.get_network(network_id).body
+            new(network)
+          elsif !network_id
+            nil
+          end
+        rescue Excon::Errors::Forbidden
+          nil
+        end
+
+        def vdc_id
+          @vdc_id ||= connection.default_vdc_id
+        end
+
+        private
+
+        def vdc_id=(new_vdc_id)
+          @vdc_id = new_vdc_id
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/server.rb

@@ -0,0 +1,57 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class Server < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :status
+
+        def destroy
+          requires :id
+          data = connection.power_off(@id).body
+          task = connection.tasks.new(data)
+          task.wait_for { ready? }
+          connection.delete_vapp(@id)
+          true
+        end
+
+        # { '0' => 'Being created', '2' => 'Powered Off', '4' => 'Powered On'}
+        def ready?
+          @status == '2'
+        end
+
+        def reboot
+          requires :id
+          connection.reset(@id)
+          true
+        end
+
+        def save
+          requires :name
+          data = connection.instantiate_vapp(@name)
+          merge_attributes(data.body)
+          task = connection.deploy_vapp(@id)
+          task.wait_for { ready? }
+          task = connection.power_on(@id)
+          task.wait_for { ready? }
+          true
+        end
+
+        private
+
+        def href=(new_href)
+          @id = new_href.split('/').last.to_i
+        end
+
+        def type=(new_type); end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/servers.rb

@@ -0,0 +1,55 @@
+require 'fog/collection'
+require 'fog/terremark/models/shared/server'
+
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def servers(options = {})
+          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+        end
+      end
+
+      module Real
+        def servers(options = {})
+          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+        end
+      end
+
+      class Servers < Fog::Collection
+
+        model Fog::Terremark::Shared::Server
+
+        def all
+          data = connection.get_vdc(vdc_id).body['ResourceEntities'].select do |entity|
+            entity['type'] == 'application/vnd.vmware.vcloud.vApp+xml'
+          end
+          load(data)
+        end
+
+        def get(server_id)
+          if server_id && server = connection.get_vapp(server_id).body
+            new(server)
+          elsif !server_id
+            nil
+          end
+        rescue Excon::Errors::Forbidden
+          nil
+        end
+
+        def vdc_id
+          @vdc_id ||= connection.default_vdc_id
+        end
+
+        private
+
+        def vdc_id=(new_vdc_id)
+          @vdc_id = new_vdc_id
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/task.rb

@@ -0,0 +1,43 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class Task < Fog::Model
+
+        identity :id
+
+        attribute :end_time,    'endTime'
+        attribute :owner,       'Owner'
+        attribute :result,      'Result'
+        attribute :start_time,  'startTime'
+        attribute :status
+
+        def initialize(attributes = {})
+          new_owner  = attributes.delete('Owner')
+          new_result = attributes.delete('Result')
+          super
+          @owner  = connection.parse(new_owner)
+          if new_result
+            @result = connection.parse(new_result)
+          end
+        end
+
+        def ready?
+          @status == 'success'
+        end
+
+        private
+
+        def href=(new_href)
+          @id = new_href.split('/').last.to_i
+        end
+
+        def type=(new_type); end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/tasks.rb

@@ -0,0 +1,58 @@
+require 'fog/collection'
+require 'fog/terremark/models/shared/server'
+
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def tasks
+          Fog::Terremark::Shared::Tasks.new(:connection => self)
+        end
+      end
+
+      module Real
+        def tasks
+          Fog::Terremark::Shared::Tasks.new(:connection => self)
+        end
+      end
+
+      class Tasks < Fog::Collection
+
+        model Fog::Terremark::Shared::Task
+
+        def all
+          data = connection.get_tasks_list(task_list_id).body['Tasks']
+          load(data)
+        end
+
+        def get(task_id)
+          if task_id && task = connection.get_task(task_id).body
+            new(task)
+          elsif !task_id
+            nil
+          end
+        rescue Excon::Errors::Forbidden
+          nil
+        end
+
+        def task_list_id
+          @task_list_id ||=
+            if connection.default_organization_id && organization = connection.get_organization(connection.default_organization_id).body
+              organization['Links'].detect {|link| link['type'] == 'application/vnd.vmware.vcloud.tasksList+xml'}['href'].split('/').last.to_i
+            else
+              nil
+            end
+        end
+
+        private
+
+        def task_list_id=(new_task_list_id)
+          @task_list_id = new_task_list_id
+        end
+
+      end
+
+    end
+  end
+end