fog 0.0.31 → 0.0.32

data/lib/fog/collection.rb

@@ -1,6 +1,10 @@
 module Fog
   class Collection < Array
 
+    def self._load(marhsalled)
+      new(Marshal.load(marshalled))
+    end
+
     def self.attribute(name, other_names = [])
       class_eval <<-EOS, __FILE__, __LINE__
         attr_accessor :#{name}
@@ -24,6 +28,10 @@ module Fog
       @attributes ||= []
     end
 
+    def _dump
+      Marshal.dump(attributes)
+    end
+
     def attributes
       attributes = {}
       for attribute in self.class.attributes
@@ -32,6 +40,14 @@ module Fog
       attributes
     end
 
+    def connection=(new_connection)
+      @connection = new_connection
+    end
+
+    def connection
+      @connection
+    end
+
     def create(attributes = {})
       object = new(attributes)
       object.save
@@ -85,14 +101,6 @@ module Fog
 
     private
 
-    def connection=(new_connection)
-      @connection = new_connection
-    end
-
-    def connection
-      @connection
-    end
-
     def remap_attributes(attributes, mapping)
       for key, value in mapping
         if attributes.key?(key)

data/lib/fog/model.rb

@@ -1,6 +1,18 @@
 module Fog
   class Model
 
+    def self._load(marshalled)
+      new(Marshal.load(marshalled))
+    end
+
+    def self.aliases
+      @aliases ||= {}
+    end
+
+    def self.attributes
+      @attributes ||= []
+    end
+
     def self.attribute(name, other_names = [])
       class_eval <<-EOS, __FILE__, __LINE__
         attr_accessor :#{name}
@@ -17,12 +29,8 @@ module Fog
       self.attribute(name, other_names)
     end
 
-    def self.aliases
-      @aliases ||= {}
-    end
-
-    def self.attributes
-      @attributes ||= []
+    def _dump
+      Marshal.dump(attributes)
     end
 
     def attributes
@@ -37,6 +45,14 @@ module Fog
       @collection
     end
 
+    def connection=(new_connection)
+      @connection = new_connection
+    end
+
+    def connection
+      @connection
+    end
+
     def identity
       send(self.class.instance_variable_get('@identity'))
     end
@@ -73,20 +89,26 @@ module Fog
       merge_attributes(new_attributes)
     end
 
+    def requires(*args)
+      missing = []
+      for arg in [:connection] | args
+        missing << arg unless send("#{arg}")
+      end
+      unless missing.empty?
+        if missing.length == 1
+          raise(ArgumentError, "#{missing.first} is required for this operation")
+        else
+          raise(ArgumentError, "#{missing[0...-1].join(", ")} and #{missing[-1]} are required for this operation")
+        end
+      end
+    end
+
     private
 
     def collection=(new_collection)
       @collection = new_collection
     end
 
-    def connection=(new_connection)
-      @connection = new_connection
-    end
-
-    def connection
-      @connection
-    end
-
     def remap_attributes(attributes, mapping)
       for key, value in mapping
         if attributes.key?(key)

data/lib/fog/rackspace/models/servers/image.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Rackspace
+    class Servers
+
+      class Image < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :created
+        attribute :updated
+        attribute :status
+        attribute :server_id,   'serverId'
+
+        def server=(new_server)
+          requires :id
+
+          @server_id = new_server.id
+        end
+
+        def destroy
+          requires :id
+
+          connection.delete_image(@id)
+          true
+        end
+
+        def save
+          requires :server_id
+
+          data = connection.create_server(@server_id)
+          merge_attributes(data.body['image'])
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/models/servers/images.rb

@@ -0,0 +1,50 @@
+module Fog
+  module Rackspace
+    class Servers
+
+      def addresses(attributes = {})
+        Fog::AWS::EC2::Addresses.new({
+          :connection => self
+        }.merge!(attributes))
+      end
+
+      def images(attributes = {})
+        Fog::Rackspace::Servers::Images.new({
+          :connection => self
+        }.merge!(attributes))
+      end
+
+      class Images < Fog::Collection
+
+        model Fog::Rackspace::Servers::Image
+
+        attribute :server
+
+        def all
+          data = connection.list_images_detail.body
+          servers = Fog::Rackspace::Servers::Images.new({
+            :connection => connection
+          })
+          for image in data['images']
+            servers << Fog::Rackspace::Servers::Image.new({
+              :collection => images,
+              :connection => connection
+            }.merge!(image))
+          end
+          if server
+            images = images.select {|image| image.server_id == server.id}
+          end
+          images
+        end
+
+        def get(image_id)
+          connection.get_image_details(image_id)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/models/servers/server.rb

@@ -18,14 +18,30 @@ module Fog
         attribute :metadata
 
         def destroy
+          requires :id
+
           connection.delete_server(@id)
           true
         end
 
+        def images
+          requires :id
+
+          connection.images(:server => self)
+        end
+
+        def reboot(type = 'SOFT')
+          requires :id
+
+          connection.reboot_server(@id, type)
+          true
+        end
+
         def save
