fog 0.2.30 → 0.3.0

data/lib/fog/slicehost/requests/compute/get_image.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Slicehost
+    class Compute
+      class Real
+
+        require 'fog/slicehost/parsers/compute/get_image'
+
+        # Get details of an image
+        #
+        # ==== Parameters
+        # * image_id<~Integer> - Id of image to lookup
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * 'id'<~Integer> - Id of the image
+        #     * 'name'<~String> - Name of the image
+        def get_image(image_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::Compute::GetImage.new,
+            :path     => "images/#{image_id}.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_image(image_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/compute/get_images.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Slicehost
+    class Compute
+      class Real
+
+        require 'fog/slicehost/parsers/compute/get_images'
+
+        # Get list of images
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * 'id'<~Integer> - Id of the image
+        #     * 'name'<~String> - Name of the image
+        def get_images
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::Compute::GetImages.new,
+            :path     => 'images.xml'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_images
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/compute/get_slice.rb

@@ -0,0 +1,46 @@
+module Fog
+  module Slicehost
+    class Compute
+      class Real
+
+        require 'fog/slicehost/parsers/compute/get_slice'
+
+        # Get details of a slice
+        #
+        # ==== Parameters
+        # * slice_id<~Integer> - Id of slice to lookup
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'addresses'<~Array> - Ip addresses for the slice
+        #     * 'backup-id'<~Integer> - Id of backup slice was booted from
+        #     * 'bw-in'<~Float> - Incoming bandwidth total for current billing cycle, in Gigabytes
+        #     * 'bw-out'<~Float> - Outgoing bandwidth total for current billing cycle, in Gigabytes
+        #     * 'flavor_id'<~Integer> - Id of flavor slice was booted from
+        #     * 'id'<~Integer> - Id of the slice
+        #     * 'image-id'<~Integer> - Id of image slice was booted from
+        #     * 'name'<~String> - Name of the slice
+        #     * 'progress'<~Integer> - Progress of current action, in percentage
+        #     * 'status'<~String> - Current status of the slice
+        def get_slice(slice_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::Compute::GetSlice.new,
+            :path     => "/slices/#{slice_id}.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_slice(id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/compute/get_slices.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Slicehost
+    class Compute
+      class Real
+
+        require 'fog/slicehost/parsers/compute/get_slices'
+
+        # Get list of slices
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * 'addresses'<~Array> - Ip addresses for the slice
+        #     * 'backup-id'<~Integer> - Id of backup slice was booted from
+        #     * 'bw-in'<~Float> - Incoming bandwidth total for current billing cycle, in Gigabytes
+        #     * 'bw-out'<~Float> - Outgoing bandwidth total for current billing cycle, in Gigabytes
+        #     * 'flavor_id'<~Integer> - Id of flavor slice was booted from
+        #     * 'id'<~Integer> - Id of the slice
+        #     * 'image-id'<~Integer> - Id of image slice was booted from
+        #     * 'name'<~String> - Name of the slice
+        #     * 'progress'<~Integer> - Progress of current action, in percentage
+        #     * 'status'<~String> - Current status of the slice
+        def get_slices
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Slicehost::Compute::GetSlices.new,
+            :path     => 'slices.xml'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_slices
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/slicehost/requests/compute/reboot_slice.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Slicehost
+    class Compute
+      class Real
+
+        # Reboot slice
+        # ==== Parameters
+        # * slice_id<~Integer> - Id of server to reboot
+        # * type<~String> - Type of reboot, must be in ['HARD', 'SOFT']
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'addresses'<~Array> - Ip addresses for the slice
+        #     * 'backup-id'<~Integer> - Id of backup slice was booted from
+        #     * 'bw-in'<~Float> - Incoming bandwidth total for current billing cycle, in Gigabytes
+        #     * 'bw-out'<~Float> - Outgoing bandwidth total for current billing cycle, in Gigabytes
+        #     * 'flavor_id'<~Integer> - Id of flavor slice was booted from
+        #     * 'id'<~Integer> - Id of the slice
+        #     * 'image-id'<~Integer> - Id of image slice was booted from
+        #     * 'name'<~String> - Name of the slice
+        #     * 'progress'<~Integer> - Progress of current action, in percentage
+        #     * 'status'<~String> - Current status of the slice
+        def reboot_slice(slice_id, type = 'SOFT')
+          request(
+            :expects  => 200,
+            :method   => 'PUT',
+            :parser   => Fog::Parsers::Slicehost::Compute::GetSlice.new,
+            :path     => "/slices/#{slice_id}/#{'hard_' if type == 'HARD'}reboot.xml"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def reboot_slice(id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/ssh.rb

@@ -2,8 +2,8 @@ module Fog
   module SSH
 
     def self.new(address, username, options = {})
-      unless options[:keys] || options[:password]
-        raise ArgumentError.new(':keys or :password are required to initialize SSH')
+      unless options[:key_data] || options[:keys] || options[:password]
+        raise ArgumentError.new(':key_data, :keys or :password are required to initialize SSH')
       end
       if Fog.mocking?
         Fog::SSH::Mock.new(address, username, options)
@@ -41,7 +41,8 @@ module Fog
       def initialize(address, username, options)
         @address  = address
         @username = username
-        @options  = options.merge!(:paranoid => false)
+        @options  = options.merge(:paranoid => false)
+        @options.merge(:verbose => true)
       end
 
       def run(commands)
@@ -50,11 +51,11 @@ module Fog
         begin
           Net::SSH.start(@address, @username, @options) do |ssh|
             commands.each do |command|
+              sudoable_command  = command.sub(/^sudo/, %{sudo -p 'fog sudo password:'})
+              escaped_command   = sudoable_command.sub(/'/, %{'"'"'})
+              result = Result.new(escaped_command)
               ssh.open_channel do |channel|
-                sudoable_command  = command.sub(/^sudo/, %{sudo -p 'fog sudo password:'})
-                escaped_command   = sudoable_command.sub(/'/, %{'"'"'})
                 channel.request_pty
-                result = Result.new(escaped_command)
                 channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
                   unless success
                     raise "Could not execute command: #{command.inspect}"
@@ -77,9 +78,9 @@ module Fog
                     result.status = 255
                   end
                 end
-                results << result
               end
               ssh.loop
+              results << result
             end
           end
         rescue Net::SSH::HostKeyMismatch => exception
@@ -96,6 +97,14 @@ module Fog
 
       attr_accessor :command, :stderr, :stdout, :status
 
+      def display_stdout
+        Formatador.display_line(stdout.split("\r\n"))
+      end
+
+      def display_stderr
+        Formatador.display_line(stderr.split("\r\n"))
+      end
+
       def initialize(command)
         @command = command
         @stderr = ''

data/lib/fog/terremark/bin.rb

@@ -1,44 +1,36 @@
-module Terremark
+class Terremark < Fog::Bin
   class << self
-    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 available?
+      Fog::Terremark::ECLOUD_OPTIONS.all? {|requirement| Fog.credentials.include?(requirement)} ||
+      Fog::Terremark::VCLOUD_OPTIONS.all? {|requirement| Fog.credentials.include?(requirement)}
+    end
 
-      def terremark_service(service)
-        case service
-        when :ecloud
-          Fog::Terremark::Ecloud
-        when :vcloud
-          Fog::Terremark::Vcloud
-        else
-          raise "Unsupported Terremark Service"
-        end
+    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|
-            case key
-            when :ecloud
-              !Fog::Terremark::ECLOUD_OPTIONS.include?(k)
-            when :vcloud
-              !Fog::Terremark::VCLOUD_OPTIONS.include?(k)
-            end
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        credentials = Fog.credentials.reject do |k,v|
+          case key
+          when :ecloud
+            !Fog::Terremark::ECLOUD_OPTIONS.include?(k)
+          when :vcloud
+            !Fog::Terremark::VCLOUD_OPTIONS.include?(k)
           end
-          hash[key] = terremark_service(key).new(credentials)
         end
-        @@connections[service]
+        hash[key] = terremark_service(key).new(credentials)
       end
-
-    else
-
-      def initialized?
-        false
-      end
-
+      @@connections[service]
     end
+
   end
 end

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

@@ -8,7 +8,7 @@ module Fog
 
         identity :id
 
-        attribute :ip, 'name'
+        attribute :ip, :aliases => 'name'
 
         def destroy
          requires :id

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

@@ -8,13 +8,13 @@ module Fog
 
         identity :id
 
-        attribute :end_time,    'endTime'
-        attribute :owner,       'Owner'
-        attribute :result,      'Result'
-        attribute :start_time,  'startTime'
+        attribute :end_time,    :aliases => 'endTime'
+        attribute :owner,       :aliases => 'Owner'
+        attribute :result,      :aliases => 'Result'
+        attribute :start_time,  :aliases => 'startTime'
         attribute :status
-        attribute :link,         'Link'
-        attribute :error,        'Error'
+        attribute :link,        :aliases => 'Link'
+        attribute :error,       :aliases => 'Error'
 
         def initialize(attributes = {})
           new_owner  = attributes.delete('Owner')

data/lib/fog/vcloud.rb

@@ -2,10 +2,7 @@ require 'builder'
 require 'fog/vcloud/model'
 require 'fog/vcloud/collection'
 require 'fog/vcloud/generators'
-require 'fog/vcloud/extension'
-require 'fog/vcloud/terremark/ecloud'
-require 'fog/vcloud/terremark/vcloud'
-
+# ecloud/vcloud requires at the bottom so that the following will be defined
 
 module URI
   class Generic
@@ -16,14 +13,13 @@ module URI
 end
 
 module Fog
-  module Vcloud
-    extend Fog::Service
+  class Vcloud < Fog::Service
 
     requires :username, :password, :versions_uri
 
     model_path 'fog/vcloud/models'
-    model 'vdc'
-    model 'vdcs'
+    model :vdc
+    collection :vdcs
 
     request_path 'fog/vcloud/requests'
     request :login
@@ -32,23 +28,64 @@ module Fog
     request :get_organization
     request :get_network
 
-    def self.after_new(instance, options={})
-      if mod = options[:module]
-        instance.extend eval("#{mod}")
-      end 
-      instance
-    end
-
     class UnsupportedVersion < Exception ; end
 
+    module Shared
+
+      def default_organization_uri
+        @default_organization_uri ||= begin
+          unless @login_results
+            do_login
+          end
+          case @login_results.body[:Org]
+          when Array
+            @login_results.body[:Org].first[:href]
+          when Hash
+            @login_results.body[:Org][:href]
+          else
+            nil
+          end
+        end
+      end
+
+      # login handles the auth, but we just need the Set-Cookie
+      # header from that call.
+      def do_login
+        @login_results = login
+        @cookie = @login_results.headers['Set-Cookie']
+      end
+
+      def supported_versions
+        @supported_versions ||= get_versions(@versions_uri).body[:VersionInfo]
+      end
+
+      def xmlns
+        { "xmlns" => "http://www.vmware.com/vcloud/v0.8",
+          "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+          "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+      end
+
+      # private
+
+      def ensure_unparsed(uri)
+        if uri.is_a?(String)
+          uri
+        else
+          uri.to_s
+        end
+      end
+
+    end
+
     class Real
+      include Shared
       extend Fog::Vcloud::Generators
 
       attr_accessor :login_uri
       attr_reader :versions_uri
 
       def supporting_versions
-        ["v0.8"]
+        ["0.8"]
       end
 
       def initialize(options = {})
@@ -77,12 +114,6 @@ module Fog
         end
       end
 
-      def xmlns
-        { "xmlns" => "http://www.vmware.com/vcloud/v0.8",
-          "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
-          "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
-      end
-
       def reload
         @connections.each_value { |k,v| v.reset if v }
       end
@@ -102,10 +133,6 @@ module Fog
         end
       end
 
-      def supported_versions
-        @supported_versions ||= get_versions(@versions_uri).body[:VersionInfo]
-      end
-
       private
 
       def ensure_parsed(uri)
@@ -116,14 +143,6 @@ module Fog
         end
       end
 
-      def ensure_unparsed(uri)
-        if uri.is_a?(String)
-          uri
-        else
-          uri.to_s
-        end
-      end
-
       def supported_version_numbers
         case supported_versions
         when Array
@@ -227,7 +246,9 @@ module Fog
       end
     end
 
-    class Mock < Real
+    class Mock
+      include Shared
+
       def self.base_url
         "https://fakey.com/api/v0.8"
       end
@@ -358,7 +379,7 @@ module Fog
         end
       end
 
-      def initialize(credentials = {})
+      def initialize(options = {})
         @versions_uri = URI.parse('https://vcloud.fakey.com/api/versions')
       end
 
@@ -392,3 +413,6 @@ module Fog
     end
   end
 end
+
+require 'fog/vcloud/terremark/ecloud'
+require 'fog/vcloud/terremark/vcloud'