fog-aws 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a19f2beb9ccbc769e67d13f1439379dbe37d345
-  data.tar.gz: d2c335bd1b9b390d49ecfc3ca651611801e1b063
+  metadata.gz: 5e768fc1ff288fe562ed0dd7c933c719dcdc33f4
+  data.tar.gz: 526f5ba1b58f9ba023ef1567b5a9cd79334f7212
 SHA512:
-  metadata.gz: 292f539571c0e60a9cb39b999b2d3082c22dc49d664ef06aabab0adde68d6f40c8caf4a198ce1fc97ab47e77a82a564f65330c2fe7cb9525ab2134160a9fc225
-  data.tar.gz: 124b4a4d8ea72f661e3d98cf9c215871d56b377fb7d614973a5bab32384dcdd64a8ace0a5fee6fbdcb354a6b8473d2c49c9b1052aedb8d8f8bf324cda0a69e1d
+  metadata.gz: 71f1af91375c2b20e8de2ca347fb5c1ae7e62f2606b5cab88813a89c3a5cdaeb41da1d30000caf47eb8e2d2e8ffe2b405a893944d23016bc5a8e085842e74a3c
+  data.tar.gz: 23faf3f32d79b4da048189a3e1a3261c62e30425091cc3964f467af4d3f0b12a835951a0ba56a03f18df2191086e2e94b8868616db4a39d44e5aa3e00d95f590

data/CHANGELOG.md

