fog 0.0.31 → 0.0.32

data/lib/fog/rackspace/requests/servers/list_private_addresses.rb

@@ -32,13 +32,13 @@ else
       class Servers
 
         def list_private_addresses(server_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
             response.status = [200, 203][rand(1)]
             response.body = { 'private' => server['addresses']['private'] }
           else
             response.status = 404
-            raise(Excon::Errors.status_error(202, 404, response))
+            raise(Excon::Errors.status_error({:expects => 202}, response))
           end
           response
         end

data/lib/fog/rackspace/requests/servers/list_public_addresses.rb

@@ -32,13 +32,13 @@ else
       class Servers
 
         def list_public_addresses(server_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
             response.status = [200, 203][rand(1)]
             response.body = { 'public' => server['addresses']['public'] }
           else
             response.status = 404
-            raise(Excon::Errors.status_error(202, 404, response))
+            raise(Excon::Errors.status_error({:expects => 202}, response))
           end
           response
         end

data/lib/fog/rackspace/requests/servers/list_servers.rb

@@ -31,7 +31,7 @@ else
       class Servers
 
         def list_servers
-          response = Fog::Response.new
+          response = Excon::Response.new
           data = list_servers_detail.body['servers']
           servers = []
           for server in data

data/lib/fog/rackspace/requests/servers/list_servers_detail.rb

@@ -40,13 +40,13 @@ else
       class Servers
 
         def list_servers_detail
-          response = Fog::Response.new
+          response = Excon::Response.new
 
           servers = Fog::Rackspace::Servers.data[:servers].values
           for server in servers
             case server['status']
             when 'BUILD'
-              if Time.now - Fog::Rackspace::Servers.data[:last_modified][server['id']] > 2
+              if Time.now - Fog::Rackspace::Servers.data[:last_modified][:servers][server['id']] > 2
                 server['status'] = 'ACTIVE'
               end
             end

data/lib/fog/rackspace/requests/servers/update_server.rb

@@ -31,7 +31,7 @@ else
       class Servers
 
         def update_server(server_id, options)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
             if options['adminPass']
               server['adminPass'] = options['adminPass']
@@ -42,7 +42,7 @@ else
             response.status = 204
           else
             response.status = 404
-            raise(Excon::Errors.status_error(202, 404, response))
+            raise(Excon::Errors.status_error({:expects => 202}, response))
           end
           response
         end

data/lib/fog/rackspace/servers.rb

@@ -8,7 +8,11 @@ module Fog
         end
         def self.reset_data
           @data = {
-            :last_modified => [],
+            :last_modified => {
+              :images  => {},
+              :servers => {}
+            },
+            :images  => {},
             :servers => {}
           }
         end
@@ -17,6 +21,8 @@ module Fog
       def self.reload
         load "fog/rackspace/models/servers/flavor.rb"
         load "fog/rackspace/models/servers/flavors.rb"
+        load "fog/rackspace/models/servers/image.rb"
+        load "fog/rackspace/models/servers/images.rb"
         load "fog/rackspace/models/servers/server.rb"
         load "fog/rackspace/models/servers/servers.rb"
 
@@ -60,7 +66,7 @@ module Fog
           :expects  => params[:expects],
           :headers  => {
             'X-Auth-Token' => @auth_token
-          },
+          }.merge!(params[:headers] || {}),
           :host     => @host,
           :method   => params[:method],
           :path     => "#{@path}/#{params[:path]}"

data/lib/fog/slicehost.rb

@@ -0,0 +1,66 @@
+module Fog
+  class Slicehost
+
+    if Fog.mocking?
+      def self.data
+        @data
+      end
+      def self.reset_data
+        @data = {}
+      end
+    end
+
+    def self.reload
+      load "fog/slicehost/parsers/create_slice.rb"
+      load "fog/slicehost/parsers/get_backups.rb"
+      load "fog/slicehost/parsers/get_flavors.rb"
+      load "fog/slicehost/parsers/get_images.rb"
+      load "fog/slicehost/parsers/get_slices.rb"
+
+      load "fog/slicehost/requests/create_slice.rb"
+      load "fog/slicehost/requests/delete_slice.rb"
+      load "fog/slicehost/requests/get_backups.rb"
+      load "fog/slicehost/requests/get_flavors.rb"
+      load "fog/slicehost/requests/get_images.rb"
+      load "fog/slicehost/requests/get_slices.rb"
+
+      if Fog.mocking?
+        reset_data
+      end
+    end
+
+    def initialize(options={})
+      @password   = options[:password]
+      @host       = options[:host]      || "api.slicehost.com"
+      @port       = options[:port]      || 443
+      @scheme     = options[:scheme]    || 'https'
+      @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+    end
+
+    def request(params)
+      headers = {
+        'Authorization' => "Basic #{Base64.encode64(@password).gsub("\n",'')}"
+      }
+      case params[:method]
+      when 'DELETE', 'GET', 'HEAD'
+        headers['Accept'] = 'application/xml'
+      when 'POST', 'PUT'
+        headers['Content-Type'] = 'application/xml'
+      end
+
+      response = @connection.request({
+        :body     => params[:body],
+        :expects  => params[:expects],
+        :headers  => headers.merge!(params[:headers] || {}),
+        :host     => @host,
+        :method   => params[:method],
+        :parser   => params[:parser],
+        :path     => params[:path]
+      })
+      response
+    end
+
+  end
+end
+
+Fog::Slicehost.reload

data/lib/fog/slicehost/parsers/create_slice.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class CreateSlice < Fog::Parsers::Base
+
+        def reset
+          @response = {}
+        end
+
+        def end_element(name)
+          case name
+          when 'address'
+            @response['addresses'] ||= []
+            @response['addresses'] << @value
+          when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
+            @response[name] = @value.to_i
+          when 'bw-in', 'bw-out'
+            @response[name] = @value.to_f
+          when 'name', 'root-password', 'status'
+            @response[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/parsers/get_backups.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetBackups < Fog::Parsers::Base
+
+        def reset
+          @backup = {}
+          @response = { 'backups' => [] }
+        end
+
+        def end_element(name)
+          case name
+          when 'backup'
+            @response['backups'] << @backup
+            @backup = {}
+          when 'date'
+            @backup[name] = Time.parse(@value)
+          when 'id', 'slice-id'
+            @backup[name] = @value.to_i
+          when 'name'
+            @backup[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/parsers/get_flavors.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetFlavors < Fog::Parsers::Base
+
+        def reset
+          @flavor = {}
+          @response = { 'flavors' => [] }
+        end
+
+        def end_element(name)
+          case name
+          when 'flavor'
+            @response['flavors'] << @flavor
+            @flavor = {}
+          when 'id', 'price', 'ram'
+            @flavor[name] = @value.to_i
+          when 'name'
+            @flavor[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/parsers/get_images.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetImages < Fog::Parsers::Base
+
+        def reset
+          @image = {}
+          @response = { 'images' => [] }
+        end
+
+        def end_element(name)
+          case name
+          when 'id'
+            @image[name] = @value.to_i
+          when 'image'
+            @response['images'] << @image
+            @image = {}
+          when 'name'
+            @image[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/parsers/get_slices.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetSlices < Fog::Parsers::Base
+
+        def reset
+          @slice = {}
+          @response = { 'slices' => [] }
+        end
+
+        def end_element(name)
+          case name
+          when 'address'
+            @slice['addresses'] ||= []
+            @slice['addresses'] << @value
+          when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
+            @slice[name] = @value.to_i
+          when 'bw-in', 'bw-out'
+            @slice[name] = @value.to_f
+          when 'name', 'status'
+            @slice[name] = @value
+          when 'slice'
+            @response['slices'] << @slice
+            @slice = {}
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/requests/create_slice.rb

@@ -0,0 +1,50 @@
+unless Fog.mocking?
+
+  module Fog
+    class Slicehost
+
+      # Get list of slices
+      # ==== Parameters
+      # * flavor_id<~Integer> - Id of flavor to create slice with
+      # * image_id<~Integer> - Id of image to create slice with
+      # * name<~String> - Name of slice
+      #
+      # ==== 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'<~Integer> - Incoming bandwidth total for current billing cycle, in Gigabytes
+      #     * 'bw-out'<~Integer> - 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
+      #     * 'root-password'<~String> - Root password of slice
+      #     * 'status'<~String> - Current status of the slice
+      def create_slice(flavor_id, image_id, name)
+        request(
+          :body     => %Q{<?xml version="1.0" encoding="UTF-8"?><slice><flavor-id type="integer">#{flavor_id}</flavor-id><image-id type="integer">#{image_id}</image-id><name>#{name}</name></slice>},
+          :expects  => 201,
+          :method   => 'POST',
+          :parser   => Fog::Parsers::Slicehost::CreateSlice.new,
+          :path     => 'slices.xml'
+        )
+      end
+
+    end
+  end
+
+else
+
+  module Fog
+    class Slicehost
+
+      def get_slices
+      end
+
+    end
+  end
+
+end

data/lib/fog/slicehost/requests/delete_slice.rb

@@ -0,0 +1,48 @@
+unless Fog.mocking?
+
+  module Fog
+    class Slicehost
+
+      # Get list of slices
+      # ==== Parameters
+      # * flavor_id<~Integer> - Id of flavor to create slice with
+      # * image_id<~Integer> - Id of image to create slice with
+      # * name<~String> - Name of slice
+      #
+      # ==== 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'<~Integer> - Incoming bandwidth total for current billing cycle, in Gigabytes
+      #     * 'bw-out'<~Integer> - 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
+      #     * 'root-password'<~String> - Root password of slice
+      #     * 'status'<~String> - Current status of the slice
+      def delete_slice(slice_id)
+        request(
+          :expects  => 200,
+          :method   => 'DELETE',
+          :path     => "slices/#{slice_id}.xml"
+        )
+      end
+
+    end
+  end
+
+else
+
+  module Fog
+    class Slicehost
+
+      def get_slices
+      end
+
+    end
+  end
+
+end

data/lib/fog/slicehost/requests/get_backups.rb

@@ -0,0 +1,38 @@
+unless Fog.mocking?
+
+  module Fog
+    class Slicehost
+
+      # Get list of backups
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      #     * 'date'<~Time> - Timestamp of backup creation
+      #     * 'id'<~Integer> - Id of the backup
+      #     * 'name'<~String> - Name of the backup
+      #     * 'slice-id'<~Integer> - Id of slice the backup was made from
+      def get_backups
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :parser   => Fog::Parsers::Slicehost::GetBackups.new,
+          :path     => 'backups.xml'
+        )
+      end
+
+    end
+  end
+
+else
+
+  module Fog
+    class Slicehost
+
+      def get_backups
+      end
+
+    end
+  end
+
+end