aws-sdk-ec2 1.243.0 → 1.244.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -98,6 +98,8 @@ module Aws::EC2
98
98
  AssociateTransitGatewayMulticastDomainResult = Shapes::StructureShape.new(name: 'AssociateTransitGatewayMulticastDomainResult')
99
99
  AssociateTransitGatewayRouteTableRequest = Shapes::StructureShape.new(name: 'AssociateTransitGatewayRouteTableRequest')
100
100
  AssociateTransitGatewayRouteTableResult = Shapes::StructureShape.new(name: 'AssociateTransitGatewayRouteTableResult')
101
+ AssociateTrunkInterfaceRequest = Shapes::StructureShape.new(name: 'AssociateTrunkInterfaceRequest')
102
+ AssociateTrunkInterfaceResult = Shapes::StructureShape.new(name: 'AssociateTrunkInterfaceResult')
101
103
  AssociateVpcCidrBlockRequest = Shapes::StructureShape.new(name: 'AssociateVpcCidrBlockRequest')
102
104
  AssociateVpcCidrBlockResult = Shapes::StructureShape.new(name: 'AssociateVpcCidrBlockResult')
103
105
  AssociatedNetworkType = Shapes::StringShape.new(name: 'AssociatedNetworkType')
@@ -796,6 +798,9 @@ module Aws::EC2
796
798
  DescribeTransitGatewayVpcAttachmentsResult = Shapes::StructureShape.new(name: 'DescribeTransitGatewayVpcAttachmentsResult')
797
799
  DescribeTransitGatewaysRequest = Shapes::StructureShape.new(name: 'DescribeTransitGatewaysRequest')
798
800
  DescribeTransitGatewaysResult = Shapes::StructureShape.new(name: 'DescribeTransitGatewaysResult')
801
+ DescribeTrunkInterfaceAssociationsMaxResults = Shapes::IntegerShape.new(name: 'DescribeTrunkInterfaceAssociationsMaxResults')
802
+ DescribeTrunkInterfaceAssociationsRequest = Shapes::StructureShape.new(name: 'DescribeTrunkInterfaceAssociationsRequest')
803
+ DescribeTrunkInterfaceAssociationsResult = Shapes::StructureShape.new(name: 'DescribeTrunkInterfaceAssociationsResult')
799
804
  DescribeVolumeAttributeRequest = Shapes::StructureShape.new(name: 'DescribeVolumeAttributeRequest')
800
805
  DescribeVolumeAttributeResult = Shapes::StructureShape.new(name: 'DescribeVolumeAttributeResult')
801
806
  DescribeVolumeStatusRequest = Shapes::StructureShape.new(name: 'DescribeVolumeStatusRequest')
@@ -886,6 +891,8 @@ module Aws::EC2
886
891
  DisassociateTransitGatewayMulticastDomainResult = Shapes::StructureShape.new(name: 'DisassociateTransitGatewayMulticastDomainResult')
887
892
  DisassociateTransitGatewayRouteTableRequest = Shapes::StructureShape.new(name: 'DisassociateTransitGatewayRouteTableRequest')
888
893
  DisassociateTransitGatewayRouteTableResult = Shapes::StructureShape.new(name: 'DisassociateTransitGatewayRouteTableResult')
894
+ DisassociateTrunkInterfaceRequest = Shapes::StructureShape.new(name: 'DisassociateTrunkInterfaceRequest')
895
+ DisassociateTrunkInterfaceResult = Shapes::StructureShape.new(name: 'DisassociateTrunkInterfaceResult')
889
896
  DisassociateVpcCidrBlockRequest = Shapes::StructureShape.new(name: 'DisassociateVpcCidrBlockRequest')
890
897
  DisassociateVpcCidrBlockResult = Shapes::StructureShape.new(name: 'DisassociateVpcCidrBlockResult')
891
898
  DiskCount = Shapes::IntegerShape.new(name: 'DiskCount')
@@ -1279,6 +1286,7 @@ module Aws::EC2
1279
1286
  Integer = Shapes::IntegerShape.new(name: 'Integer')
1280
1287
  IntegrateServices = Shapes::StructureShape.new(name: 'IntegrateServices')
1281
1288
  InterfacePermissionType = Shapes::StringShape.new(name: 'InterfacePermissionType')
1289
+ InterfaceProtocolType = Shapes::StringShape.new(name: 'InterfaceProtocolType')
1282
1290
  InternetGateway = Shapes::StructureShape.new(name: 'InternetGateway')
1283
1291
  InternetGatewayAttachment = Shapes::StructureShape.new(name: 'InternetGatewayAttachment')
1284
1292
  InternetGatewayAttachmentList = Shapes::ListShape.new(name: 'InternetGatewayAttachmentList')
@@ -2135,6 +2143,10 @@ module Aws::EC2
2135
2143
  TransitGatewayVpcAttachmentList = Shapes::ListShape.new(name: 'TransitGatewayVpcAttachmentList')
2136
2144
  TransitGatewayVpcAttachmentOptions = Shapes::StructureShape.new(name: 'TransitGatewayVpcAttachmentOptions')
2137
2145
  TransportProtocol = Shapes::StringShape.new(name: 'TransportProtocol')
2146
+ TrunkInterfaceAssociation = Shapes::StructureShape.new(name: 'TrunkInterfaceAssociation')
2147
+ TrunkInterfaceAssociationId = Shapes::StringShape.new(name: 'TrunkInterfaceAssociationId')
2148
+ TrunkInterfaceAssociationIdList = Shapes::ListShape.new(name: 'TrunkInterfaceAssociationIdList')
2149
+ TrunkInterfaceAssociationList = Shapes::ListShape.new(name: 'TrunkInterfaceAssociationList')
2138
2150
  TunnelInsideIpVersion = Shapes::StringShape.new(name: 'TunnelInsideIpVersion')
2139
2151
  TunnelOption = Shapes::StructureShape.new(name: 'TunnelOption')
2140
2152
  TunnelOptionsList = Shapes::ListShape.new(name: 'TunnelOptionsList')