@@ -2,7 +2,22 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v1.1.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.2.0...HEAD)
+
+**Closed issues:**
+
+- Fog mock does not mimmick real behaviour for some Excon errors [\#341](https://github.com/fog/fog-aws/issues/341)
+
+**Merged pull requests:**
+
+- Spot fixes [\#349](https://github.com/fog/fog-aws/pull/349) ([ehowe](https://github.com/ehowe))
+- add natGatewayId to describe\_route\_tables [\#346](https://github.com/fog/fog-aws/pull/346) ([mliao2](https://github.com/mliao2))
+- Fog mock accuracy, fixes \#341 [\#344](https://github.com/fog/fog-aws/pull/344) ([easkay](https://github.com/easkay))
+- Subnet [\#343](https://github.com/fog/fog-aws/pull/343) ([ehowe](https://github.com/ehowe))
+- Fix multipart upload [\#340](https://github.com/fog/fog-aws/pull/340) ([nobmurakita](https://github.com/nobmurakita))
+
+## [v1.2.0](https://github.com/fog/fog-aws/tree/v1.2.0) (2017-01-20)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.1.0...v1.2.0)
 
 **Closed issues:**
 

data/lib/fog/aws/compute.rb

@@ -142,6 +142,7 @@ module Fog
       request :modify_subnet_attribute
       request :modify_volume_attribute
       request :modify_vpc_attribute
+      request :move_address_to_vpc
       request :purchase_reserved_instances_offering
       request :reboot_instances
       request :release_address
@@ -151,6 +152,7 @@ module Fog
       request :register_image
       request :request_spot_instances
       request :reset_network_interface_attribute
+      request :restore_address_to_classic
       request :revoke_security_group_egress
       request :revoke_security_group_ingress
       request :run_instances
@@ -177,13 +179,14 @@ module Fog
 
       class Mock
         MOCKED_TAG_TYPES = {
-          'ami' => 'image',
-          'i' => 'instance',
+          'acl'  => 'network_acl',
+          'ami'  => 'image',
+          'igw'  => 'internet_gateway',
+          'i'    => 'instance',
+          'rtb'  => 'route_table',
           'snap' => 'snapshot',
-          'vol' => 'volume',
-          'igw' => 'internet_gateway',
-          'acl' => 'network_acl',
-          'vpc' => 'vpc'
+          'vol'  => 'volume',
+          'vpc'  => 'vpc'
         }
 
         include Fog::AWS::CredentialFetcher::ConnectionMethods
@@ -285,7 +288,8 @@ module Fog
                     "values"        => ["5"],
                     "attributeName" => "vpc-max-elastic-ips"
                   }
-                ]
+                ],
+                :spot_requests => {},
               }
             end
           end
@@ -386,6 +390,10 @@ module Fog
                 if self.data[:vpcs].select {|v| v['vpcId'] == resource_id }.empty?
                   raise(Fog::Service::NotFound.new("Cannot tag #{resource_id}, the vpc does not exist"))
                 end
+              when 'route_table'
+                unless self.data[:route_tables].detect { |r| r['routeTableId'] == resource_id }
+                  raise(Fog::Service::NotFound.new("Cannot tag #{resource_id}, the route table does not exist"))
+                end
               else
                 unless self.data[:"#{type}s"][resource_id]
                  raise(Fog::Service::NotFound.new("Cannot tag #{resource_id}, the #{type} does not exist"))
@@ -459,7 +467,7 @@ module Fog
           @region                 = options[:region] ||= 'us-east-1'
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.compute'
-          @version                = options[:version]     ||  '2014-10-01'
+          @version                = options[:version]     ||  '2016-11-15'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

data/lib/fog/aws/models/compute/address.rb

@@ -24,6 +24,16 @@ module Fog
           true
         end
 
+        def change_scope
+          if self.domain == 'standard'
+            service.move_address_to_vpc(self.identity)
+            wait_for { self.domain == 'vpc' }
+          else
+            service.restore_address_to_classic(self.identity)
+            wait_for { self.domain == 'standard' }
+          end
+        end
+
         def server=(new_server)
           if new_server
             associate(new_server)
@@ -63,7 +73,11 @@ module Fog
           @server = nil
           self.server_id = nil
           if persisted?
-            service.disassociate_address(public_ip)
+            if association_id
+              service.disassociate_address(nil, association_id)
+            else
+              service.disassociate_address(public_ip)
+            end
           end
         end
       end

data/lib/fog/aws/models/compute/spot_request.rb

@@ -21,6 +21,7 @@ module Fog
 
         attribute :ebs_optimized,              :aliases => 'LaunchSpecification.EbsOptimized'
         attribute :groups,                     :aliases => 'LaunchSpecification.SecurityGroup'
+        attribute :security_group_ids,         :aliases => 'LaunchSpecification.SecurityGroupId'
         attribute :key_name,                   :aliases => 'LaunchSpecification.KeyName'
         attribute :availability_zone,          :aliases => 'LaunchSpecification.Placement.AvailabilityZone'
         attribute :flavor_id,                  :aliases => 'LaunchSpecification.InstanceType'
@@ -37,7 +38,7 @@ module Fog
         attr_writer   :iam_instance_profile_name, :iam_instance_profile_arn
 
         def initialize(attributes={})
-          self.groups ||= ["default"]
+          self.groups ||= self.security_group_ids || ["default"]
           self.flavor_id ||= 't1.micro'
           self.image_id   ||= begin
             self.username ||= 'ubuntu'
@@ -93,7 +94,7 @@ module Fog
             'LaunchSpecification.KeyName'                    => key_name,
             'LaunchSpecification.Monitoring.Enabled'         => monitoring,
             'LaunchSpecification.Placement.AvailabilityZone' => availability_zone,
-            'LaunchSpecification.SecurityGroupId'            => groups,
+            'LaunchSpecification.SecurityGroupId'            => security_group_ids || groups,
             'LaunchSpecification.EbsOptimized'               => ebs_optimized,
             'LaunchSpecification.UserData'                   => user_data,
             'LaunchSpecification.SubnetId'                   => subnet_id,

data/lib/fog/aws/models/compute/subnet.rb

@@ -16,6 +16,10 @@ module Fog
           state == 'available'
         end
 
+        def network_interfaces
+          service.network_interfaces.all('subnet-id' => [self.identity])
+        end
+
         # Removes an existing subnet
         #
         # subnet.destroy

data/lib/fog/aws/models/storage/file.rb

@@ -210,7 +210,7 @@ module Fog
           options.merge!(encryption_headers)
 
           # With a single PUT operation you can upload objects up to 5 GB in size. Automatically set MP for larger objects.
-          multipart_chunk_size=5242880 if !multipart_chunk_size && Fog::Storage.get_body_size(body) > 5368709120
+          self.multipart_chunk_size = 5242880 if !multipart_chunk_size && Fog::Storage.get_body_size(body) > 5368709120
 
           if multipart_chunk_size && Fog::Storage.get_body_size(body) >= multipart_chunk_size && body.respond_to?(:read)
             data = multipart_save(options)

data/lib/fog/aws/parsers/compute/describe_route_tables.rb

@@ -7,7 +7,7 @@ module Fog
             @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false }
             @in_association_set = false
             @in_route_set = false
-            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil }
+            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'natGatewayId' => nil, 'state' => nil, 'origin' => nil }
             @response = { 'routeTableSet' => [] }
             @tag = {}
             @route_table = { 'associationSet' => [], 'tagSet' => {}, 'routeSet' => [] }
@@ -54,11 +54,11 @@ module Fog
               end
             elsif @in_route_set
               case name
-              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'vpcPeeringConnectionId', 'state', 'origin'
+              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'vpcPeeringConnectionId', 'natGatewayId', 'state', 'origin'
                 @route[name] = value
               when 'item'
                 @route_table['routeSet'] << @route
-                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil }
+                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'natGatewayId' => nil, 'state' => nil, 'origin' => nil }
               when 'routeSet'
                 @in_route_set = false
               end

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

