fog 0.0.73 → 0.0.74

data/lib/fog.rb

@@ -8,6 +8,7 @@ require 'hmac-sha1'
 require 'hmac-sha2'
 require 'json'
 require 'mime/types'
+require 'net/ssh'
 require 'nokogiri'
 require 'time'
 
@@ -21,6 +22,7 @@ require 'fog/collection'
 require 'fog/connection'
 require 'fog/model'
 require 'fog/parser'
+require 'fog/ssh'
 require 'fog/aws'
 require 'fog/rackspace'
 require 'fog/slicehost'
@@ -28,6 +30,8 @@ require 'fog/terremark'
 
 module Fog
 
+  VERSION = '0.0.74'
+
   module Mock
     @delay = 1
     def self.delay

data/lib/fog/aws/requests/s3/get_object.rb

@@ -108,9 +108,19 @@ module Fog
         end
 
         def get_object_url(bucket_name, object_name, expires)
-          raise MockNotImplemented.new("Contributions welcome!")
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          url({
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'GET',
+            :path     => CGI.escape(object_name)
+          }, expires)
         end
-
       end
     end
   end

data/lib/fog/aws/s3.rb

@@ -61,7 +61,19 @@ module Fog
         Mock.reset_data(keys)
       end
 
+      module Utils
+        def url(params, expires)
+          params[:headers]['Date'] = expires.to_i
+          query = [params[:query]].compact
+          query << "AWSAccessKeyId=#{@aws_access_key_id}"
+          query << "Signature=#{CGI.escape(signature(params))}"
+          query << "Expires=#{params[:headers]['Date']}"
+          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
+        end
+      end
+
       class Mock
+        include Utils
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -82,9 +94,13 @@ module Fog
           @data = self.class.data[@aws_access_key_id]
         end
 
+        def signature(params)
+          "foo"
+        end
       end
 
       class Real
+        include Utils
 
         # Initialize connection to S3
         #
@@ -174,16 +190,6 @@ DATA
           hmac = @hmac.update(string_to_sign)
           signature = Base64.encode64(hmac.digest).chomp!
         end
-
-        def url(params, expires)
-          params[:headers]['Date'] = expires.to_i
-          query = [params[:query]].compact
-          query << "AWSAccessKeyId=#{@aws_access_key_id}"
-          query << "Signature=#{CGI.escape(signature(params))}"
-          query << "Expires=#{params[:headers]['Date']}"
-          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
-        end
-
       end
     end
   end

data/lib/fog/ssh.rb

@@ -0,0 +1,42 @@
+module Fog
+
+  class SSH
+
+    def initialize(address, username, options = {})
+      unless options[:keys] || options[:password]
+        raise ArgumentError.new(':keys or :password are required to initialize SSH')
+      end
+      @address  = address
+      @username = username
+      @options  = options.merge!(:paranoid => false)
+    end
+
+    def run(commands)
+      commands = [*commands]
+      results = []
+      Net::SSH.start(@address, @username, @options) do |ssh|
+        commands.each do |command|
+          ssh.open_channel do |channel|
+            channel.request_pty
+            result = { :command => command }
+            channel.exec(command.sub(/^sudo/, %q{sudo -p 'fog sudo password:'})) do |channel, success|
+              channel.on_data do |channel, data|
+                if data.strip == 'fog sudo password:'
+                  channel.send_data("#{@options[:password]}\n")
+                else
+                  result[:data] ||= ''
+                  result[:data] << data
+                end
+              end
+            end
+            results << result
+          end
+          ssh.loop
+        end
+      end
+      results
+    end
+
+  end
+
+end

data/lib/fog/terremark.rb

@@ -1,11 +1,30 @@
 module Fog
   module Terremark
 
+    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
+
     def self.new(options={})
 
       unless @required
+        require 'fog/terremark/models/server'
+        require 'fog/terremark/models/servers'
+        require 'fog/terremark/models/task'
+        require 'fog/terremark/models/tasks'
         require 'fog/terremark/parsers/get_catalog'
         require 'fog/terremark/parsers/get_catalog_item'
+        require 'fog/terremark/parsers/get_internet_services'
+        require 'fog/terremark/parsers/get_node_services'
         require 'fog/terremark/parsers/get_organization'
         require 'fog/terremark/parsers/get_organizations'
         require 'fog/terremark/parsers/get_public_ips'
@@ -15,6 +34,7 @@ module Fog
         require 'fog/terremark/parsers/instantiate_vapp_template'
         require 'fog/terremark/parsers/internet_service'
         require 'fog/terremark/parsers/node_service'