@@ -2591,6 +2603,18 @@ module Aws::EC2
2591
2603
  AssociateTransitGatewayRouteTableResult.add_member(:association, Shapes::ShapeRef.new(shape: TransitGatewayAssociation, location_name: "association"))
2592
2604
  AssociateTransitGatewayRouteTableResult.struct_class = Types::AssociateTransitGatewayRouteTableResult
2593
2605
 
2606
+ AssociateTrunkInterfaceRequest.add_member(:branch_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, required: true, location_name: "BranchInterfaceId"))
2607
+ AssociateTrunkInterfaceRequest.add_member(:trunk_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, required: true, location_name: "TrunkInterfaceId"))
2608
+ AssociateTrunkInterfaceRequest.add_member(:vlan_id, Shapes::ShapeRef.new(shape: Integer, location_name: "VlanId"))
2609
+ AssociateTrunkInterfaceRequest.add_member(:gre_key, Shapes::ShapeRef.new(shape: Integer, location_name: "GreKey"))
2610
+ AssociateTrunkInterfaceRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
2611
+ AssociateTrunkInterfaceRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
2612
+ AssociateTrunkInterfaceRequest.struct_class = Types::AssociateTrunkInterfaceRequest
2613
+
2614
+ AssociateTrunkInterfaceResult.add_member(:interface_association, Shapes::ShapeRef.new(shape: TrunkInterfaceAssociation, location_name: "interfaceAssociation"))
2615
+ AssociateTrunkInterfaceResult.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
2616
+ AssociateTrunkInterfaceResult.struct_class = Types::AssociateTrunkInterfaceResult
2617
+
2594
2618
  AssociateVpcCidrBlockRequest.add_member(:amazon_provided_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: Boolean, location_name: "amazonProvidedIpv6CidrBlock"))
2595
2619
  AssociateVpcCidrBlockRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "CidrBlock"))
2596
2620
  AssociateVpcCidrBlockRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "vpcId"))
@@ -5528,6 +5552,17 @@ module Aws::EC2
5528
5552
  DescribeTransitGatewaysResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
5529
5553
  DescribeTransitGatewaysResult.struct_class = Types::DescribeTransitGatewaysResult
5530
5554
 
5555
+ DescribeTrunkInterfaceAssociationsRequest.add_member(:association_ids, Shapes::ShapeRef.new(shape: TrunkInterfaceAssociationIdList, location_name: "AssociationId"))
5556
+ DescribeTrunkInterfaceAssociationsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
5557
+ DescribeTrunkInterfaceAssociationsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
5558
+ DescribeTrunkInterfaceAssociationsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
5559
+ DescribeTrunkInterfaceAssociationsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeTrunkInterfaceAssociationsMaxResults, location_name: "MaxResults"))
5560
+ DescribeTrunkInterfaceAssociationsRequest.struct_class = Types::DescribeTrunkInterfaceAssociationsRequest
5561
+
5562
+ DescribeTrunkInterfaceAssociationsResult.add_member(:interface_associations, Shapes::ShapeRef.new(shape: TrunkInterfaceAssociationList, location_name: "interfaceAssociationSet"))
5563
+ DescribeTrunkInterfaceAssociationsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
5564
+ DescribeTrunkInterfaceAssociationsResult.struct_class = Types::DescribeTrunkInterfaceAssociationsResult
5565
+
5531
5566
  DescribeVolumeAttributeRequest.add_member(:attribute, Shapes::ShapeRef.new(shape: VolumeAttributeName, required: true, location_name: "Attribute"))
5532
5567
  DescribeVolumeAttributeRequest.add_member(:volume_id, Shapes::ShapeRef.new(shape: VolumeId, required: true, location_name: "VolumeId"))
5533
5568
  DescribeVolumeAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -5897,6 +5932,15 @@ module Aws::EC2
5897
5932
  DisassociateTransitGatewayRouteTableResult.add_member(:association, Shapes::ShapeRef.new(shape: TransitGatewayAssociation, location_name: "association"))
5898
5933
  DisassociateTransitGatewayRouteTableResult.struct_class = Types::DisassociateTransitGatewayRouteTableResult
5899
5934
 
5935
+ DisassociateTrunkInterfaceRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: TrunkInterfaceAssociationId, required: true, location_name: "AssociationId"))
5936
+ DisassociateTrunkInterfaceRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
5937
+ DisassociateTrunkInterfaceRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
5938
+ DisassociateTrunkInterfaceRequest.struct_class = Types::DisassociateTrunkInterfaceRequest
5939
+
5940
+ DisassociateTrunkInterfaceResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
5941
+ DisassociateTrunkInterfaceResult.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
5942
+ DisassociateTrunkInterfaceResult.struct_class = Types::DisassociateTrunkInterfaceResult
5943
+
5900
5944
  DisassociateVpcCidrBlockRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: VpcCidrAssociationId, required: true, location_name: "associationId"))
5901
5945
  DisassociateVpcCidrBlockRequest.struct_class = Types::DisassociateVpcCidrBlockRequest
5902
5946
 
@@ -10664,6 +10708,19 @@ module Aws::EC2
10664
10708
  TransitGatewayVpcAttachmentOptions.add_member(:appliance_mode_support, Shapes::ShapeRef.new(shape: ApplianceModeSupportValue, location_name: "applianceModeSupport"))
10665
10709
  TransitGatewayVpcAttachmentOptions.struct_class = Types::TransitGatewayVpcAttachmentOptions
10666
10710
 
