aws-sdk-ec2 1.51.0 → 1.52.0

data/lib/aws-sdk-ec2/client_api.rb

@@ -28,6 +28,8 @@ module Aws::EC2
     ActivityStatus = Shapes::StringShape.new(name: 'ActivityStatus')
     Address = Shapes::StructureShape.new(name: 'Address')
     AddressList = Shapes::ListShape.new(name: 'AddressList')
+    AdvertiseByoipCidrRequest = Shapes::StructureShape.new(name: 'AdvertiseByoipCidrRequest')
+    AdvertiseByoipCidrResult = Shapes::StructureShape.new(name: 'AdvertiseByoipCidrResult')
     Affinity = Shapes::StringShape.new(name: 'Affinity')
     AllocateAddressRequest = Shapes::StructureShape.new(name: 'AllocateAddressRequest')
     AllocateAddressResult = Shapes::StructureShape.new(name: 'AllocateAddressResult')
@@ -90,6 +92,9 @@ module Aws::EC2
     BundleTaskError = Shapes::StructureShape.new(name: 'BundleTaskError')
     BundleTaskList = Shapes::ListShape.new(name: 'BundleTaskList')
     BundleTaskState = Shapes::StringShape.new(name: 'BundleTaskState')
+    ByoipCidr = Shapes::StructureShape.new(name: 'ByoipCidr')
+    ByoipCidrSet = Shapes::ListShape.new(name: 'ByoipCidrSet')
+    ByoipCidrState = Shapes::StringShape.new(name: 'ByoipCidrState')
     CancelBatchErrorCode = Shapes::StringShape.new(name: 'CancelBatchErrorCode')
     CancelBundleTaskRequest = Shapes::StructureShape.new(name: 'CancelBundleTaskRequest')
     CancelBundleTaskResult = Shapes::StructureShape.new(name: 'CancelBundleTaskResult')
@@ -111,6 +116,7 @@ module Aws::EC2
     CancelSpotInstanceRequestsResult = Shapes::StructureShape.new(name: 'CancelSpotInstanceRequestsResult')
     CancelledSpotInstanceRequest = Shapes::StructureShape.new(name: 'CancelledSpotInstanceRequest')
     CancelledSpotInstanceRequestList = Shapes::ListShape.new(name: 'CancelledSpotInstanceRequestList')
+    CidrAuthorizationContext = Shapes::StructureShape.new(name: 'CidrAuthorizationContext')
     CidrBlock = Shapes::StructureShape.new(name: 'CidrBlock')
     CidrBlockSet = Shapes::ListShape.new(name: 'CidrBlockSet')
     ClassicLinkDnsSupport = Shapes::StructureShape.new(name: 'ClassicLinkDnsSupport')
@@ -272,6 +278,8 @@ module Aws::EC2
     DeleteVpnConnectionRequest = Shapes::StructureShape.new(name: 'DeleteVpnConnectionRequest')
     DeleteVpnConnectionRouteRequest = Shapes::StructureShape.new(name: 'DeleteVpnConnectionRouteRequest')
     DeleteVpnGatewayRequest = Shapes::StructureShape.new(name: 'DeleteVpnGatewayRequest')
+    DeprovisionByoipCidrRequest = Shapes::StructureShape.new(name: 'DeprovisionByoipCidrRequest')
+    DeprovisionByoipCidrResult = Shapes::StructureShape.new(name: 'DeprovisionByoipCidrResult')
     DeregisterImageRequest = Shapes::StructureShape.new(name: 'DeregisterImageRequest')
     DescribeAccountAttributesRequest = Shapes::StructureShape.new(name: 'DescribeAccountAttributesRequest')
     DescribeAccountAttributesResult = Shapes::StructureShape.new(name: 'DescribeAccountAttributesResult')
@@ -283,6 +291,8 @@ module Aws::EC2
     DescribeAvailabilityZonesResult = Shapes::StructureShape.new(name: 'DescribeAvailabilityZonesResult')
     DescribeBundleTasksRequest = Shapes::StructureShape.new(name: 'DescribeBundleTasksRequest')
     DescribeBundleTasksResult = Shapes::StructureShape.new(name: 'DescribeBundleTasksResult')
+    DescribeByoipCidrsRequest = Shapes::StructureShape.new(name: 'DescribeByoipCidrsRequest')
+    DescribeByoipCidrsResult = Shapes::StructureShape.new(name: 'DescribeByoipCidrsResult')
     DescribeClassicLinkInstancesRequest = Shapes::StructureShape.new(name: 'DescribeClassicLinkInstancesRequest')
     DescribeClassicLinkInstancesResult = Shapes::StructureShape.new(name: 'DescribeClassicLinkInstancesResult')
     DescribeConversionTaskList = Shapes::ListShape.new(name: 'DescribeConversionTaskList')
@@ -362,6 +372,8 @@ module Aws::EC2
     DescribePrefixListsResult = Shapes::StructureShape.new(name: 'DescribePrefixListsResult')
     DescribePrincipalIdFormatRequest = Shapes::StructureShape.new(name: 'DescribePrincipalIdFormatRequest')
     DescribePrincipalIdFormatResult = Shapes::StructureShape.new(name: 'DescribePrincipalIdFormatResult')
+    DescribePublicIpv4PoolsRequest = Shapes::StructureShape.new(name: 'DescribePublicIpv4PoolsRequest')
+    DescribePublicIpv4PoolsResult = Shapes::StructureShape.new(name: 'DescribePublicIpv4PoolsResult')
     DescribeRegionsRequest = Shapes::StructureShape.new(name: 'DescribeRegionsRequest')
     DescribeRegionsResult = Shapes::StructureShape.new(name: 'DescribeRegionsResult')
     DescribeReservedInstancesListingsRequest = Shapes::StructureShape.new(name: 'DescribeReservedInstancesListingsRequest')