-          options = { 'metadata' => @metadata, 'name' => @name, 'personality' => @personality }
+          requires :flavor_id, :image_id, :name
+          options = { 'metadata' => @metadata, 'personality' => @personality }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(@flavor_id, @image_id, options)
+          data = connection.create_server(@flavor_id, @image_id, @name, options)
           merge_attributes(data.body['server'])
           true
         end

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

@@ -43,7 +43,24 @@ else
     module Rackspace
       class Servers
 
-        def create_image
+        def create_image(server_id, options = {})
+          response = Excon::Response.new
+          response.status = 202
+
+          now = Time.now
+          data = {
+            'created'   => now,
+            'id'        => 123456,
+            'name'      => options['name'] || '',
+            'serverId'  => server_id,
+            'status'    => 'SAVING',
+            'updated'   => now,
+          }
+
+          Fog::Rackspace::Servers.data[:last_modified][:images][data['id']] = now
+          Fog::Rackspace::Servers.data[:images][data['id']] = data
+          response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId'].include?(key)} }
+          response
         end
 
       end

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

@@ -34,7 +34,7 @@ unless Fog.mocking?
         #     * 'name<~String> - Name of server
         #     * 'progress'<~Integer> - Progress through current status
         #     * 'status'<~String> - Current server status
-        def create_server(flavor_id, image_id, options = {})
+        def create_server(flavor_id, image_id, name, options = {})
           data = {
             'server' => {
               'flavorId'  => flavor_id,
@@ -74,8 +74,8 @@ else
     module Rackspace
       class Servers
 
-        def create_server(flavor_id, image_id, options = {})
-          response = Fog::Response.new
+        def create_server(flavor_id, image_id, name, options = {})
+          response = Excon::Response.new
           response.status = 202
 
           data = {
@@ -85,12 +85,12 @@ else
             'imageId'   => image_id,
             'hostId'    => "123456789ABCDEF01234567890ABCDEF",
             'metadata'  => options[:metadata] || {},
+            'name'      => name,
             'progress'  => 0,
             'status'    => 'BUILD'
           }
-          data['name'] = "slice#{data[:id]}"
           data['adminPass'] = "#{data['name']}password"
-          Fog::Rackspace::Servers.data[:last_modified][data['id']] = Time.now
+          Fog::Rackspace::Servers.data[:last_modified][:servers][data['id']] = Time.now
           Fog::Rackspace::Servers.data[:servers][data['id']] = data
           response.body = { 'server' => data }
           response

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

@@ -27,7 +27,22 @@ else
     module Rackspace
       class Servers
 
-        def delete_image
+        def delete_image(image_id)
+          response = Excon::Response.new
+          if image = list_images_detail.body['images'].detect {|image| image['id'] == image_id}
+            if image['status'] == 'SAVING'
+              response.status = 409
+              raise(Excon::Errors.status_error({:expects => 202}, response))
+            else
+              Fog::Rackspace::Servers.data[:last_modified][:images].delete(image_id)
+              Fog::Rackspace::Servers.data[:images].delete(image_id)
+              response.status = 202
+            end
+          else
+            response.status = 400
+            raise(Excon::Errors.status_error({:expects => 202}, response))
+          end
+          response
         end
 
       end

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

@@ -28,19 +28,19 @@ else
       class Servers
 
         def delete_server(server_id)
-          response = Fog::Response.new
+          response = Excon::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))
+              raise(Excon::Errors.status_error({:expects => 202}, response))
             else
-              Fog::Rackspace::Servers.data[:last_modified].delete(server_id)
+              Fog::Rackspace::Servers.data[:last_modified][:servers].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))
+            raise(Excon::Errors.status_error({:expects => 202}, response))
           end
           response
         end

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

@@ -43,13 +43,13 @@ else
       class Servers
 
         def get_server_details(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 = { 'server' => server }
           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_addresses.rb

@@ -34,13 +34,13 @@ else
       class Servers
 
         def list_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 = { 'addresses' => server['addresses'] }
           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_images.rb

@@ -30,6 +30,16 @@ else
       class Servers
 
         def list_images
+          response = Excon::Response.new
+          data = list_images_detail.body['images']
+          images = []
+          for image in data
+            images << image.reject { |key, value| !['id', 'name'].include?(key) }
+          end
+          response.status = [200, 203][rand(1)]
+          response.body = { 'images' => images }
+          response
+
         end
 
       end

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

@@ -32,7 +32,22 @@ else
     module Rackspace
       class Servers
 
-        def list_images
+        def list_images_detail
+          response = Excon::Response.new
+
+          images = Fog::Rackspace::Servers.data[:images].values
+          for image in images
+            case image['status']
+            when 'SAVING'
+              if Time.now - Fog::Rackspace::Servers.data[:last_modified][:images][image['id']] > 2
+                image['status'] = 'ACTIVE'
+              end
+            end
+          end
+
+          response.status = [200, 203][rand(1)]
+          response.body = { 'images' => images }
+          response
         end
 
       end