fog 1.8.0 → 1.9.0

data/lib/fog/rackspace/models/block_storage/snapshot.rb

@@ -26,7 +26,8 @@ module Fog
 
         def save(force = false)
           requires :volume_id
-          data = connection.create_snapshot(volume_id, {
+          raise IdentifierTaken.new('Resaving may cause a duplicate snapshot to be created') if persisted?
+          data = service.create_snapshot(volume_id, {
             :display_name => display_name,
             :display_description => display_description,
             :force => force
@@ -37,7 +38,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_snapshot(identity)
+          service.delete_snapshot(identity)
           true
         end
       end

data/lib/fog/rackspace/models/block_storage/snapshots.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::BlockStorage::Snapshot
 
         def all
-          data = connection.list_snapshots.body['snapshots']
+          data = service.list_snapshots.body['snapshots']
           load(data)
         end
 
         def get(snapshot_id)
-          data = connection.get_snapshot(snapshot_id).body['snapshot']
+          data = service.get_snapshot(snapshot_id).body['snapshot']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil

data/lib/fog/rackspace/models/block_storage/volume.rb

@@ -32,12 +32,18 @@ module Fog
         end
 
         def snapshots
-          connection.snapshots.select { |s| s.volume_id == identity }
+          service.snapshots.select { |s| s.volume_id == identity }
+        end
+
+        def create_snapshot(options={})
+          requires :identity
+          service.snapshots.create(options.merge(:volume_id => identity))
         end
 
         def save
           requires :size
-          data = connection.create_volume(size, {
+          raise IdentifierTaken.new('Resaving may cause a duplicate volume to be created') if persisted?
+          data = service.create_volume(size, {
             :display_name => display_name,
             :display_description => display_description,
             :volume_type => volume_type,
@@ -49,7 +55,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_volume(identity)
+          service.delete_volume(identity)
           true
         end
       end

data/lib/fog/rackspace/models/block_storage/volume_types.rb

@@ -9,16 +9,16 @@ module Fog
         model Fog::Rackspace::BlockStorage::VolumeType
 
         def all
-          data = connection.list_volume_types.body['volume_types']
+          data = service.list_volume_types.body['volume_types']
           load(data)
         end
 
         def get(volume_type_id)
-          data = connection.get_volume_type(volume_type_id).body['volume_type']
+          data = service.get_volume_type(volume_type_id).body['volume_type']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil
-        end   
+        end
       end
     end
   end

data/lib/fog/rackspace/models/block_storage/volumes.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::BlockStorage::Volume
 
         def all
-          data = connection.list_volumes.body['volumes']
+          data = service.list_volumes.body['volumes']
           load(data)
         end
 
         def get(volume_id)
-          data = connection.get_volume(volume_id).body['volume']
+          data = service.get_volume(volume_id).body['volume']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil

data/lib/fog/rackspace/models/compute/flavors.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Rackspace::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::Rackspace::NotFound
           nil

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

@@ -24,7 +24,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_image(id)
+          service.delete_image(id)
           true
         end
 
@@ -33,10 +33,10 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :server_id
 
-          data = connection.create_image(server_id, 'name' => name)
+          data = service.create_image(server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end

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

@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           models = load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(image_id)
-          data = connection.get_image_details(image_id).body['image']
+          data = service.get_image_details(image_id).body['image']
           new(data)
         rescue Fog::Compute::Rackspace::NotFound
           nil

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

@@ -28,23 +28,23 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def images
           requires :id
-          connection.images(:server => self)
+          service.images(:server => self)
         end
 
         def private_ip_address
@@ -61,12 +61,12 @@ module Fog
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :flavor_id, :image_id
           options = {
             'metadata'    => metadata,
@@ -74,7 +74,7 @@ module Fog
             'personality' => personality
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(flavor_id, image_id, options)
+          data = service.create_server(flavor_id, image_id, options)
           merge_attributes(data.body['server'])
           true
         end

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Rackspace::Server
 
         def all
-          data = connection.list_servers_detail.body['servers']
+          data = service.list_servers_detail.body['servers']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::Rackspace::NotFound

data/lib/fog/rackspace/models/compute_v2/attachment.rb

@@ -4,27 +4,31 @@ module Fog
   module Compute
     class RackspaceV2
       class Attachment < Fog::Model
-        identity :id
-
         attribute :server_id, :aliases => 'serverId'
         attribute :volume_id, :aliases => 'volumeId'
         attribute :device
 
+        def initialize(new_attributes = {})
+          super(new_attributes)
+          server_id = server.id if server #server id should come from collection
+          self
+        end
+        
         def save
-          requires :server, :identity, :device
-          data = connection.attach_volume(server.identity, identity, device)
+          requires :server_id, :volume_id, :device
+          data = service.attach_volume(server_id, volume_id, device)
           merge_attributes(data.body['volumeAttachment'])
           true
         end
 
         def destroy
-          requires :server, :identity
-          connection.delete_attachment(server.identity, identity)
+          requires :server_id, :volume_id
+          service.delete_attachment(server_id, volume_id)
           true
         end
-
-        private
-
+        alias :detach :destroy
+        
+      private
         def server
           collection.server
         end

data/lib/fog/rackspace/models/compute_v2/attachments.rb

@@ -11,12 +11,12 @@ module Fog
         attr_accessor :server
 
         def all
-          data = connection.list_attachments(server.id).body['volumeAttachments']
+          data = service.list_attachments(server.id).body['volumeAttachments']
           load(data)
         end
 
         def get(volume_id)
-          data = connection.get_attachment(server.id, volume_id).body['volumeAttachment']
+          data = service.get_attachment(server.id, volume_id).body['volumeAttachment']
           data && new(data)
         end
       end

data/lib/fog/rackspace/models/compute_v2/flavors.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Compute::RackspaceV2::Flavor
 
         def all
-          data = connection.list_flavors.body['flavors']
+          data = service.list_flavors.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor(flavor_id).body['flavor']
+          data = service.get_flavor(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::RackspaceV2::NotFound
           nil

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

@@ -21,9 +21,44 @@ module Fog
         attribute :progress
         attribute :minDisk
         attribute :minRam
-        attribute :metadata
         attribute :disk_config, :aliases => 'OS-DCF:diskConfig'
         attribute :links
+        
+        ignore_attributes :metadata        
+                
+        def initialize(attributes={})
+          @connection = attributes[:connection]
+          super
+        end
+        
+        def metadata
+          raise "Please save image before accessing metadata" unless identity          
+          @metadata ||= begin
+            Fog::Compute::RackspaceV2::Metadata.new({
+              :connection => connection,
+              :parent => self
+            })
+          end
+        end
+        
+        def metadata=(hash={})
+          raise "Please save image before accessing metadata" unless identity
+          metadata.from_hash(hash)
+        end
+
+        def ready?(ready_state = ACTIVE, error_states=[ERROR])
+          if error_states
+            error_states = Array(error_states)
+            raise "Image should have transitioned to '#{ready_state}' not '#{state}'" if error_states.include?(state)
+          end
+          state == ready_state
+        end
+        
+
+        def destroy
+          requires :identity
+          service.delete_image(identity)
+        end
       end
     end
   end

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

@@ -9,12 +9,12 @@ module Fog
         model Fog::Compute::RackspaceV2::Image
 
         def all
-          data = connection.list_images.body['images']
+          data = service.list_images.body['images']
           load(data)
         end
 
         def get(image_id)
-          data = connection.get_image(image_id).body['image']
+          data = service.get_image(image_id).body['image']
           new(data)
         rescue Fog::Compute::RackspaceV2::NotFound
           nil

data/lib/fog/rackspace/models/compute_v2/meta_parent.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Compute
+    class RackspaceV2
+      module MetaParent
+
+        def parent
+          @parent
+        end
+
+        def parent=(new_parent)
+          @parent = new_parent
+        end
+
+        def collection_name
+          if parent.class == Fog::Compute::RackspaceV2::Image
+            return "images"
+          elsif parent.class == Fog::Compute::RackspaceV2::Server
+            return "servers"
+          else
+            raise "Metadata is not supported for this model type."
+          end
+        end
+
+        def metas_to_hash(metas)
+          hash = {}
+          metas.each { |meta| hash[meta.key] = meta.value }
+          hash
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/compute_v2/metadata.rb

@@ -0,0 +1,77 @@
+require 'fog/core/collection'
+require 'fog/rackspace/models/compute_v2/meta_parent'
+require 'fog/rackspace/models/compute_v2/metadatum'
+require 'fog/rackspace/models/compute_v2/image'
+require 'fog/rackspace/models/compute_v2/server'
+
+module Fog
+  module Compute
+    class RackspaceV2
+
+      class Metadata < Fog::Collection
+
+        model Fog::Compute::RackspaceV2::Metadatum
+
+        include Fog::Compute::RackspaceV2::MetaParent
+
+        def all
+          requires :parent
+          data = connection.list_metadata(collection_name, parent.id).body['metadata']
+          from_hash(data)
+        end
+
+        def get(key)
+          requires :parent
+          data = connection.get_metadata_item(collection_name, parent.id, key).body["meta"]          
+          datum = data.first
+          new(:key => datum[0], :value => datum[1])
+        rescue Fog::Compute::RackspaceV2::NotFound
+          nil
+        end
+        
+        def [](key)
+          return super(key) if key.is_a?(Integer)
+          return nil unless key
+          datum = self.find {|datum| datum.key == key || datum.key == key.to_sym }
+          datum ? datum.value : nil
+        end
+        
+        def []=(key, value)
+          return super(key,value) if key.is_a?(Integer)          
+          return nil unless key
+          datum = self.find {|datum| datum.key == key || datum.key == key.to_sym }
+          if datum
+            data.value = value
+          else
+            self << Fog::Compute::RackspaceV2::Metadatum.new(:key => key, :value => value, :connection => connection, :parent => parent)
+          end
+          value
+        end
+        
+        def save
+          requires :parent
+          connection.set_metadata(collection_name, parent.id, to_hash)          
+        end
+
+        def new(attributes = {})
+          requires :parent
+          super({ :parent => parent }.merge!(attributes))
+        end
+
+        def from_hash(hash)
+          return unless hash
+          metas = []
+          hash.each_pair {|k,v| metas << {:key => k, :value => v} }
+          load(metas)
+        end
+        
+        def to_hash
+          h = {}
+          self.each { |datum| h[datum.key] = datum.value }
+          h
+        end
+
+      end
+    end
+  end
+end