@@ -0,0 +1,16 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class MoveAddressToVpc < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'requestId', 'allocationId', 'status'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/restore_address_to_classic.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class RestoreAddressToClassic < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'requestId', 'publicIp', 'status'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -40,7 +40,8 @@ module Fog
           data = {
             'instanceId' => nil,
             'publicIp'   => public_ip,
-            'domain'     => domain
+            'domain'     => domain,
+            :origin      => domain
           }
 
           if domain == 'vpc'

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

@@ -80,6 +80,12 @@ module Fog
               if !allocation_ip.nil?
                 public_ip = allocation_ip['publicIp']
                 address = public_ip.nil? ? nil : self.data[:addresses][public_ip]
+
+                if instance['vpcId'] && vpc = self.data[:vpcs].detect { |v| v['vpcId'] == instance['vpcId'] }
+                  if vpc['enableDnsHostnames']
+                    instance['dnsName'] = Fog::AWS::Mock.dns_name_for(public_ip)
+                  end
+                end
               end
             end
             if !address.nil?
@@ -103,10 +109,12 @@ module Fog
                 'return'    => true
               }
             elsif !params[:allocation_id].nil?
+              association_id = "eipassoc-#{Fog::Mock.random_hex(8)}"
+              address['associationId'] = association_id
               response.body = {
                 'requestId'     => Fog::AWS::Mock.request_id,
                 'return'        => true,
-                'associationId' => Fog::AWS::Mock.request_id
+                'associationId' => association_id,
               }
             end
             response

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

@@ -27,6 +27,23 @@ module Fog
           }.merge!(params))
         end
       end
+
+      class Mock
+        def cancel_spot_instance_requests(spot_instance_request_id)
+          response = Excon::Response.new
+          spot_request = self.data[:spot_requests][spot_instance_request_id]
+
+          unless spot_request
+            raise Fog::Compute::AWS::NotFound.new("The spot instance request ID '#{spot_instance_request_id}' does not exist")
+          end
+
+          spot_request['fault']['code'] = 'request-cancelled'
+          spot_request['state'] = 'cancelled'
+
+          response.body = {'spotInstanceRequestSet' => [{'spotInstanceRequestId' => spot_instance_request_id, 'state' => 'cancelled'}], 'requestId' => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -249,7 +249,7 @@ module Fog
                 'ownerId'       => instance['ownerId'],
                 'reservationId' => instance['reservationId']
               }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceName', 'rootDeviceType', 'stateReason', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceName', 'rootDeviceType', 'spotInstanceRequestId', 'stateReason', 'subnetId', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
             end
           end
 

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

@@ -68,6 +68,10 @@ module Fog
 
           network_interface_info = self.data[:network_interfaces].values
 
+          if subnet_filter = filters.delete('subnet-id')
+            filters['subnetId'] = subnet_filter
+          end
+
           for filter_key, filter_value in filters
             network_interface_info = network_interface_info.reject{|nic| ![*filter_value].include?(nic[filter_key])}
           end

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

@@ -24,6 +24,7 @@ module Fog
         #         * 'instanceOwnerId'<~String> - The owner of the instance.
         #         * 'networkInterfaceId'<~String> - The network interface ID.
         #         * 'vpcPeeringConnectionId'<~String> - The peering connection ID.
+        #         * 'natGatewayId'<~String> - The ID of a NAT gateway attached to your VPC.
         #         * 'state'<~String> - The state of the route. The blackhole state indicates that the route's target isn't available.
         #         * 'origin'<~String> - Describes how the route was created.
         #       * 'associationSet'<~Array>:
@@ -73,6 +74,11 @@ module Fog
             end
           end
 
+          display_routes.each do |route|
+            tags = self.data[:tag_sets][route['routeTableId']]
+            route.merge!('tagSet' => tags) if tags
+          end
+
           Excon::Response.new(
             :status => 200,
             :body   => {

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

@@ -41,6 +41,39 @@ module Fog
           }.merge!(params))
         end
       end
