fog 0.0.29 → 0.0.30

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

@@ -9,11 +9,11 @@ unless Fog.mocking?
         # ==== Parameters
         # * id<~Integer> - Id of server to delete
         #
-        def delete_server(id)
+        def delete_server(server_id)
           request(
             :expects => 202,
             :method => 'DELETE',
-            :path   => "servers/#{id}"
+            :path   => "servers/#{server_id}"
           )
         end
 
@@ -27,7 +27,22 @@ else
     module Rackspace
       class Servers
 
-        def delete_server
+        def delete_server(server_id)
+          response = Fog::Response.new
+          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+            if server['status'] == 'BUILD'
+              response.status = 409
+              raise(Excon::Errors.status_error(202, 409, response))
+            else
+              Fog::Rackspace::Servers.data[:last_modified].delete(server_id)
+              Fog::Rackspace::Servers.data[:servers].delete(server_id)
+              response.status = 202
+            end
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error(202, 404, response))
+          end
+          response
         end
 
       end

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

@@ -6,8 +6,11 @@ unless Fog.mocking?
 
         # Get details about a server
         #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to get details for
+        #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
@@ -21,11 +24,11 @@ unless Fog.mocking?
         #     * 'name<~String> - Name of server
         #     * 'progress'<~Integer> - Progress through current status
         #     * 'status'<~String> - Current server status
-        def get_server_details(id)
+        def get_server_details(server_id)
           request(
-            :expects  => 200,
+            :expects  => [200, 203],
             :method   => 'GET',
-            :path     => "servers/#{id}.json"
+            :path     => "servers/#{server_id}.json"
           )
         end
 
@@ -39,7 +42,16 @@ else
     module Rackspace
       class Servers
 
-        def get_server_details
+        def get_server_details(server_id)
+          response = Fog::Response.new
+          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+            response.status = [200, 203][rand(1)]
+            response.body = { 'server' => server }
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error(202, 404, response))
+          end
+          response
         end
 
       end

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

@@ -0,0 +1,52 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # List all server addresses
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to list addresses for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #   * 'addresses'<~Array>:
+        #     * 'public'<~Array> - Public ip addresses
+        #     * 'private'<~Array> - Private ip addresses
+        def list_addresses(server_id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "servers/#{server_id}/ips.json"
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def list_addresses(server_id)
+          response = Fog::Response.new
+          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+            response.status = [200, 203][rand(1)]
+            response.body = { 'addresses' => server['addresses'] }
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error(202, 404, response))
+          end
+          response
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -7,15 +7,13 @@ unless Fog.mocking?
         # List all images (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the flavor
         #     * 'name'<~String> - Name of the flavor
-        #     * 'ram'<~Integer> - Amount of ram for the flavor
-        #     * 'disk'<~Integer> - Amount of diskspace for the flavor
         def list_flavors
           request(
-            :expects  => 200,
+            :expects  => [200, 203],
             :method   => 'GET',
             :path     => 'flavors.json'
           )

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

@@ -0,0 +1,41 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # List all images (IDs and names only)
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'id'<~Integer> - Id of the flavor
+        #     * 'name'<~String> - Name of the flavor
+        #     * 'ram'<~Integer> - Amount of ram for the flavor
+        #     * 'disk'<~Integer> - Amount of diskspace for the flavor
+        def list_flavors_detail
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'flavors/detail.json'
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def list_flavors_detail
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all images (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the image
         #     * 'name'<~String> - Name of the image

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

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all images
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the image
         #     * 'name'<~String> - Name of the image

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

@@ -0,0 +1,50 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # List private server addresses
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to list addresses for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'private'<~Array> - Public ip addresses
+        def list_private_addresses(server_id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "servers/#{server_id}/ips/private.json"
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def list_private_addresses(server_id)
+          response = Fog::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))
+          end
+          response
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,50 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        # List public server addresses
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to list addresses for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'public'<~Array> - Public ip addresses
+        def list_public_addresses(server_id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "servers/#{server_id}/ips/public.json"
+          )
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def list_public_addresses(server_id)
+          response = Fog::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))
+          end
+          response
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -7,14 +7,14 @@ unless Fog.mocking?
         # List all servers (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'servers'<~Array>:
         #     * 'id'<~Integer> - Id of server
         #     * 'name<~String> - Name of server
         def list_servers
           request(
-            :expects  => 200,
+            :expects  => [200, 203],
             :method   => 'GET',
             :path     => 'servers.json'
           )
@@ -31,6 +31,15 @@ else
       class Servers
 
         def list_servers
+          response = Fog::Response.new
+          data = list_servers_detail.body['servers']
+          servers = []
+          for server in data
+            servers << server.reject { |key, value| !['id', 'name'].include?(key) }
+          end
+          response.status = [200, 203][rand(1)]
+          response.body = { 'servers' => servers }
+          response
         end
 
       end

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

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all servers details
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'servers'<~Array>:
         #     * 'id'<~Integer> - Id of server
@@ -39,7 +39,22 @@ else
     module Rackspace
       class Servers
 
-        def list_servers_details
+        def list_servers_detail
+          response = Fog::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
+                server['status'] = 'ACTIVE'
+              end
+            end
+          end
+
+          response.status = [200, 203][rand(1)]
+          response.body = { 'servers' => servers }
+          response
         end
 
       end

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

@@ -11,14 +11,11 @@ unless Fog.mocking?
         # * type<~String> - Type of reboot, must be in ['HARD', 'SOFT']
         #
         def reboot_server(server_id, type)
-          data = {
-            'reboot' => { 'type' => type }
-          }
           request(
-            :body     => data.to_json,
+            :body     => { 'reboot' => { 'type' => type }}.to_json,
             :expects  => 202,
             :method   => 'POST',
-            :path     => "servers/#{id}"
+            :path     => "servers/#{server_id}/action.json"
           )
         end
 
@@ -32,7 +29,7 @@ else
     module Rackspace
       class Servers
 
-        def update_server
+        def reboot_server(server_id, type)
         end
 
       end

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

@@ -9,15 +9,14 @@ unless Fog.mocking?
         # ==== Parameters
         # # server_id<~Integer> - Id of server to update
         # * options<~Hash>:
-        #   * name<~String> - New name for server
         #   * adminPass<~String> - New admin password for server
-        #
+        #   * name<~String> - New name for server
         def update_server(server_id, options = {})
           request(
-            :body     => options.to_json,
+            :body     => { 'server' => options }.to_json,
             :expects  => 204,
             :method   => 'PUT',
-            :path     => "servers/#{id}"
+            :path     => "servers/#{server_id}.json"
           )
         end
 
@@ -31,7 +30,21 @@ else
     module Rackspace
       class Servers
 
-        def update_server
+        def update_server(server_id, options)
+          response = Fog::Response.new
+          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+            if options['adminPass']
+              server['adminPass'] = options['adminPass']
+            end
+            if options['name']
+              server['name'] = options['name']
+            end
+            response.status = 204
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error(202, 404, response))
+          end
+          response
         end
 
       end