fog-aws 3.1.0 → 3.2.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/get_console_output'
 
@@ -23,7 +23,7 @@ module Fog
             'Action'      => 'GetConsoleOutput',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::GetConsoleOutput.new
+            :parser       => Fog::Parsers::AWS::Compute::GetConsoleOutput.new
           )
         end
       end
@@ -41,7 +41,7 @@ module Fog
             }
             response
           else;
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/get_password_data'
 
@@ -25,7 +25,7 @@ module Fog
             'Action'      => 'GetPasswordData',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::GetPasswordData.new
+            :parser       => Fog::Parsers::AWS::Compute::GetPasswordData.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             }
             response
           else;
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/import_key_pair'
 
@@ -23,7 +23,7 @@ module Fog
             'Action'  => 'ImportKeyPair',
             'KeyName' => key_name,
             'PublicKeyMaterial' => Base64::encode64(public_key_material),
-            :parser   => Fog::Parsers::Compute::AWS::ImportKeyPair.new
+            :parser   => Fog::Parsers::AWS::Compute::ImportKeyPair.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -31,7 +31,7 @@ module Fog
             'Action'        => 'ModifyImageAttribute',
             'ImageId'       => image_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
@@ -41,7 +41,7 @@ module Fog
           raise ArgumentError.new("image_id is required") unless image_id
 
           unless self.data[:images][image_id]
-            raise Fog::Compute::AWS::NotFound.new("The AMI ID '#{image_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The AMI ID '#{image_id}' does not exist")
           end
 
           (attributes['Add.UserId'] || []).each do |user_id|

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -28,7 +28,7 @@ module Fog
             'Action'        => 'ModifyInstanceAttribute',
             'InstanceId'    => instance_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -31,13 +31,13 @@ module Fog
             params['Attachment.AttachmentId']        = value['attachmentId']
             params['Attachment.DeleteOnTermination'] = value['deleteOnTermination']
           else