+
+      class Mock
+        def describe_spot_instance_requests(filters = {})
+          response = Excon::Response.new
+          spot_requests = self.data[:spot_requests].values
+
+          if id = Array(filters['spot-instance-request-id']).first
+            spot_requests = spot_requests.select { |r| r['spotInstanceRequestId'] == id }
+          end
+
+          spot_requests.select { |r| r['instanceId'].nil? }.each do |request|
+            run_instance_options = {
+              'BlockDeviceMapping'    => request['launchSpecification']['blockDeviceMapping'],
+              'EbsOptimized'          => request['launchSpecification']['ebsOptimized'],
+              'KeyName'               => request['launchSpecification']['keyName'],
+              'SecurityGroupId'       => request['launchSpecification']['groupSet'].first,
+              'SpotInstanceRequestId' => request['spotInstanceRequestId'],
+              'SubnetId'              => request['launchSpecification']['subnetId']
+            }
+            instances = run_instances(request['launchSpecification']['imageId'], 1,1, run_instance_options).body['instancesSet']
+
+            request['instanceId'] = instances.first['instanceId']
+            request['state'] = 'active'
+            request['fault'] = {'code' => 'fulfilled', 'message' => 'Your Spot request is fulfilled.'}
+            request['launchedAvailabilityZone'] = instances.first['placement']['availabilityZone']
+
+            self.data[:spot_requests][request['spotInstanceRequestId']] = request
+          end
+
+          response.body = {'spotInstanceRequestSet' => spot_requests, 'requestId' => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -29,10 +29,13 @@ module Fog
       end
 
       class Mock
-        def disassociate_address(public_ip)
+        def disassociate_address(public_ip, association_id=nil)
           response = Excon::Response.new
           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")
+            end
             instance_id = address['instanceId']
             if instance = self.data[:instances][instance_id]
               instance['ipAddress']         = instance['originalIpAddress']

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

@@ -0,0 +1,52 @@
+module Fog
+  module Compute
+    class AWS
+      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::Compute::AWS::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::Compute::AWS::NotFound.new("Address does not exist")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -71,7 +71,7 @@ module Fog
             options.merge!(Fog::AWS.indexed_param('LaunchSpecification.SecurityGroupId', [*security_group_ids]))
           end
           if options['LaunchSpecification.UserData']
-            options['LaunchSpecification.UserData'] = Base64.encode64(options['LaunchSpecification.UserData'])
+            options['LaunchSpecification.UserData'] = Base64.encode64(options['LaunchSpecification.UserData']).chomp!
           end
 
           if options['ValidFrom'] && options['ValidFrom'].is_a?(Time)
@@ -95,6 +95,7 @@ module Fog
       class Mock
         def request_spot_instances(image_id, instance_type, spot_price, options = {})
           response = Excon::Response.new
+          id       = Fog::AWS::Mock.spot_instance_request_id
 
           if (image_id && instance_type && spot_price)
             response.status = 200
@@ -139,32 +140,42 @@ module Fog
 
           launch_spec = {
             'iamInstanceProfile' => {},
-            'blockDeviceMapping' => [],
-            'groupSet'           => [Fog::AWS::Mock.security_group_id],
+            'blockDeviceMapping' => options['LaunchSpecification.BlockDeviceMapping'] || [],
+            'groupSet'           => options['LaunchSpecification.SecurityGroupId']    || ['default'],
             'imageId'            => image_id,
             'instanceType'       => instance_type,
-            'monitoring'         => options['MonitoringEnabled'] || false,
-            'subnetId'           => nil,
-            'ebsOptimized'       => false,
-            'keyName'            => options['KeyName'] || nil
+            'monitoring'         => options['LaunchSpecification.Monitoring.Enabled'] || false,
+            'subnetId'           => options['LaunchSpecification.SubnetId']           || nil,
+            'ebsOptimized'       => options['LaunchSpecification.EbsOptimized']       || false,
+            'keyName'            => options['LaunchSpecification.KeyName']            || nil
           }
 
+          if iam_arn = options['LaunchSpecification.IamInstanceProfile.Arn']
+            launch_spec['iamInstanceProfile'].merge!('Arn' => iam_arn)
+          end
+
+          if iam_name = options['LaunchSpecification.IamInstanceProfile.Name']
+            launch_spec['iamInstanceProfile'].merge!('Name' => iam_name)
+          end
+
+          spot_request = {
+            'launchSpecification'   => launch_spec,
+            'spotInstanceRequestId' => id,
+            'spotPrice'             => spot_price,
+            'type'                  => options['Type'] || 'one-time',
+            'state'                 => 'open',
+            'fault'                 => {
+              'code'    => 'pending-evaluation',
+              'message' => 'Your Spot request has been submitted for review, and is pending evaluation.'
+            },
+            'createTime'         => Time.now,
+            'productDescription' => 'Linux/UNIX'
+          }
+
+          self.data[:spot_requests][id] = spot_request
+
           response.body = {
-            'spotInstanceRequestSet' => [
-              {
-                'launchSpecification'   => launch_spec,
-                'spotInstanceRequestId' => Fog::AWS::Mock.spot_instance_request_id,
-                'spotPrice'             => spot_price,
-                'type'                  => options['Type'] || 'one-time',
-                'state'                 => 'open',
-                'fault'                 => {
-                  'code'    => 'pending-evaluation',
-                  'message' => 'Your Spot request has been submitted for review, and is pending evaluation.'
-                },
-                'createTime'         => Time.now,
-                'productDescription' => 'Linux/UNIX'
-              }
-            ],
+            'spotInstanceRequestSet' => [spot_request],
             'requestId' => Fog::AWS::Mock.request_id
           }
 

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

@@ -0,0 +1,55 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/restore_address_to_classic'
+
+        # Move address from VPC to Classic
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * body<~<Hash>:
+        #     * 'publicIp'<~String> - IP address
+        #     * 'requestId'<~String> - Id of the request
+        #     * 'status'<~String> - The status of the move of the IP address (MoveInProgress | InVpc | InClassic)
+
+        def restore_address_to_classic(public_ip)
+          request(
+            'Action' => 'RestoreAddressToClassic',
+            'PublicIp' => public_ip,
+            :idempotent => true,
+            :parser => Fog::Parsers::Compute::AWS::RestoreAddressToClassic.new
+          )
+        end
+      end
+
+      class Mock
+        def restore_address_to_classic(public_ip)
+          response      = Excon::Response.new
+
+          address = self.data[:addresses][public_ip]
+
+          if address
+            if address[:origin] == 'vpc'
+              raise Fog::Compute::AWS::Error.new("InvalidState => You cannot migrate an Elastic IP address that was originally allocated for use in EC2-VPC to EC2-Classic.")
+            end
+
+            address['domain']       = 'standard'
+            address.delete("allocationId")
+
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'publicIp'  => public_ip,
+              'status'    => "InClassic"
+            }
+
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("Address does not exist")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -217,30 +217,32 @@ module Fog
             end
 
             instance = {
-              'amiLaunchIndex'      => i,
-              'associatePublicIP'   => options['associatePublicIP'] || false,
-              'architecture'        => 'i386',
-              'blockDeviceMapping'  => block_device_mapping,
-              'networkInterfaces'   => network_interfaces,
-              'clientToken'         => options['clientToken'],
-              'dnsName'             => nil,
-              'ebsOptimized'        => options['EbsOptimized'] || false,
-              'hypervisor'          => 'xen',
-              'imageId'             => image_id,
-              'instanceId'          => instance_id,
-              'instanceState'       => { 'code' => 0, 'name' => 'pending' },
-              'instanceType'        => options['InstanceType'] || 'm1.small',
-              'kernelId'            => options['KernelId'] || Fog::AWS::Mock.kernel_id,
-              'keyName'             => options['KeyName'],
-              'launchTime'          => Time.now,
-              'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'placement'           => { 'availabilityZone' => availability_zone, 'groupName' => nil, 'tenancy' => options['Placement.Tenancy'] || 'default' },
-              'privateDnsName'      => nil,
-              'productCodes'        => [],
-              'reason'              => nil,
-              'rootDeviceName'      => block_device_mapping.first && block_device_mapping.first["deviceName"],
-              'rootDeviceType'      => 'instance-store',
-              'virtualizationType'  => 'paravirtual'
+              'amiLaunchIndex'        => i,
+              'associatePublicIP'     => options['associatePublicIP'] || false,
+              'architecture'          => 'i386',
+              'blockDeviceMapping'    => block_device_mapping,
+              'networkInterfaces'     => network_interfaces,
+              'clientToken'           => options['clientToken'],
+              'dnsName'               => nil,
+              'ebsOptimized'          => options['EbsOptimized'] || false,
+              'hypervisor'            => 'xen',
+              'imageId'               => image_id,
+              'instanceId'            => instance_id,
+              'instanceState'         => { 'code' => 0, 'name' => 'pending' },
+              'instanceType'          => options['InstanceType'] || 'm1.small',
+              'kernelId'              => options['KernelId'] || Fog::AWS::Mock.kernel_id,
+              'keyName'               => options['KeyName'],
+              'launchTime'            => Time.now,
+              'monitoring'            => { 'state' => options['Monitoring.Enabled'] || false },
+              'placement'             => { 'availabilityZone' => availability_zone, 'groupName' => nil, 'tenancy' => options['Placement.Tenancy'] || 'default' },
+              'privateDnsName'        => nil,
+              'productCodes'          => [],
+              'reason'                => nil,
+              'rootDeviceName'        => block_device_mapping.first && block_device_mapping.first["deviceName"],
+              'rootDeviceType'        => 'instance-store',
+              'spotInstanceRequestId' => options['SpotInstanceRequestId'],
+              'subnetId'              => options['SubnetId'],
+              'virtualizationType'    => 'paravirtual'
             }
             instances_set << instance
             self.data[:instances][instance_id] = instance.merge({

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

@@ -73,7 +73,7 @@ module Fog
 
             describe_addresses.body['addressesSet'].each do |address|
               if instance_id.include?(address['instanceId'])
-                disassociate_address(address['publicIp'])
+                disassociate_address(address['publicIp'], address['associationId'])
               end
             end
 

data/lib/fog/aws/requests/storage/delete_bucket_policy.rb

@@ -32,7 +32,7 @@ module Fog
                response.status = 200
              end
            else
-             raise Fog::AWS::IAM::NotFound.new("The bucket with name #{bucket_name} cannot be found.")
+             raise(Excon::Errors.status_error({:expects => 200}, response))
            end
         end
       end

data/lib/fog/aws/requests/storage/get_bucket_object_versions.rb

@@ -85,6 +85,7 @@ module Fog
                 'HostId' => Fog::Mock.random_base64(65)
               }
             }
