fog-aws 0.11.0 → 3.18.0

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_instance_placement.rb

@@ -0,0 +1,33 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+        require 'fog/aws/parsers/compute/basic'
+
+        # Modify instance placement
+        #
+        # ==== Parameters
+        # * instance_id<~String> - Id of instance to modify
+        # * attributes<~Hash>:
+        #   'Affinity.Value'<~String> - The affinity setting for the instance, in ['default', 'host']
+        #   'GroupName.Value'<~String> - The name of the placement group in which to place the instance
+        #   'HostId.Value'<~String> - The ID of the Dedicated Host with which to associate the instance
+        #   'Tenancy.Value'<~String> - The tenancy for the instance, in ['dedicated', 'host']
+        #
+        # {Amazon API Reference}[https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifyInstancePlacement.html]
+        #
+        def modify_instance_placement(instance_id, attributes)
+          params = {}
+          params.merge!(attributes)
+          request({
+            'Action'        => 'ModifyInstancePlacement',
+            'InstanceId'    => instance_id,
+            :idempotent     => true,
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+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
@@ -54,22 +54,22 @@ module Fog
             when 'groupSet'
               groups = {}
               value.each do |group_id|
-                name = self.data[:security_groups].select { |k,v| v['groupId'] == group_id } .first.first
-                if name.nil?
-                  raise Fog::Compute::AWS::Error.new("Unknown security group '#{group_id}' specified")
+                security_group = self.data[:security_groups][group_id]
+                if security_group.nil?
+                  raise Fog::AWS::Compute::Error.new("Unknown security group '#{group_id}' specified")
                 end
-                groups[group_id] = name
+                groups[group_id] = security_group['groupName']
               end
               nic['groupSet'] = groups
             when 'sourceDestCheck'
               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

@@ -0,0 +1,88 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+        require 'fog/aws/parsers/compute/modify_volume'
+
+        # Modifies a volume
+        #
+        # ==== Parameters
+        # * volume_id<~String> - The ID of the volume
+        # * options<~Hash>:
+        #   * 'VolumeType'<~String> - Type of volume
+        #   * 'Size'<~Integer> - Size in GiBs fo the volume
+        #   * 'Iops'<~Integer> - Number of IOPS the volume supports
+        #
+        # ==== Response
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'targetIops'<~Integer> - Target IOPS rate of the volume being modified.
+        #     * 'originalIops'<~Integer> - Original IOPS rate of the volume being modified.
+        #     * 'modificationState'<~String> - Current state of modification. Modification state is null for unmodified volumes.
+        #     * 'targetSize'<~Integer> - Target size of the volume being modified.
+        #     * 'targetVolumeType'<~String> - Target EBS volume type of the volume being modified.
+        #     * 'volumeId'<~String> - ID of the volume being modified.
+        #     * 'progress'<~Integer> - Modification progress from 0 to 100%.
+        #     * 'startTime'<~Time> - Modification start time
+        #     * 'endTime'<~Time> - Modification end time
+        #     * 'originalSize'<~Integer> - Original size of the volume being modified.
+        #     * 'originalVolumeType'<~String> - Original EBS volume type of the volume being modified.
+
+        def modify_volume(volume_id, options={})
+          request({
+            'Action'   => "ModifyVolume",
+            'VolumeId' => volume_id,
+            :parser    => Fog::Parsers::AWS::Compute::ModifyVolume.new
+          }.merge(options))
+        end
+      end
+
+      class Mock
+        def modify_volume(volume_id, options={})
+          response = Excon::Response.new
+          volume   = self.data[:volumes][volume_id]
+
+          if volume["volumeType"] == 'standard' && options['VolumeType']
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+          end
+
+          volume_modification = {
+            'modificationState' => 'modifying',
+            'progress'          => 0,
+            'startTime'         => Time.now,
+            'volumeId'          => volume_id
+          }
+
+          if options['Size']
+            volume_modification.merge!(
+              'originalSize' => volume['size'],
+              'targetSize'   => options['Size']
+            )
+          end
+
+          if options['Iops']
+            volume_modification.merge!(
+              'originalIops' => volume['iops'],
+              'targetIops'   => options['Iops']
+            )
+          end
+
+          if options['VolumeType']
+            if options["VolumeType"] == 'standard'
+              raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+            end
+            volume_modification.merge!(
+              'originalVolumeType' => volume['volumeType'],
+              'targetVolumeType'   => options['VolumeType']
+            )
+          end
+
+          self.data[:volume_modifications][volume_id] = volume_modification
+
+          response.body = {'volumeModification' => volume_modification, 'requestId' => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+        require 'fog/aws/parsers/compute/move_address_to_vpc'
+
+        # Move address to VPC scope
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * body<~<Hash>:
+        #     * 'allocationId'<~String> - The allocation ID for the Elastic IP address
+        #     * 'requestId'<~String> - Id of the request
+        #     * 'status'<~String> - The status of the move of the IP address (MoveInProgress | InVpc | InClassic)
+
+        def move_address_to_vpc(public_ip)
+          request(
+            'Action' => 'MoveAddressToVpc',
+            'PublicIp' => public_ip,
+            :idempotent => true,
+            :parser => Fog::Parsers::AWS::Compute::MoveAddressToVpc.new
+          )
+        end
+      end
+
+      class Mock
+        def move_address_to_vpc(public_ip)
+          response      = Excon::Response.new
+          allocation_id = "eip-#{Fog::Mock.random_hex(8)}"
+
+          address = self.data[:addresses][public_ip]
+
+          if address
+            address['domain']       = 'vpc'
+            address['allocationId'] = allocation_id
+
+            response.status = 200
+            response.body = {
+              'requestId'    => Fog::AWS::Mock.request_id,
+              'allocationId' => allocation_id,
+              'status'       => "InVpc"
+            }
+
+            response
+          else
+            raise Fog::AWS::Compute::NotFound.new("Address does not exist")
+          end
+        end
+      end
+    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

data/lib/fog/aws/requests/compute/release_address.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'    => 'ReleaseAddress',
             field       => ip_or_allocation,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ module Fog
 
           if address
             if address['allocationId'] && public_ip_or_allocation_id == address['publicIp']
-              raise Fog::Compute::AWS::Error, "InvalidParameterValue => You must specify an allocation id when releasing a VPC elastic IP address"
+              raise Fog::AWS::Compute::Error, "InvalidParameterValue => You must specify an allocation id when releasing a VPC elastic IP address"
             end
 
             self.data[:addresses].delete(address['publicIp'])
@@ -50,7 +50,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip_or_allocation_id}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip_or_allocation_id}' does not belong to you.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/replace_network_acl_association'
 
@@ -22,7 +22,7 @@ module Fog
             'Action'        => 'ReplaceNetworkAclAssociation',
             'AssociationId' => association_id,
             'NetworkAclId'  => network_acl_id,
-            :parser         => Fog::Parsers::Compute::AWS::ReplaceNetworkAclAssociation.new
+            :parser         => Fog::Parsers::AWS::Compute::ReplaceNetworkAclAssociation.new
           })
         end
       end