@@ -843,6 +855,7 @@ module Aws::EC2
     PlacementGroupStringList = Shapes::ListShape.new(name: 'PlacementGroupStringList')
     PlacementStrategy = Shapes::StringShape.new(name: 'PlacementStrategy')
     PlatformValues = Shapes::StringShape.new(name: 'PlatformValues')
+    PoolMaxResults = Shapes::IntegerShape.new(name: 'PoolMaxResults')
     PortRange = Shapes::StructureShape.new(name: 'PortRange')
     PrefixList = Shapes::StructureShape.new(name: 'PrefixList')
     PrefixListId = Shapes::StructureShape.new(name: 'PrefixListId')
@@ -869,8 +882,14 @@ module Aws::EC2
     ProductDescriptionList = Shapes::ListShape.new(name: 'ProductDescriptionList')
     PropagatingVgw = Shapes::StructureShape.new(name: 'PropagatingVgw')
     PropagatingVgwList = Shapes::ListShape.new(name: 'PropagatingVgwList')
+    ProvisionByoipCidrRequest = Shapes::StructureShape.new(name: 'ProvisionByoipCidrRequest')
+    ProvisionByoipCidrResult = Shapes::StructureShape.new(name: 'ProvisionByoipCidrResult')
     ProvisionedBandwidth = Shapes::StructureShape.new(name: 'ProvisionedBandwidth')
     PublicIpStringList = Shapes::ListShape.new(name: 'PublicIpStringList')
+    PublicIpv4Pool = Shapes::StructureShape.new(name: 'PublicIpv4Pool')
+    PublicIpv4PoolRange = Shapes::StructureShape.new(name: 'PublicIpv4PoolRange')
+    PublicIpv4PoolRangeSet = Shapes::ListShape.new(name: 'PublicIpv4PoolRangeSet')
+    PublicIpv4PoolSet = Shapes::ListShape.new(name: 'PublicIpv4PoolSet')
     Purchase = Shapes::StructureShape.new(name: 'Purchase')
     PurchaseHostReservationRequest = Shapes::StructureShape.new(name: 'PurchaseHostReservationRequest')
     PurchaseHostReservationResult = Shapes::StructureShape.new(name: 'PurchaseHostReservationResult')
@@ -1194,6 +1213,8 @@ module Aws::EC2
     VpnStaticRouteList = Shapes::ListShape.new(name: 'VpnStaticRouteList')
     VpnStaticRouteSource = Shapes::StringShape.new(name: 'VpnStaticRouteSource')
     VpnTunnelOptionsSpecification = Shapes::StructureShape.new(name: 'VpnTunnelOptionsSpecification')
+    WithdrawByoipCidrRequest = Shapes::StructureShape.new(name: 'WithdrawByoipCidrRequest')
+    WithdrawByoipCidrResult = Shapes::StructureShape.new(name: 'WithdrawByoipCidrResult')
     ZoneNameStringList = Shapes::ListShape.new(name: 'ZoneNameStringList')
     scope = Shapes::StringShape.new(name: 'scope')
 
@@ -1250,17 +1271,27 @@ module Aws::EC2
     Address.add_member(:network_interface_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "networkInterfaceOwnerId"))
     Address.add_member(:private_ip_address, Shapes::ShapeRef.new(shape: String, location_name: "privateIpAddress"))
     Address.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    Address.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "publicIpv4Pool"))
     Address.struct_class = Types::Address
 
     AddressList.member = Shapes::ShapeRef.new(shape: Address, location_name: "item")
 
+    AdvertiseByoipCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    AdvertiseByoipCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    AdvertiseByoipCidrRequest.struct_class = Types::AdvertiseByoipCidrRequest
+
+    AdvertiseByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
+    AdvertiseByoipCidrResult.struct_class = Types::AdvertiseByoipCidrResult
+
     AllocateAddressRequest.add_member(:domain, Shapes::ShapeRef.new(shape: DomainType, location_name: "Domain"))
     AllocateAddressRequest.add_member(:address, Shapes::ShapeRef.new(shape: String, location_name: "Address"))
+    AllocateAddressRequest.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "PublicIpv4Pool"))
     AllocateAddressRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     AllocateAddressRequest.struct_class = Types::AllocateAddressRequest
 
     AllocateAddressResult.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "publicIp"))
     AllocateAddressResult.add_member(:allocation_id, Shapes::ShapeRef.new(shape: String, location_name: "allocationId"))
+    AllocateAddressResult.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "publicIpv4Pool"))
     AllocateAddressResult.add_member(:domain, Shapes::ShapeRef.new(shape: DomainType, location_name: "domain"))
     AllocateAddressResult.struct_class = Types::AllocateAddressResult
 
@@ -1476,6 +1507,14 @@ module Aws::EC2
 
     BundleTaskList.member = Shapes::ShapeRef.new(shape: BundleTask, location_name: "item")
 
+    ByoipCidr.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "cidr"))
+    ByoipCidr.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    ByoipCidr.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
+    ByoipCidr.add_member(:state, Shapes::ShapeRef.new(shape: ByoipCidrState, location_name: "state"))
+    ByoipCidr.struct_class = Types::ByoipCidr
+
+    ByoipCidrSet.member = Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "item")
+
     CancelBundleTaskRequest.add_member(:bundle_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "BundleId"))
     CancelBundleTaskRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CancelBundleTaskRequest.struct_class = Types::CancelBundleTaskRequest
