fog 0.8.2 → 0.9.0

data/lib/fog/compute/requests/aws/create_volume.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/create_volume'
@@ -29,7 +29,7 @@ module Fog
             'AvailabilityZone'  => availability_zone,
             'Size'              => size,
             'SnapshotId'        => snapshot_id,
-            :parser             => Fog::Parsers::AWS::Compute::CreateVolume.new
+            :parser             => Fog::Parsers::Compute::AWS::CreateVolume.new
           )
         end
 
@@ -39,9 +39,16 @@ module Fog
 
         def create_volume(availability_zone, size, snapshot_id = nil)
           response = Excon::Response.new
-          if availability_zone && size
-            if snapshot_id && !self.data[:snapshots][snapshot_id]
-              raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+          if availability_zone && (size || snapshot_id)
+            snapshot = self.data[:snapshots][snapshot_id]
+            if snapshot_id && !snapshot
+              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+            end
+
+            if snapshot && size && size != snapshot['volumeSize']
+              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' with the specified size of '#{size}' does not exist.")
+            elsif snapshot && !size
+              size = snapshot['volumeSize']
             end
 
             response.status = 200

data/lib/fog/compute/requests/aws/delete_key_pair.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -22,7 +22,7 @@ module Fog
             'Action'    => 'DeleteKeyPair',
             'KeyName'   => key_name,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 

data/lib/fog/compute/requests/aws/delete_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -22,7 +22,7 @@ module Fog
             'Action'    => 'DeleteSecurityGroup',
             'GroupName' => name,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -40,7 +40,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The security group '#{name}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The security group '#{name}' does not exist")
           end
         end
       end

data/lib/fog/compute/requests/aws/delete_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -22,7 +22,7 @@ module Fog
             'Action'      => 'DeleteSnapshot',
             'SnapshotId'  => snapshot_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::Compute::Basic.new
+            :parser       => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -40,7 +40,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+            raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
           end
         end
 

data/lib/fog/compute/requests/aws/delete_tags.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -21,7 +21,7 @@ module Fog
         def delete_tags(resources, tags)
           resources = [*resources]
           params = {}
-          params.merge!(AWS.indexed_param('ResourceId', resources))
+          params.merge!(Fog::AWS.indexed_param('ResourceId', resources))
 
           # can not rely on indexed_param because nil values should be omitted
           tags.keys.each_with_index do |key, index|
@@ -34,7 +34,7 @@ module Fog
 
           request({
             'Action'            => 'DeleteTags',
-            :parser             => Fog::Parsers::AWS::Compute::Basic.new
+            :parser             => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/delete_volume.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -22,7 +22,7 @@ module Fog
             'Action'    => 'DeleteVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -35,7 +35,7 @@ module Fog
           if volume = self.data[:volumes][volume_id]
             if volume["attachmentSet"].any?
               attach = volume["attachmentSet"].first
-              raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
+              raise Fog::Compute::AWS::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
             end
             self.data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
@@ -46,7 +46,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
 

data/lib/fog/compute/requests/aws/deregister_image.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/deregister_image'
@@ -21,7 +21,7 @@ module Fog
           request(
             'Action'      => 'DeregisterImage',
             'ImageId'     => image_id,
-            :parser       => Fog::Parsers::AWS::Compute::DeregisterImage.new
+            :parser       => Fog::Parsers::Compute::AWS::DeregisterImage.new
           )
         end
 
@@ -43,7 +43,7 @@ module Fog
             if !instance_id
               message << 'The request must contain the parameter image_id'
             end
-            raise Fog::AWS::Compute::Error.new(message)
+            raise Fog::Compute::AWS::Error.new(message)
           end
         end
 

data/lib/fog/compute/requests/aws/describe_addresses.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_addresses'
@@ -24,11 +24,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeAddresses',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeAddresses.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeAddresses.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_availability_zones.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_availability_zones'
@@ -25,11 +25,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeAvailabilityZones',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeAvailabilityZones.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeAvailabilityZones.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_images.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_images'
@@ -45,11 +45,11 @@ module Fog
               options[key] = filters.delete(key)
             end
           end
-          params = AWS.indexed_filters(filters).merge!(options)
+          params = Fog::AWS.indexed_filters(filters).merge!(options)
           request({
             'Action'    => 'DescribeImages',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeImages.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeImages.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_instances.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_instances'
@@ -62,12 +62,12 @@ module Fog
           if filters['instance-id'] && !filters['instance-id'].is_a?(Array)
             params.merge!('InstanceId' => filters.delete('instance-id'))
           end
-          params.merge!(AWS.indexed_filters(filters))
+          params.merge!(Fog::AWS.indexed_filters(filters))
 
           request({
             'Action'    => 'DescribeInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeInstances.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeInstances.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_key_pairs.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_key_pairs'
@@ -24,11 +24,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'key-name' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeKeyPairs',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeKeyPairs.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeKeyPairs.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_regions.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_regions'
@@ -24,11 +24,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'region-name' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeRegions',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeRegions.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeRegions.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_reserved_instances.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_reserved_instances'
@@ -32,11 +32,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'reserved-instances-id' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeReservedInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeReservedInstances.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeReservedInstances.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_reserved_instances_offerings.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_reserved_instances_offerings'
@@ -25,11 +25,11 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html]
         def describe_reserved_instances_offerings(filters = {})
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeReservedInstancesOfferings',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeReservedInstancesOfferings.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeReservedInstancesOfferings.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_security_groups.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_security_groups'
@@ -34,11 +34,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeSecurityGroups',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeSecurityGroups.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeSecurityGroups.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_snapshots.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_snapshots'
@@ -40,11 +40,11 @@ module Fog
             end
           end
           options['RestorableBy'] ||= 'self'
-          params = AWS.indexed_filters(filters).merge!(options)
+          params = Fog::AWS.indexed_filters(filters).merge!(options)
           request({
             'Action'    => 'DescribeSnapshots',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeSnapshots.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeSnapshots.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/describe_tags.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_tags'
@@ -22,11 +22,11 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeTags.html]
         def describe_tags(filters = {})
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeTags',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeTags.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeTags.new
           }.merge!(params))
         end