+            raise(Excon::Errors.status_error({:expects => 200}, response))
 
           # Valid case.
           # TODO: (nirvdrum 12/15/11) It's not clear to me how to actually use version-id-marker, so I didn't implement it below.

data/lib/fog/aws/requests/storage/get_object.rb

@@ -86,12 +86,16 @@ module Fog
             if (object && !object[:delete_marker])
               if options['If-Match'] && options['If-Match'] != object['ETag']
                 response.status = 412
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               elsif options['If-Modified-Since'] && options['If-Modified-Since'] >= Time.parse(object['Last-Modified'])
                 response.status = 304
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
                 response.status = 304
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               elsif options['If-Unmodified-Since'] && options['If-Unmodified-Since'] < Time.parse(object['Last-Modified'])
                 response.status = 412
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               else
                 response.status = 200
                 for key, value in object

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/tests/models/compute/address_tests.rb

@@ -16,9 +16,28 @@ Shindo.tests("Fog::Compute[:aws] | address", ['aws']) do
       end
     end
 
+    tests("#change_scope") do
+      test('to vpc') do
+        @instance.change_scope
+        @instance.domain == 'vpc'
+      end
+
+      test('to classic') do
+        @instance.change_scope
+        @instance.domain == 'standard'
+      end
+
+      # merge_attributes requires this
+      @instance = Fog::Compute[:aws].addresses.get(@instance.identity)
+    end
+
     @server.destroy
 
   end
 