@@ -1546,6 +1585,10 @@ module Aws::EC2
 
     CancelledSpotInstanceRequestList.member = Shapes::ShapeRef.new(shape: CancelledSpotInstanceRequest, location_name: "item")
 
+    CidrAuthorizationContext.add_member(:message, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Message"))
+    CidrAuthorizationContext.add_member(:signature, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Signature"))
+    CidrAuthorizationContext.struct_class = Types::CidrAuthorizationContext
+
     CidrBlock.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "cidrBlock"))
     CidrBlock.struct_class = Types::CidrBlock
 
@@ -2243,6 +2286,13 @@ module Aws::EC2
     DeleteVpnGatewayRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteVpnGatewayRequest.struct_class = Types::DeleteVpnGatewayRequest
 
+    DeprovisionByoipCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    DeprovisionByoipCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeprovisionByoipCidrRequest.struct_class = Types::DeprovisionByoipCidrRequest
+
+    DeprovisionByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
+    DeprovisionByoipCidrResult.struct_class = Types::DeprovisionByoipCidrResult
+
     DeregisterImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ImageId"))
     DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
@@ -2286,6 +2336,15 @@ module Aws::EC2
     DescribeBundleTasksResult.add_member(:bundle_tasks, Shapes::ShapeRef.new(shape: BundleTaskList, location_name: "bundleInstanceTasksSet"))
     DescribeBundleTasksResult.struct_class = Types::DescribeBundleTasksResult
 
+    DescribeByoipCidrsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeByoipCidrsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, required: true, location_name: "MaxResults"))
+    DescribeByoipCidrsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeByoipCidrsRequest.struct_class = Types::DescribeByoipCidrsRequest
+
+    DescribeByoipCidrsResult.add_member(:byoip_cidrs, Shapes::ShapeRef.new(shape: ByoipCidrSet, location_name: "byoipCidrSet"))
+    DescribeByoipCidrsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeByoipCidrsResult.struct_class = Types::DescribeByoipCidrsResult
+
     DescribeClassicLinkInstancesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeClassicLinkInstancesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeClassicLinkInstancesRequest.add_member(:instance_ids, Shapes::ShapeRef.new(shape: InstanceIdStringList, location_name: "InstanceId"))
@@ -2684,6 +2743,15 @@ module Aws::EC2
     DescribePrincipalIdFormatResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribePrincipalIdFormatResult.struct_class = Types::DescribePrincipalIdFormatResult
 
+    DescribePublicIpv4PoolsRequest.add_member(:pool_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "PoolId"))
+    DescribePublicIpv4PoolsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribePublicIpv4PoolsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: PoolMaxResults, location_name: "MaxResults"))
+    DescribePublicIpv4PoolsRequest.struct_class = Types::DescribePublicIpv4PoolsRequest
+
+    DescribePublicIpv4PoolsResult.add_member(:public_ipv_4_pools, Shapes::ShapeRef.new(shape: PublicIpv4PoolSet, location_name: "publicIpv4PoolSet"))
+    DescribePublicIpv4PoolsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribePublicIpv4PoolsResult.struct_class = Types::DescribePublicIpv4PoolsResult
+
     DescribeRegionsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeRegionsRequest.add_member(:region_names, Shapes::ShapeRef.new(shape: RegionNameStringList, location_name: "RegionName"))
     DescribeRegionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -4794,6 +4862,15 @@ module Aws::EC2
 
     PropagatingVgwList.member = Shapes::ShapeRef.new(shape: PropagatingVgw, location_name: "item")
 
+    ProvisionByoipCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    ProvisionByoipCidrRequest.add_member(:cidr_authorization_context, Shapes::ShapeRef.new(shape: CidrAuthorizationContext, location_name: "CidrAuthorizationContext"))
+    ProvisionByoipCidrRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    ProvisionByoipCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ProvisionByoipCidrRequest.struct_class = Types::ProvisionByoipCidrRequest
+
+    ProvisionByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
+    ProvisionByoipCidrResult.struct_class = Types::ProvisionByoipCidrResult
+
     ProvisionedBandwidth.add_member(:provision_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "provisionTime"))
     ProvisionedBandwidth.add_member(:provisioned, Shapes::ShapeRef.new(shape: String, location_name: "provisioned"))
     ProvisionedBandwidth.add_member(:request_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "requestTime"))
@@ -4803,6 +4880,23 @@ module Aws::EC2
 
     PublicIpStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "PublicIp")
 
+    PublicIpv4Pool.add_member(:pool_id, Shapes::ShapeRef.new(shape: String, location_name: "poolId"))
+    PublicIpv4Pool.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    PublicIpv4Pool.add_member(:pool_address_ranges, Shapes::ShapeRef.new(shape: PublicIpv4PoolRangeSet, location_name: "poolAddressRangeSet"))
+    PublicIpv4Pool.add_member(:total_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "totalAddressCount"))
+    PublicIpv4Pool.add_member(:total_available_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "totalAvailableAddressCount"))
+    PublicIpv4Pool.struct_class = Types::PublicIpv4Pool
+
+    PublicIpv4PoolRange.add_member(:first_address, Shapes::ShapeRef.new(shape: String, location_name: "firstAddress"))
+    PublicIpv4PoolRange.add_member(:last_address, Shapes::ShapeRef.new(shape: String, location_name: "lastAddress"))
+    PublicIpv4PoolRange.add_member(:address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "addressCount"))
+    PublicIpv4PoolRange.add_member(:available_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "availableAddressCount"))
+    PublicIpv4PoolRange.struct_class = Types::PublicIpv4PoolRange
+
+    PublicIpv4PoolRangeSet.member = Shapes::ShapeRef.new(shape: PublicIpv4PoolRange, location_name: "item")
+
+    PublicIpv4PoolSet.member = Shapes::ShapeRef.new(shape: PublicIpv4Pool, location_name: "item")
+
     Purchase.add_member(:currency_code, Shapes::ShapeRef.new(shape: CurrencyCodeValues, location_name: "currencyCode"))
     Purchase.add_member(:duration, Shapes::ShapeRef.new(shape: Integer, location_name: "duration"))
     Purchase.add_member(:host_id_set, Shapes::ShapeRef.new(shape: ResponseHostIdSet, location_name: "hostIdSet"))