@@ -37,7 +37,7 @@ module Fog
             end
 
             unless old_nacl
-              raise Fog::Compute::AWS::Error.new("Invalid association_id #{association_id}")
+              raise Fog::AWS::Compute::Error.new("Invalid association_id #{association_id}")
             end
 
             subnet_id = old_nacl['associationSet'].find { |assoc| assoc['networkAclAssociationId'] == association_id }['subnetId']
@@ -57,7 +57,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -35,7 +35,7 @@ module Fog
             'RuleAction'   => rule_action,
             'Egress'       => egress,
             'CidrBlock'    => cidr_block,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -46,7 +46,7 @@ module Fog
           if self.data[:network_acls][network_acl_id]
 
             unless self.data[:network_acls][network_acl_id]['entrySet'].find { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
-              raise Fog::Compute::AWS::Error.new("No rule with that number")
+              raise Fog::AWS::Compute::Error.new("No rule with that number")
             end
             self.data[:network_acls][network_acl_id]['entrySet'].delete_if { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
 
@@ -72,7 +72,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end

data/lib/fog/aws/requests/compute/replace_route.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' => 'ReplaceRoute',
             'RouteTableId' => route_table_id,
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -42,13 +42,13 @@ module Fog
           if !route_table.nil? && destination_cidr_block
             if !options['gatewayId'].nil? || !options['instanceId'].nil? || !options['networkInterfaceId'].nil?
               if !options['gatewayId'].nil? && self.internet_gateways.all('internet-gateway-id'=>options['gatewayId']).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The gateway ID '#{options['gatewayId']}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The gateway ID '#{options['gatewayId']}' does not exist")
               elsif !options['instanceId'].nil? && self.servers.all('instance-id'=>options['instanceId']).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The instance ID '#{options['instanceId']}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The instance ID '#{options['instanceId']}' does not exist")
               elsif !options['networkInterfaceId'].nil? && self.network_interfaces.all('networkInterfaceId'=>options['networkInterfaceId']).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The networkInterface ID '#{options['networkInterfaceId']}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The networkInterface ID '#{options['networkInterfaceId']}' does not exist")
               elsif route_table['routeSet'].find { |route| route['destinationCidrBlock'].eql? destination_cidr_block }.nil?
-                raise Fog::Compute::AWS::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} doesn't exist."
+                raise Fog::AWS::Compute::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} doesn't exist."
               else
                 response = Excon::Response.new
                 route_set = route_table['routeSet'].find { |routeset| routeset['destinationCidrBlock'].eql? destination_cidr_block }
@@ -66,12 +66,12 @@ module Fog
             else
               message = 'MissingParameter => '
               message << 'The request must contain either a gateway id, a network interface id, or an instance id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           elsif route_table.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
           elsif destination_cidr_block.empty?
-            raise Fog::Compute::AWS::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
+            raise Fog::AWS::Compute::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
           end
         end
       end