fog 0.2.30 → 0.3.0

data/lib/fog/aws/requests/{ec2 → compute}/create_snapshot.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/create_snapshot'
+        require 'fog/aws/parsers/compute/create_snapshot'
 
         # Create a snapshot of an EBS volume and store it in S3
         #
@@ -24,7 +24,7 @@ module Fog
             'Action'      => 'CreateSnapshot',
             'Description' => description,
             'VolumeId'    => volume_id,
-            :parser       => Fog::Parsers::AWS::EC2::CreateSnapshot.new
+            :parser       => Fog::Parsers::AWS::Compute::CreateSnapshot.new
           )
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/create_volume.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/create_volume'
+        require 'fog/aws/parsers/compute/create_volume'
 
         # Create an EBS volume
         #
@@ -27,7 +27,7 @@ module Fog
             'AvailabilityZone'  => availability_zone,
             'Size'              => size,
             'SnapshotId'        => snapshot_id,
-            :parser             => Fog::Parsers::AWS::EC2::CreateVolume.new
+            :parser             => Fog::Parsers::AWS::Compute::CreateVolume.new
           )
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/delete_key_pair.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Delete a key pair that you own
@@ -18,7 +18,7 @@ module Fog
             'Action'    => 'DeleteKeyPair',
             'KeyName'   => key_name,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/delete_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Delete a security group that you own
@@ -18,7 +18,7 @@ module Fog
             'Action'    => 'DeleteSecurityGroup',
             'GroupName' => name,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -36,7 +36,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The security group '#{name}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{name}' does not exist")
           end
         end
       end

data/lib/fog/aws/requests/{ec2 → compute}/delete_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Delete a snapshot of an EBS volume that you own
@@ -18,7 +18,7 @@ module Fog
             'Action'      => 'DeleteSnapshot',
             'SnapshotId'  => snapshot_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::EC2::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -36,7 +36,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/delete_volume.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Delete an EBS volume
@@ -18,7 +18,7 @@ module Fog
             'Action'    => 'DeleteVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -31,7 +31,7 @@ module Fog
           if volume = @data[:volumes][volume_id]
             if volume["attachmentSet"].any?
               attach = volume["attachmentSet"].first
-              raise Fog::AWS::EC2::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
+              raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
             end
             @data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
@@ -42,7 +42,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/deregister_image.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/deregister_image'
+        require 'fog/aws/parsers/compute/deregister_image'
 
         # deregister an image
         #
@@ -19,7 +19,7 @@ module Fog
           request(
             'Action'      => 'DeregisterImage',
             'ImageId'     => image_id,
-            :parser       => Fog::Parsers::AWS::EC2::DeregisterImage.new
+            :parser       => Fog::Parsers::AWS::Compute::DeregisterImage.new
           )
         end
 
@@ -41,7 +41,7 @@ module Fog
             if !instance_id
               message << 'The request must contain the parameter image_id'
             end
-            raise Fog::AWS::EC2::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_addresses.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_addresses'
+        require 'fog/aws/parsers/compute/describe_addresses'
 
         # Describe all or specified IP addresses.
         #
@@ -22,7 +22,7 @@ module Fog
           request({
             'Action'    => 'DescribeAddresses',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeAddresses.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAddresses.new
           }.merge!(params))
         end
 
@@ -46,7 +46,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("Address #{public_ip.inspect} not found.")
+            raise Fog::AWS::Compute::NotFound.new("Address #{public_ip.inspect} not found.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_availability_zones.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_availability_zones'
+        require 'fog/aws/parsers/compute/describe_availability_zones'
 
         # Describe all or specified availability zones
         #
@@ -23,7 +23,7 @@ module Fog
           request({
             'Action'    => 'DescribeAvailabilityZones',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeAvailabilityZones.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAvailabilityZones.new
           }.merge!(params))
         end
 
@@ -54,7 +54,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidParameterValue => Invalid availability zone: #{zone_name.inspect}")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Invalid availability zone: #{zone_name.inspect}")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_images.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_images'
+        require 'fog/aws/parsers/compute/describe_images'
 
         # Describe all or specified images.
         #
@@ -40,7 +40,7 @@ module Fog
           request({
             'Action'    => 'DescribeImages',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeImages.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeImages.new
           }.merge!(options))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_instances.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_instances'
+        require 'fog/aws/parsers/compute/describe_instances'
 
         # Describe all or specified instances
         #
@@ -55,7 +55,7 @@ module Fog
           request({
             'Action'    => 'DescribeInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeInstances.new
           }.merge!(params))
         end
 
@@ -119,7 +119,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_key_pairs.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_key_pairs'
+        require 'fog/aws/parsers/compute/describe_key_pairs'
 
         # Describe all or specified key pairs
         #
@@ -22,7 +22,7 @@ module Fog
           request({
             'Action'    => 'DescribeKeyPairs',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeKeyPairs.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeKeyPairs.new
           }.merge!(params))
         end
 
@@ -48,7 +48,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The key pair #{key_name.inspect} does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The key pair #{key_name.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_regions.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_regions'
+        require 'fog/aws/parsers/compute/describe_regions'
 
         # Describe all or specified regions
         #
@@ -22,7 +22,7 @@ module Fog
           request({
             'Action'    => 'DescribeRegions',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeRegions.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeRegions.new
           }.merge!(params))
         end
 
@@ -51,7 +51,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidParameterValue => Invalid region: #{region_name.inspect}")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Invalid region: #{region_name.inspect}")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_reserved_instances.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_reserved_instances'
+        require 'fog/aws/parsers/compute/describe_reserved_instances'
 
         # Describe all or specified reserved instances
         #
@@ -30,7 +30,7 @@ module Fog
           request({
             'Action'    => 'DescribeReservedInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeReservedInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeReservedInstances.new
           }.merge!(params))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_security_groups.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_security_groups'
+        require 'fog/aws/parsers/compute/describe_security_groups'
 
         # Describe all or specified security groups
         #
@@ -32,7 +32,7 @@ module Fog
           request({
             'Action'    => 'DescribeSecurityGroups',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeSecurityGroups.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSecurityGroups.new
           }.merge!(params))
         end
 
@@ -56,7 +56,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The security group #{group_name.inspect} does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group #{group_name.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_snapshots.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_snapshots'
+        require 'fog/aws/parsers/compute/describe_snapshots'
 
         # Describe all or specified snapshots
         #
@@ -29,7 +29,7 @@ module Fog
           request({
             'Action'    => 'DescribeSnapshots',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeSnapshots.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSnapshots.new
           }.merge!(options))
         end
 
@@ -70,7 +70,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The snapshot #{snapshot_id.inspect} does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The snapshot #{snapshot_id.inspect} does not exist.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/describe_volumes.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/describe_volumes'
+        require 'fog/aws/parsers/compute/describe_volumes'
 
         # Describe all or specified volumes.
         #
@@ -31,7 +31,7 @@ module Fog
           request({
             'Action'    => 'DescribeVolumes',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DescribeVolumes.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVolumes.new
           }.merge!(params))
         end
 
@@ -76,7 +76,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The volume #{volume_id.inspect} does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume #{volume_id.inspect} does not exist.")
           end
         end