@@ -6195,6 +6289,13 @@ module Aws::EC2
     VpnTunnelOptionsSpecification.add_member(:pre_shared_key, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKey"))
     VpnTunnelOptionsSpecification.struct_class = Types::VpnTunnelOptionsSpecification
 
+    WithdrawByoipCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    WithdrawByoipCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    WithdrawByoipCidrRequest.struct_class = Types::WithdrawByoipCidrRequest
+
+    WithdrawByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
+    WithdrawByoipCidrResult.struct_class = Types::WithdrawByoipCidrResult
+
     ZoneNameStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "ZoneName")
 
 
@@ -6239,6 +6340,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: AcceptVpcPeeringConnectionResult)
       end)
 
+      api.add_operation(:advertise_byoip_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "AdvertiseByoipCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: AdvertiseByoipCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: AdvertiseByoipCidrResult)
+      end)
+
       api.add_operation(:allocate_address, Seahorse::Model::Operation.new.tap do |o|
         o.name = "AllocateAddress"
         o.http_method = "POST"
@@ -7023,6 +7132,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:deprovision_byoip_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeprovisionByoipCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeprovisionByoipCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeprovisionByoipCidrResult)
+      end)
+
       api.add_operation(:deregister_image, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeregisterImage"
         o.http_method = "POST"
@@ -7071,6 +7188,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DescribeBundleTasksResult)
       end)
 
+      api.add_operation(:describe_byoip_cidrs, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeByoipCidrs"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeByoipCidrsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeByoipCidrsResult)
+      end)
+
       api.add_operation(:describe_classic_link_instances, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeClassicLinkInstances"
         o.http_method = "POST"
@@ -7415,6 +7540,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DescribePrincipalIdFormatResult)
       end)
 
+      api.add_operation(:describe_public_ipv_4_pools, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribePublicIpv4Pools"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribePublicIpv4PoolsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribePublicIpv4PoolsResult)
+      end)
+
       api.add_operation(:describe_regions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeRegions"
         o.http_method = "POST"
@@ -8198,6 +8331,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: MoveAddressToVpcResult)
       end)
 
+      api.add_operation(:provision_byoip_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ProvisionByoipCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ProvisionByoipCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: ProvisionByoipCidrResult)
+      end)
+
       api.add_operation(:purchase_host_reservation, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PurchaseHostReservation"
         o.http_method = "POST"
@@ -8477,6 +8618,14 @@ module Aws::EC2
         o.input = Shapes::ShapeRef.new(shape: UpdateSecurityGroupRuleDescriptionsIngressRequest)
         o.output = Shapes::ShapeRef.new(shape: UpdateSecurityGroupRuleDescriptionsIngressResult)
       end)
+
+      api.add_operation(:withdraw_byoip_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "WithdrawByoipCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: WithdrawByoipCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: WithdrawByoipCidrResult)
+      end)
     end
 
   end

data/lib/aws-sdk-ec2/network_acl.rb

@@ -226,22 +226,23 @@ module Aws::EC2
     #   leaving the subnet).
     # @option options [Types::IcmpTypeCode] :icmp_type_code
     #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
-    #   specifying the ICMP protocol, or protocol 58 (ICMPv6) with an IPv6
-    #   CIDR block.
+    #   specifying protocol 1 (ICMP) or protocol 58 (ICMPv6) with an IPv6 CIDR
+    #   block.
     # @option options [String] :ipv_6_cidr_block
     #   The IPv6 network range to allow or deny, in CIDR notation (for example
     #   `2001:db8:1234:1a00::/64`).
     # @option options [Types::PortRange] :port_range
-    #   TCP or UDP protocols: The range of ports the rule applies to.
+    #   TCP or UDP protocols: The range of ports the rule applies to. Required
+    #   if specifying protocol 6 (TCP) or 17 (UDP).
     # @option options [required, String] :protocol
-    #   The protocol. A value of `-1` or `all` means all protocols. If you
-    #   specify `all`, `-1`, or a protocol number other than `6` (tcp), `17`
-    #   (udp), or `1` (icmp), traffic on all ports is allowed, regardless of
+    #   The protocol number. A value of "-1" means all protocols. If you
+    #   specify "-1" or a protocol number other than "6" (TCP), "17"
+    #   (UDP), or "1" (ICMP), traffic on all ports is allowed, regardless of
     #   any ports or ICMP types or codes that you specify. If you specify
