fog 0.0.77 → 0.0.78

data/lib/fog/terremark/requests/shared/power_on.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Terremark
+    module Shared
+      module Real
+
+        # Power on a vapp
+        #
+        # ==== Parameters
+        # * vapp_id<~Integer> - Id of vapp to power on
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'endTime'<~String> - endTime of task
+        #     * 'href'<~String> - link to task
+        #     * 'startTime'<~String> - startTime of task
+        #     * 'status'<~String> - status of task
+        #     * 'type'<~String> - type of task
+        #     * 'Owner'<~String> -
+        #       * 'href'<~String> - href of owner
+        #       * 'name'<~String> - name of owner
+        #       * 'type'<~String> - type of owner
+        def power_on(vapp_id)
+          request(
+            :expects  => 202,
+            :method   => 'POST',
+            :parser   => Fog::Parsers::Terremark::Shared::Task.new,
+            :path     => "vApp/#{vapp_id}/power/action/powerOn"
+          )
+        end
+
+      end
+
+      module Mock
+
+        def power_on(vapp_id)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/terremark/requests/shared/reset.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Terremark
+    module Shared
+      module Real
+
+        # Reset a vapp
+        #
+        # ==== Parameters
+        # * vapp_id<~Integer> - Id of vapp to reset
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'endTime'<~String> - endTime of task
+        #     * 'href'<~String> - link to task
+        #     * 'startTime'<~String> - startTime of task
+        #     * 'status'<~String> - status of task
+        #     * 'type'<~String> - type of task
+        #     * 'Owner'<~String> -
+        #       * 'href'<~String> - href of owner
+        #       * 'name'<~String> - name of owner
+        #       * 'type'<~String> - type of owner
+        def reset(vapp_id)
+          request(
+            :expects  => 202,
+            :method   => 'POST',
+            :parser   => Fog::Parsers::Terremark::Shared::Task.new,
+            :path     => "vApp/#{vapp_id}/power/action/reset"
+          )
+        end
+
+      end
+
+      module Mock
+
+        def reset(vapp_id)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/terremark/requests/shared/shutdown.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Terremark
+    module Shared
+      module Real
+
+        # Shutdown a vapp
+        #
+        # ==== Parameters
+        # * vapp_id<~Integer> - Id of vapp to shutdown
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'endTime'<~String> - endTime of task
+        #     * 'href'<~String> - link to task
+        #     * 'startTime'<~String> - startTime of task
+        #     * 'status'<~String> - status of task
+        #     * 'type'<~String> - type of task
+        #     * 'Owner'<~String> -
+        #       * 'href'<~String> - href of owner
+        #       * 'name'<~String> - name of owner
+        #       * 'type'<~String> - type of owner
+        def shutdown(vapp_id)
+          request(
+            :expects  => 202,
+            :method   => 'POST',
+            :parser   => Fog::Parsers::Terremark::Shared::Task.new,
+            :path     => "vApp/#{vapp_id}/power/action/shutdown"
+          )
+        end
+
+      end
+
+      module Mock
+
+        def shutdown(vapp_id)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/terremark/shared.rb

