fog-aws 1.4.1 → 3.27.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/detach_volume'
 
@@ -29,7 +29,7 @@ module Fog
             'Action'    => 'DetachVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DetachVolume.new
+            :parser     => Fog::Parsers::AWS::Compute::DetachVolume.new
           }.merge!(options))
         end
       end
@@ -49,10 +49,10 @@ module Fog
               response
             else
               # real response has spacing issue below
-              raise Fog::Compute::AWS::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
+              raise Fog::AWS::Compute::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
             end
           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/disable_vpc_classic_link.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # disavbles classic link for a vpc
@@ -21,7 +21,7 @@ module Fog
             'Action'    => 'DisableVpcClassicLink',
             'VpcId'     => vpc_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ module Fog
             vpc['classicLinkEnabled'] = false unless dry_run
             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/disable_vpc_classic_link_dns_support.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' => 'DisableVpcClassicLinkDnsSupport',
             'VpcId'  => vpc_id,
-            :parser  => Fog::Parsers::Compute::AWS::Basic.new
+            :parser  => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -30,7 +30,7 @@ module Fog
         def disable_vpc_classic_link_dns_support(vpc_id)
           response = Excon::Response.new
           unless vpc = self.data[:vpcs].find { |v| v['vpcId'] == vpc_id }
-            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
           vpc['classicLinkDnsSupport'] = false
           response.body = {

data/lib/fog/aws/requests/compute/disassociate_address.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
             'PublicIp'      => public_ip,
             'AssociationId' => association_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -34,7 +34,7 @@ module Fog
           response.status = 200
           if address = self.data[:addresses][public_ip]
             if address['allocationId'] && association_id.nil?
-              raise Fog::Compute::AWS::Error.new("InvalidParameterValue => You must specify an association id when unmapping an address from a VPC instance")
+              raise Fog::AWS::Compute::Error.new("InvalidParameterValue => You must specify an association id when unmapping an address from a VPC instance")
             end
             instance_id = address['instanceId']
             if instance = self.data[:instances][instance_id]
@@ -49,7 +49,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -20,7 +20,7 @@ module Fog
           request(
             'Action'        => 'DisassociateRouteTable',
             'AssociationId' => association_id,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,9 +43,9 @@ module Fog
             }
             response
           elsif assoc_array.nil?
-            raise Fog::Compute::AWS::NotFound.new("The association ID '#{association_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The association ID '#{association_id}' does not exist")
           elsif assoc_array['main'] == true
-            raise Fog::Compute::AWS::Error, "InvalidParameterValue => cannot disassociate the main route table association #{association_id}"
+            raise Fog::AWS::Compute::Error, "InvalidParameterValue => cannot disassociate the main route table association #{association_id}"
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # enables classic link for a vpc
@@ -21,7 +21,7 @@ module Fog
             'Action'    => 'EnableVpcClassicLink',
             'VpcId'     => vpc_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ module Fog
             vpc['classicLinkEnabled'] = true unless dry_run
             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/enable_vpc_classic_link_dns_support.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' => 'EnableVpcClassicLinkDnsSupport',
             'VpcId'  => vpc_id,
-            :parser  => Fog::Parsers::Compute::AWS::Basic.new
+            :parser  => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -30,7 +30,7 @@ module Fog
         def enable_vpc_classic_link_dns_support(vpc_id)
           response = Excon::Response.new
           unless vpc = self.data[:vpcs].find { |v| v['vpcId'] == vpc_id }
-            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
           vpc['classicLinkDnsSupport'] = true
           response.body = {

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_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'
 
@@ -9,7 +9,7 @@ module Fog
         # ==== Parameters
         # * network_interface_id<~String> - The ID of the network interface you want to describe an attribute of
         # * attribute<~String>            - The attribute to modify, must be one of 'description', 'groupSet', 'sourceDestCheck' or 'attachment'
-        # * value<~Object>                - New value of attribute, the actual tyep depends on teh attribute:
+        # * value<~Object>                - New value of attribute, the actual type depends on the attribute:
         #                                   description     - a string
         #                                   groupSet        - a list of group id's
         #                                   sourceDestCheck - a boolean value
@@ -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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/modify_volume'
 
@@ -10,7 +10,7 @@ module Fog
         # * volume_id<~String> - The ID of the volume
         # * options<~Hash>:
         #   * 'VolumeType'<~String> - Type of volume
-        #   * 'Size'<~Integer> - Size in GiBs fo the volume
+        #   * 'Size'<~Integer> - Size in GiBs of the volume
         #   * 'Iops'<~Integer> - Number of IOPS the volume supports
         #
         # ==== Response
@@ -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