-    #   protocol `58` (ICMPv6) and specify an IPv4 CIDR block, traffic for all
-    #   ICMP types and codes allowed, regardless of any that you specify. If
-    #   you specify protocol `58` (ICMPv6) and specify an IPv6 CIDR block, you
-    #   must specify an ICMP type and code.
+    #   protocol "58" (ICMPv6) and specify an IPv4 CIDR block, traffic for
+    #   all ICMP types and codes allowed, regardless of any that you specify.
+    #   If you specify protocol "58" (ICMPv6) and specify an IPv6 CIDR
+    #   block, you must specify an ICMP type and code.
     # @option options [required, String] :rule_action
     #   Indicates whether to allow or deny the traffic that matches the rule.
     # @option options [required, Integer] :rule_number
@@ -392,23 +393,23 @@ module Aws::EC2
     #   Default: If no value is specified, we replace the ingress rule.
     # @option options [Types::IcmpTypeCode] :icmp_type_code
     #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
-    #   specifying the ICMP (1) protocol, or protocol 58 (ICMPv6) with an IPv6
-    #   CIDR block.
+    #   specifying protocol 1 (ICMP) or protocol 58 (ICMPv6) with an IPv6 CIDR
+    #   block.
     # @option options [String] :ipv_6_cidr_block
     #   The IPv6 network range to allow or deny, in CIDR notation (for example
     #   `2001:bd8:1234:1a00::/64`).
     # @option options [Types::PortRange] :port_range
     #   TCP or UDP protocols: The range of ports the rule applies to. Required
-    #   if specifying TCP (6) or UDP (17) for the protocol.
+    #   if specifying protocol 6 (TCP) or 17 (UDP).
     # @option options [required, String] :protocol
-    #   The IP protocol. You can specify `all` or `-1` to mean all protocols.
-    #   If you specify `all`, `-1`, or a protocol number other than `tcp`,
-    #   `udp`, or `icmp`, traffic on all ports is allowed, regardless of any
-    #   ports or ICMP types or codes you that specify. If you specify protocol
-    #   `58` (ICMPv6) and specify an IPv4 CIDR block, traffic for all ICMP
-    #   types and codes allowed, regardless of any that you specify. If you
-    #   specify protocol `58` (ICMPv6) and specify an IPv6 CIDR block, you
-    #   must specify an ICMP type and code.
+    #   The protocol number. A value of "-1" means all protocols. If you
+    #   specify "-1" or a protocol number other than "6" (TCP), "17"
+    #   (UDP), or "1" (ICMP), traffic on all ports is allowed, regardless of
+    #   any ports or ICMP types or codes that you specify. If you specify
+    #   protocol "58" (ICMPv6) and specify an IPv4 CIDR block, traffic for
+    #   all ICMP types and codes allowed, regardless of any that you specify.
+    #   If you specify protocol "58" (ICMPv6) and specify an IPv6 CIDR
+    #   block, you must specify an ICMP type and code.
     # @option options [required, String] :rule_action
     #   Indicates whether to allow or deny the traffic that matches the rule.
     # @option options [required, Integer] :rule_number

data/lib/aws-sdk-ec2/resource.rb

@@ -734,7 +734,7 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [required, Array<String>] :resources
-    #   The IDs of one or more resources to tag. For example, ami-1a2b3c4d.
+    #   The IDs of one or more resources, separated by spaces.
     # @option options [required, Array<Types::Tag>] :tags
     #   One or more tags. The `value` parameter is required, but if you don't
     #   want the tag to have a value, specify the parameter with no value, and

data/lib/aws-sdk-ec2/types.rb

@@ -250,6 +250,10 @@ module Aws::EC2
     #   Any tags assigned to the Elastic IP address.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] public_ipv_4_pool
+    #   The ID of an address pool.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Address AWS API Documentation
     #
     class Address < Struct.new(
@@ -261,18 +265,56 @@ module Aws::EC2
       :network_interface_id,
       :network_interface_owner_id,
       :private_ip_address,
-      :tags)
+      :tags,
+      :public_ipv_4_pool)
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass AdvertiseByoipCidrRequest
+    #   data as a hash:
+    #
+    #       {
+    #         cidr: "String", # required
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] cidr
+    #   The IPv4 address range, in CIDR notation.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AdvertiseByoipCidrRequest AWS API Documentation
+    #
+    class AdvertiseByoipCidrRequest < Struct.new(
+      :cidr,
+      :dry_run)
       include Aws::Structure
     end
 
-    # Contains the parameters for AllocateAddress.
+    # @!attribute [rw] byoip_cidr
+    #   Information about the address range.
+    #   @return [Types::ByoipCidr]
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AdvertiseByoipCidrResult AWS API Documentation
+    #
+    class AdvertiseByoipCidrResult < Struct.new(
+      :byoip_cidr)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass AllocateAddressRequest
     #   data as a hash:
     #
     #       {
     #         domain: "vpc", # accepts vpc, standard
     #         address: "String",
+    #         public_ipv_4_pool: "String",
     #         dry_run: false,
     #       }
     #
@@ -284,7 +326,15 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] address
-    #   \[EC2-VPC\] The Elastic IP address to recover.
+    #   \[EC2-VPC\] The Elastic IP address to recover or an IPv4 address
+    #   from an address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] public_ipv_4_pool
+    #   The ID of an address pool that you own. Use this parameter to let
+    #   Amazon EC2 select an address from the address pool. To specify a
+    #   specific address from the address pool, use the `Address` parameter
+    #   instead.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -299,12 +349,11 @@ module Aws::EC2
     class AllocateAddressRequest < Struct.new(
       :domain,
       :address,
+      :public_ipv_4_pool,
       :dry_run)
       include Aws::Structure
     end
 
-    # Contains the output of AllocateAddress.
-    #
     # @!attribute [rw] public_ip
     #   The Elastic IP address.
     #   @return [String]