@@ -0,0 +1,139 @@
+module Fog
+  module Terremark
+    module Shared
+
+      module Parser
+
+        def parse(data)
+          case data['type']
+          when 'application/vnd.vmware.vcloud.vApp+xml'
+            servers.new(data.merge!(:connection => self))
+          else
+            data
+          end
+        end
+
+      end
+
+      module Real
+
+        # TODO: bust cache on organization creation?
+        def default_organization_id
+          @default_organization_id ||= begin
+            org_list = get_organizations.body['OrgList']
+            if org_list.length == 1
+              org_list.first['href'].split('/').last.to_i
+            else
+              nil
+            end
+          end
+        end
+
+        private
+
+        def request(params)
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+          headers = {}
+          if @cookie
+            headers.merge!('Cookie' => @cookie)
+          end
+          response = @connection.request({
+            :body     => params[:body],
+            :expects  => params[:expects],
+            :headers  => headers.merge!(params[:headers] || {}),
+            :host     => @host,
+            :method   => params[:method],
+            :parser   => params[:parser],
+            :path     => "#{@path}/#{params[:path]}"
+          })
+        end
+
+      end
+
+      module Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {}
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @terremark_username = options[:terremark_username]
+          @data = self.class.data[@terremark_username]
+        end
+      end
+
+      def check_shared_options(options)
+        %w{ecloud vcloud}.each do |cloud|
+          cloud_option_keys = options.keys.select { |key| key.to_s =~ /^terremark_#{cloud}_.*/ }
+          unless cloud_option_keys.length == 0 || cloud_option_keys.length == 2
+            raise ArgumentError.new("terremark_#{cloud}_username and terremark_#{cloud}_password required to access teremark")
+          end
+        end
+      end
+
+      def shared_requires
+        require 'fog/terremark/models/shared/address'
+        require 'fog/terremark/models/shared/addresses'
+        require 'fog/terremark/models/shared/network'
+        require 'fog/terremark/models/shared/networks'
+        require 'fog/terremark/models/shared/server'
+        require 'fog/terremark/models/shared/servers'
+        require 'fog/terremark/models/shared/task'
+        require 'fog/terremark/models/shared/tasks'
+        require 'fog/terremark/parsers/shared/get_catalog'
+        require 'fog/terremark/parsers/shared/get_catalog_item'
+        require 'fog/terremark/parsers/shared/get_internet_services'
+        require 'fog/terremark/parsers/shared/get_node_services'
+        require 'fog/terremark/parsers/shared/get_organization'
+        require 'fog/terremark/parsers/shared/get_organizations'
+        require 'fog/terremark/parsers/shared/get_public_ips'
+        require 'fog/terremark/parsers/shared/get_tasks_list'
+        require 'fog/terremark/parsers/shared/get_vapp_template'
+        require 'fog/terremark/parsers/shared/get_vdc'
+        require 'fog/terremark/parsers/shared/instantiate_vapp_template'
+        require 'fog/terremark/parsers/shared/internet_service'
+        require 'fog/terremark/parsers/shared/network'
+        require 'fog/terremark/parsers/shared/node_service'
+        require 'fog/terremark/parsers/shared/public_ip'
+        require 'fog/terremark/parsers/shared/task'
+        require 'fog/terremark/parsers/shared/vapp'
+        require 'fog/terremark/requests/shared/add_internet_service'
+        require 'fog/terremark/requests/shared/add_node_service'
+        require 'fog/terremark/requests/shared/create_internet_service'
+        require 'fog/terremark/requests/shared/delete_internet_service'
+        require 'fog/terremark/requests/shared/delete_public_ip'
+        require 'fog/terremark/requests/shared/delete_node_service'
+        require 'fog/terremark/requests/shared/delete_vapp'
+        require 'fog/terremark/requests/shared/deploy_vapp'
+        require 'fog/terremark/requests/shared/get_catalog'
+        require 'fog/terremark/requests/shared/get_catalog_item'
+        require 'fog/terremark/requests/shared/get_internet_services'
+        require 'fog/terremark/requests/shared/get_network'
+        require 'fog/terremark/requests/shared/get_node_services'
+        require 'fog/terremark/requests/shared/get_organization'
+        require 'fog/terremark/requests/shared/get_organizations'
+        require 'fog/terremark/requests/shared/get_public_ip'
+        require 'fog/terremark/requests/shared/get_public_ips'
+        require 'fog/terremark/requests/shared/get_task'
+        require 'fog/terremark/requests/shared/get_tasks_list'
+        require 'fog/terremark/requests/shared/get_vapp'
+        require 'fog/terremark/requests/shared/get_vapp_template'
+        require 'fog/terremark/requests/shared/get_vdc'
+        require 'fog/terremark/requests/shared/instantiate_vapp_template'
+        require 'fog/terremark/requests/shared/reset'
+        require 'fog/terremark/requests/shared/power_off'
+        require 'fog/terremark/requests/shared/power_on'
+        require 'fog/terremark/requests/shared/shutdown'
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/vcloud.rb

@@ -0,0 +1,98 @@
+module Fog
+  module Terremark
+   module Vcloud
+
+     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::Vcloud::Mock.new(options)
+        else
+          Fog::Terremark::Vcloud::Real.new(options)
+        end
+     end
+
+     class Real
+
+       include Fog::Terremark::Shared::Real
+       include Fog::Terremark::Shared::Parser
+
+        def initialize(options={})
+          @terremark_password = options[:terremark_vcloud_password]
+          @terremark_username = options[:terremark_vcloud_username]
+          @host   = options[:host]   || "services.vcloudexpress.terremark.com"
+          @path   = options[:path]   || "/api/v0.8"
+          @port   = options[:port]   || 443
+          @scheme = options[:scheme] || 'https'
+          @cookie = get_organizations.headers['Set-Cookie']
+        end
+
+        def default_vdc_id
+          if default_organization_id
+            @default_vdc_id ||= begin
+              vdcs = get_organization(default_organization_id).body['Links'].select {|link|
+                link['type'] == 'application/vnd.vmware.vcloud.vdc+xml'
+              }
+              if vdcs.length == 1
+                vdcs.first['href'].split('/').last.to_i
+              else
+                nil
+              end
+            end
+          else
+            nil
+          end
+        end
+
+        def default_network_id
+          if default_vdc_id
+            @default_network_id ||= begin
+              networks = get_vdc(default_vdc_id).body['AvailableNetworks']
+              if networks.length == 1
+                networks.first['href'].split('/').last.to_i
+              else
+                nil
+              end
+            end
+          else
+            nil
+          end
+        end
+
+        def default_public_ip_id
+          if default_vdc_id
+            @default_public_ip_id ||= begin
+              ips = get_public_ips(default_vdc_id).body['PublicIpAddresses']
+              if ips.length == 1
+                ips.first['href'].split('/').last.to_i
+              else
+                nil
+              end
+            end
+          else
+            nil
+          end
+        end
+      end
+
+     class Mock
+       include Fog::Terremark::Shared::Mock
+       include Fog::Terremark::Shared::Parser
+     end
+
+    end
+  end
+end
+
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 77
-  version: 0.0.77
+  - 78
+  version: 0.0.78
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -07:00
+date: 2010-04-25 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -258,6 +258,7 @@ files:
 - lib/fog/collection.rb
 - lib/fog/connection.rb
 - lib/fog/credentials.rb
+- lib/fog/deprecation.rb
 - lib/fog/model.rb
 - lib/fog/parser.rb
 - lib/fog/rackspace.rb
@@ -331,52 +332,62 @@ files:
 - lib/fog/ssh.rb
 - lib/fog/terremark.rb
 - lib/fog/terremark/bin.rb
-- lib/fog/terremark/models/server.rb
-- lib/fog/terremark/models/servers.rb
-- lib/fog/terremark/models/task.rb
-- lib/fog/terremark/models/tasks.rb
-- lib/fog/terremark/parsers/get_catalog.rb
-- lib/fog/terremark/parsers/get_catalog_item.rb
-- lib/fog/terremark/parsers/get_internet_services.rb
-- lib/fog/terremark/parsers/get_node_services.rb
-- lib/fog/terremark/parsers/get_organization.rb
-- lib/fog/terremark/parsers/get_organizations.rb
-- lib/fog/terremark/parsers/get_public_ips.rb
-- lib/fog/terremark/parsers/get_tasks_list.rb
-- lib/fog/terremark/parsers/get_vapp_template.rb
-- lib/fog/terremark/parsers/get_vdc.rb
-- lib/fog/terremark/parsers/instantiate_vapp_template.rb
-- lib/fog/terremark/parsers/internet_service.rb
-- lib/fog/terremark/parsers/node_service.rb
-- lib/fog/terremark/parsers/public_ip.rb
-- lib/fog/terremark/parsers/task.rb
-- lib/fog/terremark/parsers/vapp.rb
-- lib/fog/terremark/requests/add_internet_service.rb
-- lib/fog/terremark/requests/add_node_service.rb
-- lib/fog/terremark/requests/create_internet_service.rb
-- lib/fog/terremark/requests/delete_internet_service.rb
-- lib/fog/terremark/requests/delete_node_service.rb
-- lib/fog/terremark/requests/delete_public_ip.rb
-- lib/fog/terremark/requests/delete_vapp.rb
-- lib/fog/terremark/requests/deploy_vapp.rb
-- lib/fog/terremark/requests/get_catalog.rb
-- lib/fog/terremark/requests/get_catalog_item.rb
-- lib/fog/terremark/requests/get_internet_services.rb
-- lib/fog/terremark/requests/get_node_services.rb
-- lib/fog/terremark/requests/get_organization.rb
-- lib/fog/terremark/requests/get_organizations.rb
-- lib/fog/terremark/requests/get_public_ip.rb
-- lib/fog/terremark/requests/get_public_ips.rb
-- lib/fog/terremark/requests/get_task.rb
-- lib/fog/terremark/requests/get_tasks_list.rb
-- lib/fog/terremark/requests/get_vapp.rb
-- lib/fog/terremark/requests/get_vapp_template.rb
-- lib/fog/terremark/requests/get_vdc.rb
-- lib/fog/terremark/requests/instantiate_vapp_template.rb
-- lib/fog/terremark/requests/power_off.rb
-- lib/fog/terremark/requests/power_on.rb
-- lib/fog/terremark/requests/reset.rb
-- lib/fog/terremark/requests/shutdown.rb
+- lib/fog/terremark/ecloud.rb
+- lib/fog/terremark/models/shared/address.rb
+- lib/fog/terremark/models/shared/addresses.rb
+- lib/fog/terremark/models/shared/network.rb
+- lib/fog/terremark/models/shared/networks.rb
+- lib/fog/terremark/models/shared/server.rb
+- lib/fog/terremark/models/shared/servers.rb
+- lib/fog/terremark/models/shared/task.rb
+- lib/fog/terremark/models/shared/tasks.rb
+- lib/fog/terremark/parser.rb
+- lib/fog/terremark/parsers/shared/get_catalog.rb
+- lib/fog/terremark/parsers/shared/get_catalog_item.rb
+- lib/fog/terremark/parsers/shared/get_internet_services.rb
+- lib/fog/terremark/parsers/shared/get_node_services.rb
+- lib/fog/terremark/parsers/shared/get_organization.rb
+- lib/fog/terremark/parsers/shared/get_organizations.rb
+- lib/fog/terremark/parsers/shared/get_public_ips.rb
+- lib/fog/terremark/parsers/shared/get_tasks_list.rb
+- lib/fog/terremark/parsers/shared/get_vapp_template.rb
+- lib/fog/terremark/parsers/shared/get_vdc.rb
+- lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb
+- lib/fog/terremark/parsers/shared/internet_service.rb
+- lib/fog/terremark/parsers/shared/network.rb
+- lib/fog/terremark/parsers/shared/node_service.rb
+- lib/fog/terremark/parsers/shared/public_ip.rb
+- lib/fog/terremark/parsers/shared/task.rb
+- lib/fog/terremark/parsers/shared/vapp.rb
+- lib/fog/terremark/requests/shared/add_internet_service.rb
+- lib/fog/terremark/requests/shared/add_node_service.rb
+- lib/fog/terremark/requests/shared/create_internet_service.rb
+- lib/fog/terremark/requests/shared/delete_internet_service.rb
+- lib/fog/terremark/requests/shared/delete_node_service.rb
+- lib/fog/terremark/requests/shared/delete_public_ip.rb
+- lib/fog/terremark/requests/shared/delete_vapp.rb
+- lib/fog/terremark/requests/shared/deploy_vapp.rb
+- lib/fog/terremark/requests/shared/get_catalog.rb
+- lib/fog/terremark/requests/shared/get_catalog_item.rb
+- lib/fog/terremark/requests/shared/get_internet_services.rb
+- lib/fog/terremark/requests/shared/get_network.rb
+- lib/fog/terremark/requests/shared/get_node_services.rb
+- lib/fog/terremark/requests/shared/get_organization.rb
+- lib/fog/terremark/requests/shared/get_organizations.rb
+- lib/fog/terremark/requests/shared/get_public_ip.rb
+- lib/fog/terremark/requests/shared/get_public_ips.rb
+- lib/fog/terremark/requests/shared/get_task.rb
+- lib/fog/terremark/requests/shared/get_tasks_list.rb
+- lib/fog/terremark/requests/shared/get_vapp.rb
+- lib/fog/terremark/requests/shared/get_vapp_template.rb
+- lib/fog/terremark/requests/shared/get_vdc.rb
+- lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
+- lib/fog/terremark/requests/shared/power_off.rb
+- lib/fog/terremark/requests/shared/power_on.rb
+- lib/fog/terremark/requests/shared/reset.rb
+- lib/fog/terremark/requests/shared/shutdown.rb
+- lib/fog/terremark/shared.rb
+- lib/fog/terremark/vcloud.rb
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
 - spec/aws/models/ec2/flavors_spec.rb