Skip to content

Commit ff8a741

Browse files
Release to support Elastic VMware Service (Amazon EVS) Subnet and Amazon EVS Network Interface Types.
1 parent ec3fa34 commit ff8a741

21 files changed

+321
-87
lines changed

generator/ServiceModels/ec2/ec2-2016-11-15.api.json

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6759,6 +6759,10 @@
67596759
"shape":"String",
67606760
"locationName":"carrierIp"
67616761
},
6762+
"SubnetId":{
6763+
"shape":"String",
6764+
"locationName":"subnetId"
6765+
},
67626766
"ServiceManaged":{
67636767
"shape":"ServiceManaged",
67646768
"locationName":"serviceManaged"
@@ -8174,6 +8178,13 @@
81748178
"locationName":"item"
81758179
}
81768180
},
8181+
"AssociatedSubnetList":{
8182+
"type":"list",
8183+
"member":{
8184+
"shape":"SubnetId",
8185+
"locationName":"item"
8186+
}
8187+
},
81778188
"AssociatedTargetNetwork":{
81788189
"type":"structure",
81798190
"members":{
@@ -36993,6 +37004,10 @@
3699337004
"EnablePrimaryIpv6":{"shape":"Boolean"},
3699437005
"ConnectionTrackingSpecification":{"shape":"ConnectionTrackingSpecificationRequest"},
3699537006
"AssociatePublicIpAddress":{"shape":"Boolean"},
37007+
"AssociatedSubnetIds":{
37008+
"shape":"SubnetIdList",
37009+
"locationName":"AssociatedSubnetId"
37010+
},
3699637011
"DryRun":{
3699737012
"shape":"Boolean",
3699837013
"locationName":"dryRun"
@@ -39101,6 +39116,10 @@
3910139116
"Operator":{
3910239117
"shape":"OperatorResponse",
3910339118
"locationName":"operator"
39119+
},
39120+
"AssociatedSubnets":{
39121+
"shape":"AssociatedSubnetList",
39122+
"locationName":"associatedSubnetSet"
3910439123
}
3910539124
}
3910639125
},
@@ -47310,6 +47329,10 @@
4731047329
"shape":"BlockPublicAccessStates",
4731147330
"locationName":"blockPublicAccessStates"
4731247331
},
47332+
"Type":{
47333+
"shape":"String",
47334+
"locationName":"type"
47335+
},
4731347336
"SubnetId":{
4731447337
"shape":"String",
4731547338
"locationName":"subnetId"
@@ -47453,6 +47476,13 @@
4745347476
}
4745447477
},
4745547478
"SubnetId":{"type":"string"},
47479+
"SubnetIdList":{
47480+
"type":"list",
47481+
"member":{
47482+
"shape":"SubnetId",
47483+
"locationName":"AssociatedSubnetId"
47484+
}
47485+
},
4745647486
"SubnetIdStringList":{
4745747487
"type":"list",
4745847488
"member":{
@@ -47524,7 +47554,9 @@
4752447554
"enum":[
4752547555
"pending",
4752647556
"available",
47527-
"unavailable"
47557+
"unavailable",
47558+
"failed",
47559+
"failed-insufficient-capacity"
4752847560
]
4752947561
},
4753047562
"Subscription":{

generator/ServiceModels/ec2/ec2-2016-11-15.docs.json

Lines changed: 20 additions & 4 deletions
Large diffs are not rendered by default.

generator/ServiceModels/ec2/ec2-2016-11-15.normal.json

Lines changed: 41 additions & 5 deletions
Large diffs are not rendered by default.

sdk/src/Services/EC2/Generated/Model/Address.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public partial class Address
4848
private string _publicIp;
4949
private string _publicIpv4Pool;
5050
private ServiceManaged _serviceManaged;
51+
private string _subnetId;
5152
private List<Tag> _tags = AWSConfigs.InitializeCollections ? new List<Tag>() : null;
5253

5354
/// <summary>
@@ -309,6 +310,24 @@ internal bool IsSetServiceManaged()
309310
return this._serviceManaged != null;
310311
}
311312

313+
/// <summary>
314+
/// Gets and sets the property SubnetId.
315+
/// <para>
316+
/// The ID of the subnet where the IP address is allocated.
317+
/// </para>
318+
/// </summary>
319+
public string SubnetId
320+
{
321+
get { return this._subnetId; }
322+
set { this._subnetId = value; }
323+
}
324+
325+
// Check to see if SubnetId property is set
326+
internal bool IsSetSubnetId()
327+
{
328+
return this._subnetId != null;
329+
}
330+
312331
/// <summary>
313332
/// Gets and sets the property Tags.
314333
/// <para>

sdk/src/Services/EC2/Generated/Model/AttachVolumeRequest.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,20 @@ namespace Amazon.EC2.Model
3131
{
3232
/// <summary>
3333
/// Container for the parameters to the AttachVolume operation.
34-
/// Attaches an EBS volume to a running or stopped instance and exposes it to the instance
35-
/// with the specified device name.
34+
/// Attaches an Amazon EBS volume to a <c>running</c> or <c>stopped</c> instance, and
35+
/// exposes it to the instance with the specified device name.
3636
///
37-
///
37+
/// <note>
3838
/// <para>
39-
/// Encrypted EBS volumes must be attached to instances that support Amazon EBS encryption.
40-
/// For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html">Amazon
41-
/// EBS encryption</a> in the <i>Amazon EBS User Guide</i>.
39+
/// The maximum number of Amazon EBS volumes that you can attach to an instance depends
40+
/// on the instance type. If you exceed the volume attachment limit for an instance type,
41+
/// the attachment request fails with the <c>AttachmentLimitExceeded</c> error. For more
42+
/// information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/volume_limits.html">Instance
43+
/// volume limits</a>.
4244
/// </para>
43-
///
45+
/// </note>
4446
/// <para>
45-
/// After you attach an EBS volume, you must make it available. For more information,
47+
/// After you attach an EBS volume, you must make it available for use. For more information,
4648
/// see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-using-volumes.html">Make
4749
/// an EBS volume available for use</a>.
4850
/// </para>

sdk/src/Services/EC2/Generated/Model/DescribeNetworkInterfacesRequest.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,11 @@ public partial class DescribeNetworkInterfacesRequest : AmazonEC2Request
158158
/// <para>
159159
/// <c>interface-type</c> - The type of network interface (<c>api_gateway_managed</c>
160160
/// | <c>aws_codestar_connections_managed</c> | <c>branch</c> | <c>ec2_instance_connect_endpoint</c>
161-
/// | <c>efa</c> | <c>efa-only</c> | <c>efs</c> | <c>gateway_load_balancer</c> | <c>gateway_load_balancer_endpoint</c>
162-
/// | <c>global_accelerator_managed</c> | <c>interface</c> | <c>iot_rules_managed</c>
163-
/// | <c>lambda</c> | <c>load_balancer</c> | <c>nat_gateway</c> | <c>network_load_balancer</c>
164-
/// | <c>quicksight</c> | <c>transit_gateway</c> | <c>trunk</c> | <c>vpc_endpoint</c>).
161+
/// | <c>efa</c> | <c>efa-only</c> | <c>efs</c> | <c>evs</c> | <c>gateway_load_balancer</c>
162+
/// | <c>gateway_load_balancer_endpoint</c> | <c>global_accelerator_managed</c> | <c>interface</c>
163+
/// | <c>iot_rules_managed</c> | <c>lambda</c> | <c>load_balancer</c> | <c>nat_gateway</c>
164+
/// | <c>network_load_balancer</c> | <c>quicksight</c> | <c>transit_gateway</c> | <c>trunk</c>
165+
/// | <c>vpc_endpoint</c>).
165166
/// </para>
166167
/// </li> <li>
167168
/// <para>

sdk/src/Services/EC2/Generated/Model/InstanceNetworkInterface.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ internal bool IsSetGroups()
155155
/// </para>
156156
///
157157
/// <para>
158-
/// Valid values: <c>interface</c> | <c>efa</c> | <c>efa-only</c> | <c>trunk</c>
158+
/// Valid values: <c>interface</c> | <c>efa</c> | <c>efa-only</c> | <c>evs</c> | <c>trunk</c>
159+
///
159160
/// </para>
160161
/// </summary>
161162
public string InterfaceType

sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AddressUnmarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ public Address Unmarshall(XmlUnmarshallerContext context)
139139
unmarshalledObject.ServiceManaged = unmarshaller.Unmarshall(context);
140140
continue;
141141
}
142+
if (context.TestExpression("subnetId", targetDepth))
143+
{
144+
var unmarshaller = StringUnmarshaller.Instance;
145+
unmarshalledObject.SubnetId = unmarshaller.Unmarshall(context);
146+
continue;
147+
}
142148
if (context.TestExpression("tagSet/item", targetDepth))
143149
{
144150
var unmarshaller = TagUnmarshaller.Instance;

sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyNetworkInterfaceAttributeRequestMarshaller.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ public IRequest Marshall(ModifyNetworkInterfaceAttributeRequest publicRequest)
5959

6060
if(publicRequest != null)
6161
{
62+
if(publicRequest.IsSetAssociatedSubnetIds())
63+
{
64+
int publicRequestlistValueIndex = 1;
65+
foreach(var publicRequestlistValue in publicRequest.AssociatedSubnetIds)
66+
{
67+
request.Parameters.Add("AssociatedSubnetId" + "." + publicRequestlistValueIndex, StringUtils.FromString(publicRequestlistValue));
68+
publicRequestlistValueIndex++;
69+
}
70+
}
6271
if(publicRequest.IsSetAssociatePublicIpAddress())
6372
{
6473
request.Parameters.Add("AssociatePublicIpAddress", StringUtils.FromBool(publicRequest.AssociatePublicIpAddress));

sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/NetworkInterfaceUnmarshaller.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ public NetworkInterface Unmarshall(XmlUnmarshallerContext context)
5555
{
5656
if (context.IsStartElement || context.IsAttribute)
5757
{
58+
if (context.TestExpression("associatedSubnetSet/item", targetDepth))
59+
{
60+
var unmarshaller = StringUnmarshaller.Instance;
61+
if (unmarshalledObject.AssociatedSubnets == null)
62+
{
63+
unmarshalledObject.AssociatedSubnets = new List<string>();
64+
}
65+
var item = unmarshaller.Unmarshall(context);
66+
unmarshalledObject.AssociatedSubnets.Add(item);
67+
continue;
68+
}
5869
if (context.TestExpression("association", targetDepth))
5970
{
6071
var unmarshaller = NetworkInterfaceAssociationUnmarshaller.Instance;

0 commit comments

Comments
 (0)