-  model_tests(Fog::Compute[:aws].addresses, { :domain => "vpc" }, true)
+  model_tests(Fog::Compute[:aws].addresses, { :domain => "vpc" }, true) do
+    tests("#change_scope").raises(Fog::Compute::AWS::Error) do
+      @instance.change_scope
+    end
+  end
 end

data/tests/models/compute/subnet_tests.rb

@@ -1,5 +1,13 @@
 Shindo.tests("Fog::Compute[:aws] | subnet", ['aws']) do
   @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
-  model_tests(Fog::Compute[:aws].subnets, {:vpc_id => @vpc.id, :cidr_block => '10.0.10.0/28', :availability_zone => 'us-east-1b'}, true)
+  model_tests(Fog::Compute[:aws].subnets, {:vpc_id => @vpc.id, :cidr_block => '10.0.10.0/28', :availability_zone => 'us-east-1b'}, true) do
+    @ni = Fog::Compute[:aws].network_interfaces.create(:description => 'fog eni', :name => uniq_id('fog-eni'), :subnet_id => @instance.identity)
+
+    tests("#network_interfaces") do
+      returns([@ni]) { @instance.network_interfaces.to_a }
+    end
+
+    @ni.destroy
+  end
   @vpc.destroy
 end

data/tests/requests/compute/address_tests.rb

@@ -34,6 +34,15 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
       data
     end
 
+    # the following 2 tests imply that your account is old enough that the tested region does not have a default VPC.  These methods do not work with an ip created in a vpc.  this probably means that they will probably fail if they aren't mocked
+    tests("#move_address_to_vpc('#{@public_ip}')").formats({'status' => String, 'allocationId' => String, 'requestId' => String}) do
+      compute.move_address_to_vpc(@public_ip).body
+    end
+
+    tests("#restore_address_to_classic('#{@public_ip}')").formats({'status' => String, 'publicIp' => String, 'requestId' => String}) do
+      compute.restore_address_to_classic(@public_ip).body
+    end
+
     tests('#describe_addresses').formats(@addresses_format) do
       compute.describe_addresses.body
     end
@@ -42,11 +51,11 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
       compute.describe_addresses('public-ip' => @public_ip).body
     end
 