@@ -314,6 +363,10 @@ module Aws::EC2
     #   the Elastic IP address for use with instances in a VPC.
     #   @return [String]
     #
+    # @!attribute [rw] public_ipv_4_pool
+    #   The ID of an address pool.
+    #   @return [String]
+    #
     # @!attribute [rw] domain
     #   Indicates whether this Elastic IP address is for use with instances
     #   in EC2-Classic (`standard`) or instances in a VPC (`vpc`).
@@ -324,6 +377,7 @@ module Aws::EC2
     class AllocateAddressResult < Struct.new(
       :public_ip,
       :allocation_id,
+      :public_ipv_4_pool,
       :domain)
       include Aws::Structure
     end
@@ -529,8 +583,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for AssociateAddress.
-    #
     # @note When making an API call, you may pass AssociateAddressRequest
     #   data as a hash:
     #
@@ -602,8 +654,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the output of AssociateAddress.
-    #
     # @!attribute [rw] association_id
     #   \[EC2-VPC\] The ID that represents the association of the Elastic IP
     #   address with an instance.
@@ -1622,6 +1672,36 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Information about an address range that is provisioned for use with
+    # your AWS resources through bring your own IP addresses (BYOIP).
+    #
+    # @!attribute [rw] cidr
+    #   The public IPv4 address range, in CIDR notation.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The description of the address range.
+    #   @return [String]
+    #
+    # @!attribute [rw] status_message
+    #   Upon success, contains the ID of the address pool. Otherwise,
+    #   contains an error message.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The state of the address pool.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ByoipCidr AWS API Documentation
+    #
+    class ByoipCidr < Struct.new(
+      :cidr,
+      :description,
+      :status_message,
+      :state)
+      include Aws::Structure
+    end
+
     # Contains the parameters for CancelBundleTask.
     #
     # @note When making an API call, you may pass CancelBundleTaskRequest
@@ -1986,6 +2066,33 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Provides authorization for Amazon to bring a specific IP address range
+    # to a specific AWS account using bring your own IP addresses (BYOIP).
+    #
+    # @note When making an API call, you may pass CidrAuthorizationContext
+    #   data as a hash:
+    #
+    #       {
+    #         message: "String", # required
+    #         signature: "String", # required
+    #       }
+    #
+    # @!attribute [rw] message
+    #   The plain-text authorization message for the prefix and account.
+    #   @return [String]
+    #
+    # @!attribute [rw] signature
+    #   The signed authorization message for the prefix and account.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CidrAuthorizationContext AWS API Documentation
+    #
+    class CidrAuthorizationContext < Struct.new(
+      :message,
+      :signature)
+      include Aws::Structure
+    end
+
     # Describes an IPv4 CIDR block.
     #
     # @!attribute [rw] cidr_block
@@ -3911,7 +4018,7 @@ module Aws::EC2
     #
     # @!attribute [rw] icmp_type_code
     #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
-    #   specifying the ICMP protocol, or protocol 58 (ICMPv6) with an IPv6
+    #   specifying protocol 1 (ICMP) or protocol 58 (ICMPv6) with an IPv6
     #   CIDR block.
     #   @return [Types::IcmpTypeCode]
     #
@@ -3926,16 +4033,17 @@ module Aws::EC2
     #
     # @!attribute [rw] port_range
     #   TCP or UDP protocols: The range of ports the rule applies to.
+    #   Required if specifying protocol 6 (TCP) or 17 (UDP).
     #   @return [Types::PortRange]
     #
     # @!attribute [rw] protocol
-    #   The protocol. A value of `-1` or `all` means all protocols. If you
-    #   specify `all`, `-1`, or a protocol number other than `6` (tcp), `17`
-    #   (udp), or `1` (icmp), traffic on all ports is allowed, regardless of
-    #   any ports or ICMP types or codes that you specify. If you specify
-    #   protocol `58` (ICMPv6) and specify an IPv4 CIDR block, traffic for
+    #   The protocol number. A value of "-1" means all protocols. If you
+    #   specify "-1" or a protocol number other than "6" (TCP), "17"
+    #   (UDP), or "1" (ICMP), traffic on all ports is allowed, regardless
+    #   of any ports or ICMP types or codes that you specify. If you specify
+    #   protocol "58" (ICMPv6) and specify an IPv4 CIDR block, traffic for
     #   all ICMP types and codes allowed, regardless of any that you
-    #   specify. If you specify protocol `58` (ICMPv6) and specify an IPv6
+    #   specify. If you specify protocol "58" (ICMPv6) and specify an IPv6
     #   CIDR block, you must specify an ICMP type and code.
     #   @return [String]
     #
@@ -4666,7 +4774,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] resources
-    #   The IDs of one or more resources to tag. For example, ami-1a2b3c4d.
+    #   The IDs of one or more resources, separated by spaces.
     #   @return [Array<String>]
     #
     # @!attribute [rw] tags
@@ -6413,7 +6521,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] resources
-    #   The IDs of one or more resources.
+    #   The IDs of one or more resources, separated by spaces.
     #   @return [Array<String>]
     #
     # @!attribute [rw] tags
@@ -6738,6 +6846,46 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DeprovisionByoipCidrRequest
+    #   data as a hash:
+    #
+    #       {
+    #         cidr: "String", # required
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] cidr
+    #   The public IPv4 address range, in CIDR notation. The prefix must be
+    #   the same prefix that you specified when you provisioned the address
+    #   range.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeprovisionByoipCidrRequest AWS API Documentation
+    #
+    class DeprovisionByoipCidrRequest < Struct.new(
+      :cidr,
+      :dry_run)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] byoip_cidr
+    #   Information about the address range.
+    #   @return [Types::ByoipCidr]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeprovisionByoipCidrResult AWS API Documentation
+    #
+    class DeprovisionByoipCidrResult < Struct.new(
+      :byoip_cidr)
+      include Aws::Structure
+    end
+
     # Contains the parameters for DeregisterImage.
     #
     # @note When making an API call, you may pass DeregisterImageRequest