+        require 'fog/terremark/parsers/public_ip'
         require 'fog/terremark/parsers/task'
         require 'fog/terremark/parsers/vapp'
         require 'fog/terremark/requests/add_internet_service'
@@ -26,8 +46,11 @@ module Fog
         require 'fog/terremark/requests/deploy_vapp'
         require 'fog/terremark/requests/get_catalog'
         require 'fog/terremark/requests/get_catalog_item'
+        require 'fog/terremark/requests/get_internet_services'
+        require 'fog/terremark/requests/get_node_services'
         require 'fog/terremark/requests/get_organization'
         require 'fog/terremark/requests/get_organizations'
+        require 'fog/terremark/requests/get_public_ip'
         require 'fog/terremark/requests/get_public_ips'
         require 'fog/terremark/requests/get_task'
         require 'fog/terremark/requests/get_tasks_list'
@@ -56,6 +79,7 @@ module Fog
     end
 
     class Mock
+      include Fog::Terremark::Parser
 
       def self.data
         @data ||= Hash.new do |hash, key|
@@ -77,12 +101,22 @@ module Fog
     end
 
     class Real
+      include Fog::Terremark::Parser
 
       def initialize(options={})
         @terremark_password = options[:terremark_password]
         @terremark_username = options[:terremark_username]
-        @host   = options[:host]   || "services.vcloudexpress.terremark.com"
-        @path   = options[:path]   || "/api/v0.8"
+        @terremark_service  = options[:terremark_service] || :vcloud
+        case options[:terremark_service]
+        when :ecloud
+          @host   = options[:host]   || "services.enterprisecloud.terremark.com"
+          @path   = options[:path]   || "/api/v0.8a-ext2.0"
+        when :vcloud
+          @host   = options[:host]   || "services.vcloudexpress.terremark.com"
+          @path   = options[:path]   || "/api/v0.8"
+        else
+          raise "Unsupported Terremark Service"
+        end
         @port   = options[:port]   || 443
         @scheme = options[:scheme] || 'https'
         @cookie = get_organizations.headers['Set-Cookie']
@@ -147,6 +181,23 @@ module Fog
         end
       end
 
+      def default_tasks_list_id
+        if default_organization_id
+          @default_tasks_list_id ||= begin
+            task_lists = get_organization(default_organization_id).body['Links'].select {|link|
+              link['type'] == 'application/vnd.vmware.vcloud.tasksList+xml'
+            }
+            if task_lists.length == 1
+              task_lists.first['href'].split('/').last.to_i
+            else
+              nil
+            end
+          end
+        else
+          nil
+        end
+      end
+
       private
 
       def request(params)

data/lib/fog/terremark/bin.rb

@@ -6,19 +6,30 @@ module Terremark
         true
       end
 
+      def terremark_service
+        @terremark_service ||= begin
+          Fog.credentials[:terremark_service] || :vcloud
+        end
+      end
+
       def [](service)
         @@connections ||= Hash.new do |hash, key|
           credentials = Fog.credentials.reject do |k,v|
             ![:terremark_username, :terremark_password].include?(k)
           end
-          hash[key] = case key
-          when :vcloud
-            Fog::Terremark.new(credentials)
-          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/models/server.rb

@@ -0,0 +1,54 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+
+    class Server < Fog::Model
+
+      identity :id
+
+      attribute :name
+      attribute :status
+
+      def destroy
+        requires :id
+        task = connection.tasks.new(connection.power_off(@id).body)
+        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)
+        deploy_task = connection.tasks.new(connection.deploy_vapp(@id).body)
+        deploy_task.wait_for { ready? }
+        power_on_task = connection.tasks.new(connection.power_on(@id).body)
+        power_on_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

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

@@ -0,0 +1,53 @@
+require 'fog/collection'
+require 'fog/terremark/models/server'
+
+module Fog
+  module Terremark
+
+    class Mock
+      def servers
+        Fog::Terremark::Servers.new(:connection => self)
+      end
+    end
+
+    class Real
+      def servers
+        Fog::Terremark::Servers.new(:connection => self)
+      end
+    end
+
+    class Servers < Fog::Collection
+
+      model Fog::Terremark::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

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

@@ -0,0 +1,41 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+
+    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

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

@@ -0,0 +1,56 @@
+require 'fog/collection'
+require 'fog/terremark/models/server'
+
+module Fog
+  module Terremark
+
+    class Mock
+      def tasks
+        Fog::Terremark::Tasks.new(:connection => self)
+      end
+    end
+
+    class Real
+      def tasks
+        Fog::Terremark::Tasks.new(:connection => self)
+      end
+    end
+
+    class Tasks < Fog::Collection
+
+      model Fog::Terremark::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