-    tests("#associate_addresses('#{@server.identity}', '#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
+    tests("#associate_address('#{@server.identity}', '#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
       compute.associate_address(@server.identity, @public_ip).body
     end
 
-    tests("#associate_addresses({:instance_id=>'#{@server.identity}', :public_ip=>'#{@public_ip}'})").formats(AWS::Compute::Formats::BASIC) do
+    tests("#associate_address({:instance_id=>'#{@server.identity}', :public_ip=>'#{@public_ip}'})").formats(AWS::Compute::Formats::BASIC) do
       compute.associate_address({:instance_id=>@server.identity,:public_ip=> @public_ip}).body
     end
 
@@ -54,18 +63,28 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
       compute.disassociate_address(@public_ip).body
     end
 
-    tests("#associate_addresses('#{@server.id}', nil, nil, '#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
+    tests("#associate_address('#{@server.id}', nil, nil, '#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
       compute.associate_address(@server.id, nil, nil, @vpc_allocation_id).body
     end
 
-    tests("#associate_addresses({:instance_id=>'#{@server.id}', :allocation_id=>'#{@vpc_allocation_id}'})").formats(AWS::Compute::Formats::BASIC) do
+    $pry = true
+    tests("#associate_address({:instance_id=>'#{@server.id}', :allocation_id=>'#{@vpc_allocation_id}'})").formats(AWS::Compute::Formats::BASIC) do
       compute.associate_address({:instance_id=>@server.id, :allocation_id=>@vpc_allocation_id}).body
     end
 
+    tests("#disassociate_address('#{@vpc_public_ip}')").raises(Fog::Compute::AWS::Error) do
+      compute.disassociate_address(@vpc_public_ip)
+    end
+
     tests("#release_address('#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
       compute.release_address(@public_ip).body
     end
 
+    tests("#disassociate_address('#{@vpc_public_ip}', '#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
+      address = compute.describe_addresses('public-ip' => @vpc_public_ip).body['addressesSet'].first
+      compute.disassociate_address(@vpc_public_ip, address['associationId']).body
+    end
+
     tests("#release_address('#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
       compute.release_address(@vpc_allocation_id).body
     end
@@ -88,6 +107,10 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
       compute.associate_address({:instance_id =>'i-00000000', :public_ip =>'127.0.0.1'})
     end
 
+    tests("#restore_address_to_classic('#{@vpc_address.identity}')").raises(Fog::Compute::AWS::Error) do
+      compute.restore_address_to_classic(@vpc_address.identity)
+    end
+
     tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Fog::Compute::AWS::Error) do
       compute.disassociate_address('127.0.0.1')
     end

data/tests/requests/compute/route_tests.rb

@@ -31,6 +31,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
         'instanceOwnerId'        => Fog::Nullable::String,
         'networkInterfaceId'     => Fog::Nullable::String,
         'vpcPeeringConnectionId' => Fog::Nullable::String,
+        'natGatewayId'           => Fog::Nullable::String,
         'state'                  => String,
         'origin'                 => String
       }],

data/tests/requests/compute/spot_instance_tests.rb

@@ -42,10 +42,8 @@ Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
       data
     end
 
-    pending if Fog.mocking?
-
     tests("#describe_spot_instance_requests").formats(@spot_instance_requests_format) do
-      Fog::Compute[:aws].describe_spot_instance_requests('spot-instance-request-id' => [@spot_instance_request_id]).body
+      data = Fog::Compute[:aws].describe_spot_instance_requests('spot-instance-request-id' => [@spot_instance_request_id]).body
     end
 
     tests("#cancel_spot_instance_requests('#{@spot_instance_request_id}')").formats(@cancel_spot_instance_request_format) do

data/tests/requests/storage/object_tests.rb

@@ -42,6 +42,10 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
       data
     end
 
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Match' => Digest::MD5.hexdigest(lorem_file) })").returns(lorem_file.read) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Match' => Digest::MD5.hexdigest(lorem_file.read) }).body
+    end
+
     tests("#get_object('#{@directory.identity}', 'fog_object', {'Range' => 'bytes=0-20'})").returns(lorem_file.read[0..20]) do
       Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', {'Range' => 'bytes=0-20'}).body
     end
@@ -50,10 +54,42 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
       Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', {'Range' => 'bytes=0-0'}).body
     end
 
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Match' => Digest::MD5.hexdigest(lorem_file.read) })").returns(lorem_file.read) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Match' => Digest::MD5.hexdigest(lorem_file.read) }).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Modified-Since' => Time.now - 60 })").returns(lorem_file.read) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Modified-Since' => Time.now - 60 }).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-None-Match' => 'invalid_etag' })").returns(lorem_file.read) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-None-Match' => 'invalid_etag' }).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Unmodified-Since' => Time.now + 60 })").returns(lorem_file.read) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Unmodified-Since' => Time.now + 60 }).body
+    end
+
     tests("#head_object('#{@directory.identity}', 'fog_object')").succeeds do
       Fog::Storage[:aws].head_object(@directory.identity, 'fog_object')
     end
 
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-Match' => Digest::MD5.hexdigest(lorem_file.read) })").succeeds do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-Match' => Digest::MD5.hexdigest(lorem_file.read) })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-Modified-Since' => Time.now - 60 })").succeeds do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-Modified-Since' => Time.now - 60 })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-None-Match' => 'invalid_etag' })").succeeds do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-None-Match' => 'invalid_etag' })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-Unmodified-Since' => Time.now + 60 })").succeeds do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-Unmodified-Since' => Time.now + 60 })
+    end
+
     tests("#post_object_restore('#{@directory.identity}', 'fog_object')").succeeds do
       pending unless Fog.mocking?
       Fog::Storage[:aws].post_object_restore(@directory.identity, 'fog_object')