@@ -6809,8 +6957,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for DescribeAddresses.
-    #
     # @note When making an API call, you may pass DescribeAddressesRequest
     #   data as a hash:
     #
@@ -6889,8 +7035,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the output of DescribeAddresses.
-    #
     # @!attribute [rw] addresses
     #   Information about one or more Elastic IP addresses.
     #   @return [Array<Types::Address>]
@@ -7084,6 +7228,58 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeByoipCidrsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         dry_run: false,
+    #         max_results: 1, # required
+    #         next_token: "NextToken",
+    #       }
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return with a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `nextToken` value.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeByoipCidrsRequest AWS API Documentation
+    #
+    class DescribeByoipCidrsRequest < Struct.new(
+      :dry_run,
+      :max_results,
+      :next_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] byoip_cidrs
+    #   Information about your address ranges.
+    #   @return [Array<Types::ByoipCidr>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeByoipCidrsResult AWS API Documentation
+    #
+    class DescribeByoipCidrsResult < Struct.new(
+      :byoip_cidrs,
+      :next_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeClassicLinkInstancesRequest
     #   data as a hash:
     #
@@ -9703,8 +9899,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for DescribeMovingAddresses.
-    #
     # @note When making an API call, you may pass DescribeMovingAddressesRequest
     #   data as a hash:
     #
@@ -9748,7 +9942,7 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] next_token
-    #   The token to use to retrieve the next page of results.
+    #   The token for the next page of results.
     #   @return [String]
     #
     # @!attribute [rw] public_ips
@@ -9766,8 +9960,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the output of DescribeMovingAddresses.
-    #
     # @!attribute [rw] moving_address_statuses
     #   The status for each Elastic IP address.
     #   @return [Array<Types::MovingAddressStatus>]
@@ -10508,6 +10700,55 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribePublicIpv4PoolsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         pool_ids: ["String"],
+    #         next_token: "NextToken",
+    #         max_results: 1,
+    #       }
+    #
+    # @!attribute [rw] pool_ids
+    #   The IDs of the address pools.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return with a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `nextToken` value.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribePublicIpv4PoolsRequest AWS API Documentation
+    #
+    class DescribePublicIpv4PoolsRequest < Struct.new(
+      :pool_ids,
+      :next_token,
+      :max_results)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] public_ipv_4_pools
+    #   Information about the address pools.
+    #   @return [Array<Types::PublicIpv4Pool>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribePublicIpv4PoolsResult AWS API Documentation
+    #
+    class DescribePublicIpv4PoolsResult < Struct.new(
+      :public_ipv_4_pools,
+      :next_token)
+      include Aws::Structure
+    end
+
     # Contains the parameters for DescribeRegions.
     #
     # @note When making an API call, you may pass DescribeRegionsRequest
@@ -14313,8 +14554,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for DisassociateAddress.
-    #
     # @note When making an API call, you may pass DisassociateAddressRequest
     #   data as a hash:
     #
@@ -21986,8 +22225,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for MoveAddressToVpc.
-    #
     # @note When making an API call, you may pass MoveAddressToVpcRequest
     #   data as a hash:
     #
@@ -22015,8 +22252,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the output of MoveAddressToVpc.
-    #
     # @!attribute [rw] allocation_id
     #   The allocation ID for the Elastic IP address.
     #   @return [String]
@@ -22277,7 +22512,7 @@ module Aws::EC2
     #   @return [Types::PortRange]
     #
     # @!attribute [rw] protocol
-    #   The protocol. A value of `-1` means all protocols.
+    #   The protocol number. A value of "-1" means all protocols.
     #   @return [String]
     #
     # @!attribute [rw] rule_action
@@ -23109,6 +23344,63 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ProvisionByoipCidrRequest
+    #   data as a hash:
+    #
+    #       {
+    #         cidr: "String", # required
+    #         cidr_authorization_context: {
+    #           message: "String", # required
+    #           signature: "String", # required
+    #         },
+    #         description: "String",
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] cidr
+    #   The public IPv4 address range, in CIDR notation. The most specific
+    #   prefix that you can specify is /24. The address range cannot overlap
+    #   with another address range that you've brought to this or another
+    #   region.
+    #   @return [String]
+    #
+    # @!attribute [rw] cidr_authorization_context
+    #   A signed document that proves that you are authorized to bring the
+    #   specified IP address range to Amazon using BYOIP.
+    #   @return [Types::CidrAuthorizationContext]
+    #
+    # @!attribute [rw] description
+    #   A description for the address range and the address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ProvisionByoipCidrRequest AWS API Documentation
+    #
+    class ProvisionByoipCidrRequest < Struct.new(
+      :cidr,
+      :cidr_authorization_context,
+      :description,
+      :dry_run)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] byoip_cidr
+    #   Information about the address pool.
+    #   @return [Types::ByoipCidr]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ProvisionByoipCidrResult AWS API Documentation
+    #
+    class ProvisionByoipCidrResult < Struct.new(
+      :byoip_cidr)
+      include Aws::Structure
+    end
+
     # Reserved. If you need to sustain traffic greater than the [documented
     # limits][1], contact us through the [Support Center][2].
     #