10711
+ TrunkInterfaceAssociation.add_member(:association_id, Shapes::ShapeRef.new(shape: TrunkInterfaceAssociationId, location_name: "associationId"))
10712
+ TrunkInterfaceAssociation.add_member(:branch_interface_id, Shapes::ShapeRef.new(shape: String, location_name: "branchInterfaceId"))
10713
+ TrunkInterfaceAssociation.add_member(:trunk_interface_id, Shapes::ShapeRef.new(shape: String, location_name: "trunkInterfaceId"))
10714
+ TrunkInterfaceAssociation.add_member(:interface_protocol, Shapes::ShapeRef.new(shape: InterfaceProtocolType, location_name: "interfaceProtocol"))
10715
+ TrunkInterfaceAssociation.add_member(:vlan_id, Shapes::ShapeRef.new(shape: Integer, location_name: "vlanId"))
10716
+ TrunkInterfaceAssociation.add_member(:gre_key, Shapes::ShapeRef.new(shape: Integer, location_name: "greKey"))
10717
+ TrunkInterfaceAssociation.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
10718
+ TrunkInterfaceAssociation.struct_class = Types::TrunkInterfaceAssociation
10719
+
10720
+ TrunkInterfaceAssociationIdList.member = Shapes::ShapeRef.new(shape: TrunkInterfaceAssociationId, location_name: "item")
10721
+
10722
+ TrunkInterfaceAssociationList.member = Shapes::ShapeRef.new(shape: TrunkInterfaceAssociation, location_name: "item")
10723
+
10667
10724
  TunnelOption.add_member(:outside_ip_address, Shapes::ShapeRef.new(shape: String, location_name: "outsideIpAddress"))
10668
10725
  TunnelOption.add_member(:tunnel_inside_cidr, Shapes::ShapeRef.new(shape: String, location_name: "tunnelInsideCidr"))
10669
10726
  TunnelOption.add_member(:tunnel_inside_ipv_6_cidr, Shapes::ShapeRef.new(shape: String, location_name: "tunnelInsideIpv6Cidr"))
@@ -11307,6 +11364,14 @@ module Aws::EC2
11307
11364
  o.output = Shapes::ShapeRef.new(shape: AssociateTransitGatewayRouteTableResult)
11308
11365
  end)
11309
11366
 
11367
+ api.add_operation(:associate_trunk_interface, Seahorse::Model::Operation.new.tap do |o|
11368
+ o.name = "AssociateTrunkInterface"
11369
+ o.http_method = "POST"
11370
+ o.http_request_uri = "/"
11371
+ o.input = Shapes::ShapeRef.new(shape: AssociateTrunkInterfaceRequest)
11372
+ o.output = Shapes::ShapeRef.new(shape: AssociateTrunkInterfaceResult)
11373
+ end)
11374
+
11310
11375
  api.add_operation(:associate_vpc_cidr_block, Seahorse::Model::Operation.new.tap do |o|
11311
11376
  o.name = "AssociateVpcCidrBlock"
11312
11377
  o.http_method = "POST"
@@ -13746,6 +13811,14 @@ module Aws::EC2
13746
13811
  )
13747
13812
  end)
13748
13813
 
13814
+ api.add_operation(:describe_trunk_interface_associations, Seahorse::Model::Operation.new.tap do |o|
13815
+ o.name = "DescribeTrunkInterfaceAssociations"
13816
+ o.http_method = "POST"
13817
+ o.http_request_uri = "/"
13818
+ o.input = Shapes::ShapeRef.new(shape: DescribeTrunkInterfaceAssociationsRequest)
13819
+ o.output = Shapes::ShapeRef.new(shape: DescribeTrunkInterfaceAssociationsResult)
13820
+ end)
13821
+
13749
13822
  api.add_operation(:describe_volume_attribute, Seahorse::Model::Operation.new.tap do |o|
13750
13823
  o.name = "DescribeVolumeAttribute"
13751
13824
  o.http_method = "POST"
@@ -14116,6 +14189,14 @@ module Aws::EC2
14116
14189
  o.output = Shapes::ShapeRef.new(shape: DisassociateTransitGatewayRouteTableResult)
14117
14190
  end)
14118
14191
 