-            raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+            raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
           end
 
           request({
             'Action'             => 'ModifyNetworkInterfaceAttribute',
             'NetworkInterfaceId' => network_interface_id,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
@@ -56,7 +56,7 @@ module Fog
               value.each do |group_id|
                 security_group = self.data[:security_groups][group_id]
                 if security_group.nil?
-                  raise Fog::Compute::AWS::Error.new("Unknown security group '#{group_id}' specified")
+                  raise Fog::AWS::Compute::Error.new("Unknown security group '#{group_id}' specified")
                 end
                 groups[group_id] = security_group['groupName']
               end
@@ -65,11 +65,11 @@ module Fog
               nic['sourceDestCheck'] = value
             when 'attachment'
               if nic['attachment'].nil? || value['attachmentId'] != nic['attachment']['attachmentId']
-                raise Fog::Compute::AWS::Error.new("Illegal attachment '#{value['attachmentId']}' specified")
+                raise Fog::AWS::Compute::Error.new("Illegal attachment '#{value['attachmentId']}' specified")
               end
               nic['attachment']['deleteOnTermination'] = value['deleteOnTermination']
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
 
             response.status = 200
@@ -80,7 +80,7 @@ module Fog
 
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -26,7 +26,7 @@ module Fog
             'Action'        => 'ModifySnapshotAttribute',
             'SnapshotId'    => snapshot_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/modify_subnet_attribute'
 
@@ -26,7 +26,7 @@ module Fog
           request({
             'Action' => 'ModifySubnetAttribute',
             'SubnetId' => subnet_id,
-            :parser => Fog::Parsers::Compute::AWS::ModifySubnetAttribute.new
+            :parser => Fog::Parsers::AWS::Compute::ModifySubnetAttribute.new
           }.merge(params))
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/modify_volume'
 
@@ -32,7 +32,7 @@ module Fog
           request({
             'Action'   => "ModifyVolume",
             'VolumeId' => volume_id,
-            :parser    => Fog::Parsers::Compute::AWS::ModifyVolume.new
+            :parser    => Fog::Parsers::AWS::Compute::ModifyVolume.new
           }.merge(options))
         end
       end
@@ -43,7 +43,7 @@ module Fog
           volume   = self.data[:volumes][volume_id]
 
           if volume["volumeType"] == 'standard' && options['VolumeType']
-            raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
           end
 
           volume_modification = {
@@ -69,7 +69,7 @@ module Fog
 
           if options['VolumeType']
             if options["VolumeType"] == 'standard'
-              raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+              raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
             end
             volume_modification.merge!(
               'originalVolumeType' => volume['volumeType'],

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -23,7 +23,7 @@ module Fog
             'VolumeId'           => volume_id,
             'AutoEnableIO.Value' => auto_enable_io_value,
             :idempotent          => true,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -27,7 +27,7 @@ module Fog
             'Action'             => 'ModifyVpcAttribute',
             'VpcId'              => vpc_id,
             :idempotent          => true,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -36,9 +36,9 @@ module Fog
         def modify_vpc_attribute(vpc_id, options = {})
           response = Excon::Response.new
           if options.size == 0
-            raise Fog::Compute::AWS::Error.new("InvalidParameterCombination => No attributes specified.")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterCombination => No attributes specified.")
           elsif options.size > 1
-            raise Fog::Compute::AWS::Error.new("InvalidParameterCombination =>  InvalidParameterCombination => Fields for multiple attribute types specified: #{options.keys.join(', ')}")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterCombination =>  InvalidParameterCombination => Fields for multiple attribute types specified: #{options.keys.join(', ')}")
           elsif vpc = self.data[:vpcs].find{ |v| v['vpcId'] == vpc_id }
             response.status = 200
             response.body = {
@@ -53,11 +53,11 @@ module Fog
             when 'EnableDnsHostnames.Value'
               vpc['enableDnsHostnames'] = options[attribute]
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/monitor_unmonitor_instances'
 
@@ -22,7 +22,7 @@ module Fog
           request({
                           'Action' => 'MonitorInstances',
                           :idempotent => true,
-                          :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new
+                          :parser => Fog::Parsers::AWS::Compute::MonitorUnmonitorInstances.new
                   }.merge!(params))
         end
       end
@@ -35,7 +35,7 @@ module Fog
             if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
-              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids}' does not exist")
+              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")
             end
           end
           instances_set = [*instance_ids].reduce([]) { |memo, id| memo << {'instanceId' => id, 'monitoring' => 'enabled'} }

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/move_address_to_vpc'
 
@@ -18,7 +18,7 @@ module Fog
             'Action' => 'MoveAddressToVpc',
             'PublicIp' => public_ip,
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::MoveAddressToVpc.new
+            :parser => Fog::Parsers::AWS::Compute::MoveAddressToVpc.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
 
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("Address does not exist")
+            raise Fog::AWS::Compute::NotFound.new("Address does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/purchase_reserved_instances_offering'
 
@@ -23,7 +23,7 @@ module Fog
             'ReservedInstancesOfferingId' => reserved_instances_offering_id,
             'InstanceCount'               => instance_count,
             :idempotent                   => true,
-            :parser                       => Fog::Parsers::Compute::AWS::PurchaseReservedInstancesOffering.new
+            :parser                       => Fog::Parsers::AWS::Compute::PurchaseReservedInstancesOffering.new
           })
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -21,7 +21,7 @@ module Fog
           request({
             'Action'    => 'RebootInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
@@ -41,7 +41,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::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
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/register_image'
 
@@ -39,7 +39,7 @@ module Fog
             'Action'      => 'RegisterImage',
             'Name'        => name,
             'Description' => description,
-            :parser       => Fog::Parsers::Compute::AWS::RegisterImage.new
+            :parser       => Fog::Parsers::AWS::Compute::RegisterImage.new
           }
 
           # This determines if we are doing a snapshot or a S3 backed AMI.
@@ -124,7 +124,7 @@ module Fog
             if name.empty?
               message << 'The request must contain the parameter name'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end