@@ -23178,6 +23470,67 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes an address pool.
+    #
+    # @!attribute [rw] pool_id
+    #   The ID of the IPv4 address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   A description of the address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] pool_address_ranges
+    #   The address ranges.
+    #   @return [Array<Types::PublicIpv4PoolRange>]
+    #
+    # @!attribute [rw] total_address_count
+    #   The total number of addresses.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total_available_address_count
+    #   The total number of available addresses.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PublicIpv4Pool AWS API Documentation
+    #
+    class PublicIpv4Pool < Struct.new(
+      :pool_id,
+      :description,
+      :pool_address_ranges,
+      :total_address_count,
+      :total_available_address_count)
+      include Aws::Structure
+    end
+
+    # Describes an address range of an IPv4 address pool.
+    #
+    # @!attribute [rw] first_address
+    #   The first IP address in the range.
+    #   @return [String]
+    #
+    # @!attribute [rw] last_address
+    #   The last IP address in the range.
+    #   @return [String]
+    #
+    # @!attribute [rw] address_count
+    #   The number of addresses in the range.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] available_address_count
+    #   The number of available addresses in the range.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PublicIpv4PoolRange AWS API Documentation
+    #
+    class PublicIpv4PoolRange < Struct.new(
+      :first_address,
+      :last_address,
+      :address_count,
+      :available_address_count)
+      include Aws::Structure
+    end
+
     # Describes the result of the purchase.
     #
     # @!attribute [rw] currency_code
@@ -23766,8 +24119,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for ReleaseAddress.
-    #
     # @note When making an API call, you may pass ReleaseAddressRequest
     #   data as a hash:
     #
@@ -23961,8 +24312,8 @@ module Aws::EC2
     #
     # @!attribute [rw] icmp_type_code
     #   ICMP protocol: The ICMP or ICMPv6 type and code. Required if
-    #   specifying the ICMP (1) protocol, or protocol 58 (ICMPv6) with an
-    #   IPv6 CIDR block.
+    #   specifying protocol 1 (ICMP) or protocol 58 (ICMPv6) with an IPv6
+    #   CIDR block.
     #   @return [Types::IcmpTypeCode]
     #
     # @!attribute [rw] ipv_6_cidr_block
@@ -23976,18 +24327,18 @@ module Aws::EC2
     #
     # @!attribute [rw] port_range
     #   TCP or UDP protocols: The range of ports the rule applies to.
-    #   Required if specifying TCP (6) or UDP (17) for the protocol.
+    #   Required if specifying protocol 6 (TCP) or 17 (UDP).
     #   @return [Types::PortRange]
     #
     # @!attribute [rw] protocol
-    #   The IP protocol. You can specify `all` or `-1` to mean all
-    #   protocols. If you specify `all`, `-1`, or a protocol number other
-    #   than `tcp`, `udp`, or `icmp`, traffic on all ports is allowed,
-    #   regardless of any ports or ICMP types or codes you that specify. If
-    #   you specify protocol `58` (ICMPv6) and specify an IPv4 CIDR block,
-    #   traffic for all ICMP types and codes allowed, regardless of any that
-    #   you specify. If you specify protocol `58` (ICMPv6) and specify an
-    #   IPv6 CIDR block, you must specify an ICMP type and code.
+    #   The protocol number. A value of "-1" means all protocols. If you
+    #   specify "-1" or a protocol number other than "6" (TCP), "17"
+    #   (UDP), or "1" (ICMP), traffic on all ports is allowed, regardless
+    #   of any ports or ICMP types or codes that you specify. If you specify
+    #   protocol "58" (ICMPv6) and specify an IPv4 CIDR block, traffic for
+    #   all ICMP types and codes allowed, regardless of any that you
+    #   specify. If you specify protocol "58" (ICMPv6) and specify an IPv6
+    #   CIDR block, you must specify an ICMP type and code.
     #   @return [String]
     #
     # @!attribute [rw] rule_action
@@ -25923,8 +26274,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the parameters for RestoreAddressToClassic.
-    #
     # @note When making an API call, you may pass RestoreAddressToClassicRequest
     #   data as a hash:
     #
@@ -25952,8 +26301,6 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Contains the output of RestoreAddressToClassic.
-    #
     # @!attribute [rw] public_ip
     #   The Elastic IP address.
     #   @return [String]
@@ -28764,7 +29111,7 @@ module Aws::EC2
     #
     # @!attribute [rw] fulfilled_capacity
     #   The number of units fulfilled by this request compared to the set
-    #   target capacity.
+    #   target capacity. You cannot set this value.
     #   @return [Float]
     #
     # @!attribute [rw] on_demand_fulfilled_capacity
@@ -29750,7 +30097,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] resource_id
-    #   The ID of the resource. For example, `ami-1a2b3c4d`.
+    #   The ID of the resource.
     #   @return [String]
     #
     # @!attribute [rw] resource_type
@@ -31577,5 +31924,43 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass WithdrawByoipCidrRequest
+    #   data as a hash:
+    #
+    #       {
+    #         cidr: "String", # required
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] cidr
+    #   The public IPv4 address range, in CIDR notation.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/WithdrawByoipCidrRequest AWS API Documentation
+    #
+    class WithdrawByoipCidrRequest < Struct.new(
+      :cidr,
+      :dry_run)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] byoip_cidr
+    #   Information about the address pool.
+    #   @return [Types::ByoipCidr]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/WithdrawByoipCidrResult AWS API Documentation
+    #
+    class WithdrawByoipCidrResult < Struct.new(
+      :byoip_cidr)
+      include Aws::Structure
+    end
+
   end
 end