14192
+ api.add_operation(:disassociate_trunk_interface, Seahorse::Model::Operation.new.tap do |o|
14193
+ o.name = "DisassociateTrunkInterface"
14194
+ o.http_method = "POST"
14195
+ o.http_request_uri = "/"
14196
+ o.input = Shapes::ShapeRef.new(shape: DisassociateTrunkInterfaceRequest)
14197
+ o.output = Shapes::ShapeRef.new(shape: DisassociateTrunkInterfaceResult)
14198
+ end)
14199
+
14119
14200
  api.add_operation(:disassociate_vpc_cidr_block, Seahorse::Model::Operation.new.tap do |o|
14120
14201
  o.name = "DisassociateVpcCidrBlock"
14121
14202
  o.http_method = "POST"
@@ -1538,12 +1538,13 @@ module Aws::EC2
1538
1538
  # with, if any.
1539
1539
  #
1540
1540
  # * `network-border-group` - A unique set of Availability Zones, Local
1541
- # Zones, or Wavelength Zones from where AWS advertises IP addresses.
1541
+ # Zones, or Wavelength Zones from where Amazon Web Services advertises
1542
+ # IP addresses.
1542
1543
  #
1543
1544
  # * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
1544
1545
  # that the address is associated with, if any.
1545
1546
  #
1546
- # * `network-interface-owner-id` - The AWS account ID of the owner.
1547
+ # * `network-interface-owner-id` - The account ID of the owner.
1547
1548
  #
1548
1549
  # * `private-ip-address` - \[EC2-VPC\] The private IP address associated
1549
1550
  # with the Elastic IP address.
@@ -83,7 +83,7 @@ module Aws::EC2
83
83
  data[:outpost_arn]
84
84
  end
85
85
 
86
- # The AWS account ID of the owner of the network interface.
86
+ # The account ID of the owner of the network interface.
87
87
  # @return [String]
88
88
  def owner_id
89
89
  data[:owner_id]
@@ -107,14 +107,15 @@ module Aws::EC2
107
107
  data[:private_ip_addresses]
108
108
  end
109
109
 
110
- # The alias or AWS account ID of the principal or service that created
111
- # the network interface.
110
+ # The alias or account ID of the principal or service that created the
111
+ # network interface.
112
112
  # @return [String]
113
113
  def requester_id
114
114
  data[:requester_id]
115
115
  end
116
116
 
117
- # Indicates whether the network interface is being managed by AWS.
117
+ # Indicates whether the network interface is being managed by Amazon Web
118
+ # Services.
118
119
  # @return [Boolean]
119
120
  def requester_managed
120
121
  data[:requester_managed]
@@ -733,7 +733,7 @@ module Aws::EC2
733
733
  # },
734
734
  # ],
735
735
  # secondary_private_ip_address_count: 1,
736
- # interface_type: "efa", # accepts efa
736
+ # interface_type: "efa", # accepts efa, branch, trunk
737
737
  # subnet_id: "SubnetId", # required
738
738
  # tag_specifications: [
739
739
  # {
@@ -795,10 +795,14 @@ module Aws::EC2
795
795
  # Indicates the type of network interface. To create an Elastic Fabric
796
796
  # Adapter (EFA), specify `efa`. For more information, see [ Elastic
797
797
  # Fabric Adapter][1] in the *Amazon Elastic Compute Cloud User Guide*.
798
+ # To create a trunk network interface, specify `efa`. For more
799
+ # information, see [ Network interface trunking][2] in the *Amazon
800
+ # Elastic Compute Cloud User Guide*.
798
801
  #
799
802
  #
800
803
  #
801
804
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html
805
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/eni-trunking.html
802
806
  # @option options [required, String] :subnet_id
803
807
  # The ID of the subnet to associate with the network interface.
804
808
  # @option options [Array<Types::TagSpecification>] :tag_specifications
@@ -1680,12 +1684,13 @@ module Aws::EC2
1680
1684
  # with, if any.
1681
1685
  #
1682
1686
  # * `network-border-group` - A unique set of Availability Zones, Local
1683
- # Zones, or Wavelength Zones from where AWS advertises IP addresses.
1687
+ # Zones, or Wavelength Zones from where Amazon Web Services advertises
1688
+ # IP addresses.
1684
1689
  #
1685
1690
  # * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
1686
1691
  # that the address is associated with, if any.
1687
1692
  #
1688
- # * `network-interface-owner-id` - The AWS account ID of the owner.
1693
+ # * `network-interface-owner-id` - The account ID of the owner.
1689
1694
  #
1690
1695
  # * `private-ip-address` - \[EC2-VPC\] The private IP address associated
1691
1696
  # with the Elastic IP address.
@@ -2699,7 +2704,7 @@ module Aws::EC2
2699
2704
  #
2700
2705
  # * `network-interface-id` - The ID of the network interface.
2701
2706
  #
2702
- # * `owner-id` - The AWS account ID of the network interface owner.
2707
+ # * `owner-id` - The account ID of the network interface owner.
2703
2708
  #
2704
2709
  # * `private-ip-address` - The private IPv4 address or addresses of the
2705
2710
  # network interface.
@@ -2707,11 +2712,11 @@ module Aws::EC2
2707
2712
  # * `private-dns-name` - The private DNS name of the network interface
2708
2713
  # (IPv4).
2709
2714
  #
2710
- # * `requester-id` - The alias or AWS account ID of the principal or
2711
- # service that created the network interface.
2715
+ # * `requester-id` - The alias or account ID of the principal or service
2716
+ # that created the network interface.
2712
2717
  #
2713
2718
  # * `requester-managed` - Indicates whether the network interface is
2714
- # being managed by an AWS service (for example, AWS Management
2719
+ # being managed by an Amazon Web Service (for example, Management
2715
2720
  # Console, Auto Scaling, and so on).
2716
2721
  #
2717
2722
  # * `source-dest-check` - Indicates whether the network interface
@@ -3443,12 +3448,13 @@ module Aws::EC2
3443
3448
  # with, if any.
3444
3449
  #
3445
3450
  # * `network-border-group` - A unique set of Availability Zones, Local
3446
- # Zones, or Wavelength Zones from where AWS advertises IP addresses.
3451
+ # Zones, or Wavelength Zones from where Amazon Web Services advertises
3452
+ # IP addresses.
3447
3453
  #
3448
3454
  # * `network-interface-id` - \[EC2-VPC\] The ID of the network interface
3449
3455
  # that the address is associated with, if any.
3450
3456
  #
3451
- # * `network-interface-owner-id` - The AWS account ID of the owner.
3457
+ # * `network-interface-owner-id` - The account ID of the owner.
3452
3458
  #
3453
3459
  # * `private-ip-address` - \[EC2-VPC\] The private IP address associated
3454
3460
  # with the Elastic IP address.
@@ -754,7 +754,7 @@ module Aws::EC2
754
754
  # },
755
755
  # ],
756
756
  # secondary_private_ip_address_count: 1,
757
- # interface_type: "efa", # accepts efa
757
+ # interface_type: "efa", # accepts efa, branch, trunk
758
758
  # tag_specifications: [
759
759
  # {
760
760
  # resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, internet-gateway, key-pair, launch-template, local-gateway-route-table-vpc-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log
@@ -815,10 +815,14 @@ module Aws::EC2
815
815
  # Indicates the type of network interface. To create an Elastic Fabric
816
816
  # Adapter (EFA), specify `efa`. For more information, see [ Elastic
817
817
  # Fabric Adapter][1] in the *Amazon Elastic Compute Cloud User Guide*.
818
+ # To create a trunk network interface, specify `efa`. For more
819
+ # information, see [ Network interface trunking][2] in the *Amazon
820
+ # Elastic Compute Cloud User Guide*.
818
821
  #
819
822
  #
820
823
  #
821
824
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html
825
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/eni-trunking.html
822
826
  # @option options [Array<Types::TagSpecification>] :tag_specifications
823
827
  # The tags to apply to the new network interface.
824
828
  # @option options [String] :client_token
@@ -1409,7 +1413,7 @@ module Aws::EC2
1409
1413
  #
1410
1414
  # * `network-interface-id` - The ID of the network interface.
1411
1415
  #
1412
- # * `owner-id` - The AWS account ID of the network interface owner.
1416
+ # * `owner-id` - The account ID of the network interface owner.
1413
1417
  #
1414
1418
  # * `private-ip-address` - The private IPv4 address or addresses of the
1415
1419
  # network interface.
@@ -1417,11 +1421,11 @@ module Aws::EC2
1417
1421
  # * `private-dns-name` - The private DNS name of the network interface
1418
1422
  # (IPv4).
1419
1423
  #
1420
- # * `requester-id` - The alias or AWS account ID of the principal or
1421
- # service that created the network interface.
1424
+ # * `requester-id` - The alias or account ID of the principal or service
1425
+ # that created the network interface.
1422
1426
  #
1423
1427
  # * `requester-managed` - Indicates whether the network interface is
1424
- # being managed by an AWS service (for example, AWS Management
1428
+ # being managed by an Amazon Web Service (for example, Management
1425
1429
  # Console, Auto Scaling, and so on).
1426
1430
  #
1427
1431
  # * `source-dest-check` - Indicates whether the network interface
@@ -412,7 +412,7 @@ module Aws::EC2
412
412
  # @return [String]
413
413
  #
414
414
  # @!attribute [rw] network_interface_owner_id
415
- # The ID of the AWS account that owns the network interface.
415
+ # The ID of the account that owns the network interface.
416
416
  # @return [String]
417
417
  #
418
418
  # @!attribute [rw] private_ip_address
@@ -639,8 +639,9 @@ module Aws::EC2
639
639
  # @return [String]
640
640
  #
641
641
  # @!attribute [rw] allocation_id
642
- # \[EC2-VPC\] The ID that AWS assigns to represent the allocation of
643
- # the Elastic IP address for use with instances in a VPC.
642
+ # \[EC2-VPC\] The ID that Amazon Web Services assigns to represent the
643
+ # allocation of the Elastic IP address for use with instances in a
644
+ # VPC.
644
645
  # @return [String]
645
646
  #
646
647
  # @!attribute [rw] public_ipv_4_pool
@@ -1786,6 +1787,91 @@ module Aws::EC2
1786
1787
  include Aws::Structure
1787
1788
  end
1788
1789
 
1790
+ # @note When making an API call, you may pass AssociateTrunkInterfaceRequest
1791
+ # data as a hash:
1792
+ #
1793
+ # {
1794
+ # branch_interface_id: "NetworkInterfaceId", # required
1795
+ # trunk_interface_id: "NetworkInterfaceId", # required
1796
+ # vlan_id: 1,
1797
+ # gre_key: 1,
1798
+ # client_token: "String",
1799
+ # dry_run: false,
1800
+ # }
1801
+ #
1802
+ # @!attribute [rw] branch_interface_id
1803
+ # The ID of the branch network interface.
1804
+ # @return [String]
1805
+ #
1806
+ # @!attribute [rw] trunk_interface_id
1807
+ # The ID of the trunk network interface.
1808
+ # @return [String]
1809
+ #
1810
+ # @!attribute [rw] vlan_id
1811
+ # The ID of the VLAN. This applies to the VLAN protocol.
1812
+ # @return [Integer]
1813
+ #
1814
+ # @!attribute [rw] gre_key
1815
+ # The application key. This applies to the GRE protocol.
1816
+ # @return [Integer]
1817
+ #
1818
+ # @!attribute [rw] client_token
1819
+ # Unique, case-sensitive identifier that you provide to ensure the
1820
+ # idempotency of the request. For more information, see [How to Ensure
1821
+ # Idempotency][1].
1822
+ #
1823
+ # **A suitable default value is auto-generated.** You should normally
1824
+ # not need to pass this option.
1825
+ #
1826
+ #
1827
+ #
1828
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
1829
+ # @return [String]
1830
+ #
1831
+ # @!attribute [rw] dry_run
1832
+ # Checks whether you have the required permissions for the action,
1833
+ # without actually making the request, and provides an error response.
1834
+ # If you have the required permissions, the error response is
1835
+ # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
1836
+ # @return [Boolean]
1837
+ #
1838
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociateTrunkInterfaceRequest AWS API Documentation
1839
+ #
1840
+ class AssociateTrunkInterfaceRequest < Struct.new(
1841
+ :branch_interface_id,
1842
+ :trunk_interface_id,
1843
+ :vlan_id,
1844
+ :gre_key,
1845
+ :client_token,
1846
+ :dry_run)
1847
+ SENSITIVE = []
1848
+ include Aws::Structure
1849
+ end
1850
+
1851
+ # @!attribute [rw] interface_association
1852
+ # Information about the association between the trunk network
1853
+ # interface and branch network interface.
1854
+ # @return [Types::TrunkInterfaceAssociation]
1855
+ #
1856
+ # @!attribute [rw] client_token
1857
+ # Unique, case-sensitive identifier that you provide to ensure the
1858
+ # idempotency of the request. For more information, see [How to Ensure
1859
+ # Idempotency][1].
1860
+ #
1861
+ #
1862
+ #
1863
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
1864
+ # @return [String]
1865
+ #
1866
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociateTrunkInterfaceResult AWS API Documentation
1867
+ #
1868
+ class AssociateTrunkInterfaceResult < Struct.new(
1869
+ :interface_association,
1870
+ :client_token)
1871
+ SENSITIVE = []
1872
+ include Aws::Structure
1873
+ end
1874
+
1789
1875
  # @note When making an API call, you may pass AssociateVpcCidrBlockRequest
1790
1876
  # data as a hash:
1791
1877
  #
@@ -3007,7 +3093,8 @@ module Aws::EC2
3007
3093
  end
3008
3094
 
3009
3095
  # Information about an address range that is provisioned for use with
3010
- # your AWS resources through bring your own IP addresses (BYOIP).
3096
+ # your Amazon Web Services resources through bring your own IP addresses
3097
+ # (BYOIP).
3011
3098
  #
3012
3099
  # @!attribute [rw] cidr
3013
3100
  # The address range, in CIDR notation.
@@ -3938,9 +4025,9 @@ module Aws::EC2
3938
4025
  end
3939
4026
 
3940
4027
  # Provides authorization for Amazon to bring a specific IP address range
3941
- # to a specific AWS account using bring your own IP addresses (BYOIP).
3942
- # For more information, see [Prepare to Bring Your Address Range to Your
3943
- # AWS Account][1] in the *Amazon Elastic Compute Cloud User Guide*.
4028
+ # to a specific account using bring your own IP addresses (BYOIP). For
4029
+ # more information, see [Configuring your BYOIP address range][1] in the
4030
+ # *Amazon Elastic Compute Cloud User Guide*.
3944
4031
  #
3945
4032
  #
3946
4033
  #
@@ -8179,11 +8266,11 @@ module Aws::EC2
8179
8266
  # @return [String]
8180
8267
  #
8181
8268
  # @!attribute [rw] aws_account_id
8182
- # The AWS account ID.
8269
+ # The account ID.
8183
8270
  # @return [String]
8184
8271
  #
8185
8272
  # @!attribute [rw] aws_service
8186
- # The AWS service. Currently not supported.
8273
+ # The Amazon Web Service. Currently not supported.
8187
8274
  # @return [String]
8188
8275
  #
8189
8276
  # @!attribute [rw] permission
@@ -8246,7 +8333,7 @@ module Aws::EC2
8246
8333
  # },
8247
8334
  # ],
8248
8335
  # secondary_private_ip_address_count: 1,
8249
- # interface_type: "efa", # accepts efa
8336
+ # interface_type: "efa", # accepts efa, branch, trunk
8250
8337
  # subnet_id: "SubnetId", # required
8251
8338
  # tag_specifications: [
8252
8339
  # {
@@ -8325,10 +8412,14 @@ module Aws::EC2
8325
8412
  # Indicates the type of network interface. To create an Elastic Fabric
8326
8413
  # Adapter (EFA), specify `efa`. For more information, see [ Elastic
8327
8414
  # Fabric Adapter][1] in the *Amazon Elastic Compute Cloud User Guide*.
8415
+ # To create a trunk network interface, specify `efa`. For more
8416
+ # information, see [ Network interface trunking][2] in the *Amazon
8417
+ # Elastic Compute Cloud User Guide*.
8328
8418
  #
8329
8419
  #
8330
8420
  #
8331
8421
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html
8422
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/eni-trunking.html
8332
8423
  # @return [String]
8333
8424
  #
8334
8425
  # @!attribute [rw] subnet_id
@@ -14312,12 +14403,13 @@ module Aws::EC2
14312
14403
  # with, if any.
14313
14404
  #
14314
14405
  # * `network-border-group` - A unique set of Availability Zones, Local
14315
- # Zones, or Wavelength Zones from where AWS advertises IP addresses.
14406
+ # Zones, or Wavelength Zones from where Amazon Web Services
14407
+ # advertises IP addresses.
14316
14408
  #
14317
14409
  # * `network-interface-id` - \[EC2-VPC\] The ID of the network
14318
14410
  # interface that the address is associated with, if any.
14319
14411
  #
14320
- # * `network-interface-owner-id` - The AWS account ID of the owner.
14412
+ # * `network-interface-owner-id` - The account ID of the owner.
14321
14413
  #
14322
14414
  # * `private-ip-address` - \[EC2-VPC\] The private IP address
14323
14415
  # associated with the Elastic IP address.
@@ -20044,10 +20136,10 @@ module Aws::EC2
20044
20136
  # * `network-interface-permission.network-interface-id` - The ID of
20045
20137
  # the network interface.
20046
20138
  #
20047
- # * `network-interface-permission.aws-account-id` - The AWS account
20048
- # ID.
20139
+ # * `network-interface-permission.aws-account-id` - The account ID.
20049
20140
  #
20050
- # * `network-interface-permission.aws-service` - The AWS service.
20141
+ # * `network-interface-permission.aws-service` - The Amazon Web
20142
+ # Service.
20051
20143
  #
20052
20144
  # * `network-interface-permission.permission` - The type of permission
20053
20145
  # (`INSTANCE-ATTACH` \| `EIP-ASSOCIATE`).
@@ -20182,7 +20274,7 @@ module Aws::EC2
20182
20274
  #
20183
20275
  # * `network-interface-id` - The ID of the network interface.
20184
20276
  #
20185
- # * `owner-id` - The AWS account ID of the network interface owner.
20277
+ # * `owner-id` - The account ID of the network interface owner.
20186
20278
  #
20187
20279
  # * `private-ip-address` - The private IPv4 address or addresses of
20188
20280
  # the network interface.
@@ -20190,11 +20282,11 @@ module Aws::EC2
20190
20282
  # * `private-dns-name` - The private DNS name of the network interface
20191
20283
  # (IPv4).
20192
20284
  #
20193
- # * `requester-id` - The alias or AWS account ID of the principal or
20285
+ # * `requester-id` - The alias or account ID of the principal or
20194
20286
  # service that created the network interface.
20195
20287
  #
20196
20288
  # * `requester-managed` - Indicates whether the network interface is
20197
- # being managed by an AWS service (for example, AWS Management
20289
+ # being managed by an Amazon Web Service (for example, Management
20198
20290
  # Console, Auto Scaling, and so on).
20199
20291
  #
20200
20292
  # * `source-dest-check` - Indicates whether the network interface
@@ -23873,6 +23965,82 @@ module Aws::EC2
23873
23965
  include Aws::Structure
23874
23966
  end
23875
23967
 
23968
+ # @note When making an API call, you may pass DescribeTrunkInterfaceAssociationsRequest
23969
+ # data as a hash:
23970
+ #
23971
+ # {
23972
+ # association_ids: ["TrunkInterfaceAssociationId"],
23973
+ # dry_run: false,
23974
+ # filters: [
23975
+ # {
23976
+ # name: "String",
23977
+ # values: ["String"],
23978
+ # },
23979
+ # ],
23980
+ # next_token: "String",
23981
+ # max_results: 1,
23982
+ # }
23983
+ #
23984
+ # @!attribute [rw] association_ids
23985
+ # The IDs of the associations.
23986
+ # @return [Array<String>]
23987
+ #
23988
+ # @!attribute [rw] dry_run
23989
+ # Checks whether you have the required permissions for the action,
23990
+ # without actually making the request, and provides an error response.
23991
+ # If you have the required permissions, the error response is
23992
+ # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
23993
+ # @return [Boolean]
23994
+ #
23995
+ # @!attribute [rw] filters
23996
+ # One or more filters.
23997
+ #
23998
+ # * `gre-key` - The ID of a trunk interface association.
23999
+ #
24000
+ # * `interface-protocol` - The interface protocol. Valid values are
24001
+ # `VLAN` and `GRE`.
24002
+ # @return [Array<Types::Filter>]
24003
+ #
24004
+ # @!attribute [rw] next_token
24005
+ # The token for the next page of results.
24006
+ # @return [String]
24007
+ #
24008
+ # @!attribute [rw] max_results
24009
+ # The maximum number of results to return with a single call. To
24010
+ # retrieve the remaining results, make another call with the returned
24011
+ # `nextToken` value.
24012
+ # @return [Integer]
24013
+ #
24014
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeTrunkInterfaceAssociationsRequest AWS API Documentation
24015
+ #
24016
+ class DescribeTrunkInterfaceAssociationsRequest < Struct.new(
24017
+ :association_ids,
24018
+ :dry_run,
24019
+ :filters,
24020
+ :next_token,
24021
+ :max_results)
24022
+ SENSITIVE = []
24023
+ include Aws::Structure
24024
+ end
24025
+
24026
+ # @!attribute [rw] interface_associations
24027
+ # Information about the trunk associations.
24028
+ # @return [Array<Types::TrunkInterfaceAssociation>]
24029
+ #
24030
+ # @!attribute [rw] next_token
24031
+ # The token to use to retrieve the next page of results. This value is
24032
+ # `null` when there are no more results to return.
24033
+ # @return [String]
24034
+ #
24035
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeTrunkInterfaceAssociationsResult AWS API Documentation
24036
+ #
24037
+ class DescribeTrunkInterfaceAssociationsResult < Struct.new(
24038
+ :interface_associations,
24039
+ :next_token)
24040
+ SENSITIVE = []
24041
+ include Aws::Structure
24042
+ end
24043
+
23876
24044
  # @note When making an API call, you may pass DescribeVolumeAttributeRequest
23877
24045
  # data as a hash:
23878
24046
  #
@@ -26499,6 +26667,73 @@ module Aws::EC2
26499
26667
  include Aws::Structure
26500
26668
  end
26501
26669
 
26670
+ # @note When making an API call, you may pass DisassociateTrunkInterfaceRequest
26671
+ # data as a hash:
26672
+ #
26673
+ # {
26674
+ # association_id: "TrunkInterfaceAssociationId", # required
26675
+ # client_token: "String",
26676
+ # dry_run: false,
26677
+ # }
26678
+ #
26679
+ # @!attribute [rw] association_id
26680
+ # The ID ofthe association
26681
+ # @return [String]
26682
+ #
26683
+ # @!attribute [rw] client_token
26684
+ # Unique, case-sensitive identifier that you provide to ensure the
26685
+ # idempotency of the request. For more information, see [How to Ensure
26686
+ # Idempotency][1].
26687
+ #
26688
+ # **A suitable default value is auto-generated.** You should normally
26689
+ # not need to pass this option.
26690
+ #
26691
+ #
26692
+ #
26693
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
26694
+ # @return [String]
26695
+ #
26696
+ # @!attribute [rw] dry_run
26697
+ # Checks whether you have the required permissions for the action,
26698
+ # without actually making the request, and provides an error response.
26699
+ # If you have the required permissions, the error response is
26700
+ # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
26701
+ # @return [Boolean]
26702
+ #
26703
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DisassociateTrunkInterfaceRequest AWS API Documentation
26704
+ #
26705
+ class DisassociateTrunkInterfaceRequest < Struct.new(
26706
+ :association_id,
26707
+ :client_token,
26708
+ :dry_run)
26709
+ SENSITIVE = []
26710
+ include Aws::Structure
26711
+ end
26712
+
26713
+ # @!attribute [rw] return
26714
+ # Returns `true` if the request succeeds; otherwise, it returns an
26715
+ # error.
26716
+ # @return [Boolean]
26717
+ #
26718
+ # @!attribute [rw] client_token
26719
+ # Unique, case-sensitive identifier that you provide to ensure the
26720
+ # idempotency of the request. For more information, see [How to Ensure
26721
+ # Idempotency][1].
26722
+ #
26723
+ #
26724
+ #
26725
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
26726
+ # @return [String]
26727
+ #
26728
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DisassociateTrunkInterfaceResult AWS API Documentation
26729
+ #
26730
+ class DisassociateTrunkInterfaceResult < Struct.new(
26731
+ :return,
26732
+ :client_token)
26733
+ SENSITIVE = []
26734
+ include Aws::Structure
26735
+ end
26736
+
26502
26737
  # @note When making an API call, you may pass DisassociateVpcCidrBlockRequest
26503
26738
  # data as a hash:
26504
26739
  #
@@ -34091,7 +34326,7 @@ module Aws::EC2
34091
34326
  # @return [String]
34092
34327
  #
34093
34328
  # @!attribute [rw] owner_id
34094
- # The ID of the AWS account that created the network interface.
34329
+ # The ID of the account that created the network interface.
34095
34330
  # @return [String]
34096
34331
  #
34097
34332
  # @!attribute [rw] private_dns_name
@@ -34126,7 +34361,7 @@ module Aws::EC2
34126
34361
  # @!attribute [rw] interface_type
34127
34362
  # Describes the type of network interface.
34128
34363
  #
34129
- # Valid values: `interface` \| `efa`
34364
+ # Valid values: `interface` \| `efa` \| `trunk`
34130
34365
  # @return [String]
34131
34366
  #
34132
34367
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceNetworkInterface AWS API Documentation
@@ -34355,8 +34590,8 @@ module Aws::EC2
34355
34590
  #
34356
34591
  # You can only assign a carrier IP address to a network interface that
34357
34592
  # is in a subnet in a Wavelength Zone. For more information about
34358
- # carrier IP addresses, see Carrier IP addresses in the AWS Wavelength
34359
- # Developer Guide.
34593
+ # carrier IP addresses, see Carrier IP addresses in the Amazon Web
34594
+ # Services Wavelength Developer Guide.
34360
34595
  # @return [Boolean]
34361
34596
  #
34362
34597
  # @!attribute [rw] interface_type
@@ -34366,9 +34601,6 @@ module Aws::EC2
34366
34601
  # information, see [Elastic Fabric Adapter][1] in the *Amazon Elastic
34367
34602
  # Compute Cloud User Guide*.
34368
34603
  #
34369
- # If you are not creating an EFA, specify `interface` or omit this
34370
- # parameter.
34371
- #
34372
34604
  # Valid values: `interface` \| `efa`
34373
34605
  #
34374
34606
  #
@@ -41886,7 +42118,7 @@ module Aws::EC2
41886
42118
  # @return [String]
41887
42119
  #
41888
42120
  # @!attribute [rw] owner_id
41889
- # The AWS account ID of the owner of the network interface.
42121
+ # The account ID of the owner of the network interface.
41890
42122
  # @return [String]
41891
42123
  #
41892
42124
  # @!attribute [rw] private_dns_name
@@ -41902,12 +42134,13 @@ module Aws::EC2
41902
42134
  # @return [Array<Types::NetworkInterfacePrivateIpAddress>]
41903
42135
  #
41904
42136
  # @!attribute [rw] requester_id
41905
- # The alias or AWS account ID of the principal or service that created
41906
- # the network interface.
42137
+ # The alias or account ID of the principal or service that created the
42138
+ # network interface.
41907
42139
  # @return [String]
41908
42140
  #
41909
42141
  # @!attribute [rw] requester_managed
41910
- # Indicates whether the network interface is being managed by AWS.
42142
+ # Indicates whether the network interface is being managed by Amazon
42143
+ # Web Services.
41911
42144
  # @return [Boolean]
41912
42145
  #
41913
42146
  # @!attribute [rw] source_dest_check
@@ -42037,7 +42270,7 @@ module Aws::EC2
42037
42270
  # @return [String]
42038
42271
  #
42039
42272
  # @!attribute [rw] instance_owner_id
42040
- # The AWS account ID of the owner of the instance.
42273
+ # The account ID of the owner of the instance.
42041
42274
  # @return [String]
42042
42275
  #
42043
42276
  # @!attribute [rw] status
@@ -42112,11 +42345,11 @@ module Aws::EC2
42112
42345
  # @return [String]
42113
42346
  #
42114
42347
  # @!attribute [rw] aws_account_id
42115
- # The AWS account ID.
42348
+ # The account ID.
42116
42349
  # @return [String]
42117
42350
  #
42118
42351
  # @!attribute [rw] aws_service
42119
- # The AWS service.
42352
+ # The Amazon Web Service.
42120
42353
  # @return [String]
42121
42354
  #
42122
42355
  # @!attribute [rw] permission
@@ -42982,10 +43215,10 @@ module Aws::EC2
42982
43215
  include Aws::Structure
42983
43216
  end
42984
43217
 
42985
- # Describes prefixes for AWS services.
43218
+ # Describes prefixes for Amazon Web Services services.
42986
43219
  #
42987
43220
  # @!attribute [rw] cidrs
42988
- # The IP address range of the AWS service.
43221
+ # The IP address range of the Amazon Web Service.
42989
43222
  # @return [Array<String>]
42990
43223
  #
42991
43224
  # @!attribute [rw] prefix_list_id
@@ -43531,7 +43764,8 @@ module Aws::EC2
43531
43764
  # @!attribute [rw] network_border_group
43532
43765
  # The name of the location from which the address pool is advertised.
43533
43766
  # A network border group is a unique set of Availability Zones or
43534
- # Local Zones from where AWS advertises public IP addresses.
43767
+ # Local Zones from where Amazon Web Services advertises public IP
43768
+ # addresses.
43535
43769
  # @return [String]
43536
43770
  #
43537
43771
  # @!attribute [rw] tags
@@ -54533,6 +54767,51 @@ module Aws::EC2
54533
54767
  include Aws::Structure
54534
54768
  end
54535
54769
 
54770
+ # Information about an association between a branch network interface
54771
+ # with a trunk network interface.
54772
+ #
54773
+ # @!attribute [rw] association_id
54774
+ # The ID of the association.
54775
+ # @return [String]
54776
+ #
54777
+ # @!attribute [rw] branch_interface_id
54778
+ # The ID of the branch network interface.
54779
+ # @return [String]
54780
+ #
54781
+ # @!attribute [rw] trunk_interface_id
54782
+ # The ID of the trunk network interface.
54783
+ # @return [String]
54784
+ #
54785
+ # @!attribute [rw] interface_protocol
54786
+ # The interface protocol. Valid values are `VLAN` and `GRE`.
54787
+ # @return [String]
54788
+ #
54789
+ # @!attribute [rw] vlan_id
54790
+ # The ID of the VLAN when you use the VLAN protocol.
54791
+ # @return [Integer]
54792
+ #
54793
+ # @!attribute [rw] gre_key
54794
+ # The application key when you use the GRE protocol.
54795
+ # @return [Integer]
54796
+ #
54797
+ # @!attribute [rw] tags
54798
+ # The tags.
54799
+ # @return [Array<Types::Tag>]
54800
+ #
54801
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/TrunkInterfaceAssociation AWS API Documentation
54802
+ #
54803
+ class TrunkInterfaceAssociation < Struct.new(
54804
+ :association_id,
54805
+ :branch_interface_id,
54806
+ :trunk_interface_id,
54807
+ :interface_protocol,
54808
+ :vlan_id,
54809
+ :gre_key,
54810
+ :tags)
54811
+ SENSITIVE = []
54812
+ include Aws::Structure
54813
+ end
54814
+
54536
54815
  # The VPN tunnel options.
54537
54816
  #
54538
54817
  # @!attribute [rw] outside_ip_address