@@ -168,6 +204,42 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
       Fog::Storage[:aws].get_object(@directory.identity, 'fog_non_object')
     end
 
+    Fog::Storage[:aws].put_object(@directory.identity, 'fog_object', lorem_file)
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Match' => 'invalid_etag' })").raises(Excon::Errors::PreconditionFailed) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Match' => 'invalid_etag' })
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Modified-Since' => Time.now })").raises(Excon::Errors::NotModified) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Modified-Since' => Time.now })
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-None-Match' => Digest::MD5.hexdigest(lorem_file.read) })").raises(Excon::Errors::NotModified) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-None-Match' => Digest::MD5.hexdigest(lorem_file.read) })
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', { 'If-Unmodified-Since' => Time.now - 60 })").raises(Excon::Errors::PreconditionFailed) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', { 'If-Unmodified-Since' => Time.now - 60 })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-Match' => 'invalid_etag' })").raises(Excon::Errors::PreconditionFailed) do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-Match' => 'invalid_etag' })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-Modified-Since' => Time.now })").raises(Excon::Errors::NotModified) do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-Modified-Since' => Time.now })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-None-Match' => Digest::MD5.hexdigest(lorem_file.read) })").raises(Excon::Errors::NotModified) do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-None-Match' => Digest::MD5.hexdigest(lorem_file.read) })
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object', { 'If-Unmodified-Since' => Time.now - 60 })").raises(Excon::Errors::PreconditionFailed) do
+      Fog::Storage[:aws].head_object(@directory.identity, 'fog_object', { 'If-Unmodified-Since' => Time.now - 60 })
+    end
+
+    Fog::Storage[:aws].delete_object(@directory.identity, 'fog_object')
+
     tests("#head_object(fognonbucket, 'fog_non_object')").raises(Excon::Errors::NotFound) do
       Fog::Storage[:aws].head_object(fognonbucket, 'fog_non_object')
     end

data/tests/requests/storage/versioning_tests.rb

@@ -229,6 +229,10 @@ Shindo.tests('Fog::Storage[:aws] | versioning', ["aws"]) do
       Fog::Storage[:aws].put_bucket_versioning(@aws_bucket_name, 'bad_value')
     end
 
+    tests("#get_bucket_object_versions('#{@aws_bucket_name}', { 'version-id-marker' => 'foo' })").raises(Excon::Errors::BadRequest) do
+      Fog::Storage[:aws].get_bucket_object_versions(@aws_bucket_name, { 'version-id-marker' => 'foo' })
+    end
+
     tests("#put_bucket_versioning('fognonbucket', 'Enabled')").raises(Excon::Errors::NotFound) do
       Fog::Storage[:aws].put_bucket_versioning('fognonbucket', 'Enabled')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -465,11 +465,13 @@ files:
 - lib/fog/aws/parsers/compute/import_key_pair.rb
 - lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
 - lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
+- lib/fog/aws/parsers/compute/move_address_to_vpc.rb
 - lib/fog/aws/parsers/compute/network_acl_parser.rb
 - lib/fog/aws/parsers/compute/network_interface_parser.rb
 - lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
 - lib/fog/aws/parsers/compute/register_image.rb
 - lib/fog/aws/parsers/compute/replace_network_acl_association.rb
+- lib/fog/aws/parsers/compute/restore_address_to_classic.rb
 - lib/fog/aws/parsers/compute/run_instances.rb
 - lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
 - lib/fog/aws/parsers/compute/spot_instance_requests.rb
@@ -947,6 +949,7 @@ files:
 - lib/fog/aws/requests/compute/modify_volume_attribute.rb
 - lib/fog/aws/requests/compute/modify_vpc_attribute.rb
 - lib/fog/aws/requests/compute/monitor_instances.rb
+- lib/fog/aws/requests/compute/move_address_to_vpc.rb
 - lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
 - lib/fog/aws/requests/compute/reboot_instances.rb
 - lib/fog/aws/requests/compute/register_image.rb
@@ -956,6 +959,7 @@ files:
 - lib/fog/aws/requests/compute/replace_route.rb
 - lib/fog/aws/requests/compute/request_spot_instances.rb
 - lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
+- lib/fog/aws/requests/compute/restore_address_to_classic.rb
 - lib/fog/aws/requests/compute/revoke_security_group_egress.rb
 - lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
 - lib/fog/aws/requests/compute/run_instances.rb