Skip to content

Commit a2abcad

Browse files
This released the DescribeCapacityReservationTopology API.
1 parent 78d99c2 commit a2abcad

16 files changed

+1466
-29
lines changed

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

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,6 +2356,15 @@
23562356
"input":{"shape":"DescribeCapacityReservationFleetsRequest"},
23572357
"output":{"shape":"DescribeCapacityReservationFleetsResult"}
23582358
},
2359+
"DescribeCapacityReservationTopology":{
2360+
"name":"DescribeCapacityReservationTopology",
2361+
"http":{
2362+
"method":"POST",
2363+
"requestUri":"/"
2364+
},
2365+
"input":{"shape":"DescribeCapacityReservationTopologyRequest"},
2366+
"output":{"shape":"DescribeCapacityReservationTopologyResult"}
2367+
},
23592368
"DescribeCapacityReservations":{
23602369
"name":"DescribeCapacityReservations",
23612370
"http":{
@@ -10708,6 +10717,50 @@
1070810717
"dedicated"
1070910718
]
1071010719
},
10720+
"CapacityReservationTopology":{
10721+
"type":"structure",
10722+
"members":{
10723+
"CapacityReservationId":{
10724+
"shape":"String",
10725+
"locationName":"capacityReservationId"
10726+
},
10727+
"CapacityBlockId":{
10728+
"shape":"String",
10729+
"locationName":"capacityBlockId"
10730+
},
10731+
"State":{
10732+
"shape":"String",
10733+
"locationName":"state"
10734+
},
10735+
"InstanceType":{
10736+
"shape":"String",
10737+
"locationName":"instanceType"
10738+
},
10739+
"GroupName":{
10740+
"shape":"String",
10741+
"locationName":"groupName"
10742+
},
10743+
"NetworkNodes":{
10744+
"shape":"NetworkNodeSet",
10745+
"locationName":"networkNodeSet"
10746+
},
10747+
"AvailabilityZoneId":{
10748+
"shape":"String",
10749+
"locationName":"availabilityZoneId"
10750+
},
10751+
"AvailabilityZone":{
10752+
"shape":"String",
10753+
"locationName":"availabilityZone"
10754+
}
10755+
}
10756+
},
10757+
"CapacityReservationTopologySet":{
10758+
"type":"list",
10759+
"member":{
10760+
"shape":"CapacityReservationTopology",
10761+
"locationName":"item"
10762+
}
10763+
},
1071110764
"CapacityReservationType":{
1071210765
"type":"string",
1071310766
"enum":[
@@ -17754,6 +17807,40 @@
1775417807
}
1775517808
}
1775617809
},
17810+
"DescribeCapacityReservationTopologyMaxResults":{
17811+
"type":"integer",
17812+
"max":10,
17813+
"min":1
17814+
},
17815+
"DescribeCapacityReservationTopologyRequest":{
17816+
"type":"structure",
17817+
"members":{
17818+
"DryRun":{"shape":"Boolean"},
17819+
"NextToken":{"shape":"String"},
17820+
"MaxResults":{"shape":"DescribeCapacityReservationTopologyMaxResults"},
17821+
"CapacityReservationIds":{
17822+
"shape":"CapacityReservationIdSet",
17823+
"locationName":"CapacityReservationId"
17824+
},
17825+
"Filters":{
17826+
"shape":"FilterList",
17827+
"locationName":"Filter"
17828+
}
17829+
}
17830+
},
17831+
"DescribeCapacityReservationTopologyResult":{
17832+
"type":"structure",
17833+
"members":{
17834+
"NextToken":{
17835+
"shape":"String",
17836+
"locationName":"nextToken"
17837+
},
17838+
"CapacityReservations":{
17839+
"shape":"CapacityReservationTopologySet",
17840+
"locationName":"capacityReservationSet"
17841+
}
17842+
}
17843+
},
1775717844
"DescribeCapacityReservationsMaxResults":{
1775817845
"type":"integer",
1775917846
"max":1000,
@@ -41246,6 +41333,13 @@
4124641333
"aws_codestar_connections_managed"
4124741334
]
4124841335
},
41336+
"NetworkNodeSet":{
41337+
"type":"list",
41338+
"member":{
41339+
"shape":"String",
41340+
"locationName":"item"
41341+
}
41342+
},
4124941343
"NetworkNodesList":{
4125041344
"type":"list",
4125141345
"member":{

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

Lines changed: 51 additions & 3 deletions
Large diffs are not rendered by default.

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

Lines changed: 120 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,6 +2619,16 @@
26192619
"output":{"shape":"DescribeCapacityReservationFleetsResult"},
26202620
"documentation":"<p>Describes one or more Capacity Reservation Fleets.</p>"
26212621
},
2622+
"DescribeCapacityReservationTopology":{
2623+
"name":"DescribeCapacityReservationTopology",
2624+
"http":{
2625+
"method":"POST",
2626+
"requestUri":"/"
2627+
},
2628+
"input":{"shape":"DescribeCapacityReservationTopologyRequest"},
2629+
"output":{"shape":"DescribeCapacityReservationTopologyResult"},
2630+
"documentation":"<p>Describes a tree-based hierarchy that represents the physical host placement of your pending or active Capacity Reservations within an Availability Zone or Local Zone. You can use this information to determine the relative proximity of your capacity within the Amazon Web Services network before it is launched and use this information to allocate capacity together to support your tightly coupled workloads.</p> <p>Capacity Reservation topology is supported for specific instance types only. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology-prerequisites.html\">Prerequisites for Amazon EC2 instance topology</a> in the <i>Amazon EC2 User Guide</i>.</p> <note> <p>The Amazon EC2 API follows an eventual consistency model due to the distributed nature of the system supporting it. As a result, when you call the DescribeCapacityReservationTopology API command immediately after launching instances, the response might return a <code>null</code> value for <code>capacityBlockId</code> because the data might not have fully propagated across all subsystems. For more information, see <a href=\"https://docs.aws.amazon.com/ec2/latest/devguide/eventual-consistency.html\">Eventual consistency in the Amazon EC2 API</a> in the <i>Amazon EC2 Developer Guide</i>.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html\">Amazon EC2 topology</a> in the <i>Amazon EC2 User Guide</i>.</p> <p/>"
2631+
},
26222632
"DescribeCapacityReservations":{
26232633
"name":"DescribeCapacityReservations",
26242634
"http":{
@@ -3077,7 +3087,7 @@
30773087
},
30783088
"input":{"shape":"DescribeInstanceTopologyRequest"},
30793089
"output":{"shape":"DescribeInstanceTopologyResult"},
3080-
"documentation":"<p>Describes a tree-based hierarchy that represents the physical host placement of your EC2 instances within an Availability Zone or Local Zone. You can use this information to determine the relative proximity of your EC2 instances within the Amazon Web Services network to support your tightly coupled workloads.</p> <p>Instance topology is supported for specific instance types only. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology-prerequisites.html\"> Prerequisites for Amazon EC2 instance topology</a> in the <i>Amazon EC2 User Guide</i>.</p> <note> <p>The Amazon EC2 API follows an eventual consistency model due to the distributed nature of the system supporting it. As a result, when you call the DescribeInstanceTopology API command immediately after launching instances, the response might return a <code>null</code> value for <code>capacityBlockId</code> because the data might not have fully propagated across all subsystems. For more information, see <a href=\"https://docs.aws.amazon.com/ec2/latest/devguide/eventual-consistency.html\">Eventual consistency in the Amazon EC2 API</a> in the <i>Amazon EC2 Developer Guide</i>.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html\">Amazon EC2 instance topology</a> in the <i>Amazon EC2 User Guide</i>.</p>"
3090+
"documentation":"<p>Describes a tree-based hierarchy that represents the physical host placement of your EC2 instances within an Availability Zone or Local Zone. You can use this information to determine the relative proximity of your EC2 instances within the Amazon Web Services network to support your tightly coupled workloads.</p> <p>Instance topology is supported for specific instance types only. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology-prerequisites.html\">Prerequisites for Amazon EC2 instance topology</a> in the <i>Amazon EC2 User Guide</i>.</p> <note> <p>The Amazon EC2 API follows an eventual consistency model due to the distributed nature of the system supporting it. As a result, when you call the DescribeInstanceTopology API command immediately after launching instances, the response might return a <code>null</code> value for <code>capacityBlockId</code> because the data might not have fully propagated across all subsystems. For more information, see <a href=\"https://docs.aws.amazon.com/ec2/latest/devguide/eventual-consistency.html\">Eventual consistency in the Amazon EC2 API</a> in the <i>Amazon EC2 Developer Guide</i>.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html\">Amazon EC2 topology</a> in the <i>Amazon EC2 User Guide</i>.</p>"
30813091
},
30823092
"DescribeInstanceTypeOfferings":{
30833093
"name":"DescribeInstanceTypeOfferings",
@@ -12536,6 +12546,59 @@
1253612546
"dedicated"
1253712547
]
1253812548
},
12549+
"CapacityReservationTopology":{
12550+
"type":"structure",
12551+
"members":{
12552+
"CapacityReservationId":{
12553+
"shape":"String",
12554+
"documentation":"<p>The ID of the Capacity Reservation.</p>",
12555+
"locationName":"capacityReservationId"
12556+
},
12557+
"CapacityBlockId":{
12558+
"shape":"String",
12559+
"documentation":"<p>The ID of the Capacity Block. This parameter is only supported for UltraServer instances and identifies instances within the UltraServer domain.</p>",
12560+
"locationName":"capacityBlockId"
12561+
},
12562+
"State":{
12563+
"shape":"String",
12564+
"documentation":"<p>The current state of the Capacity Reservation. For the list of possible states, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeCapacityReservations.html\">DescribeCapacityReservations</a>.</p>",
12565+
"locationName":"state"
12566+
},
12567+
"InstanceType":{
12568+
"shape":"String",
12569+
"documentation":"<p>The instance type.</p>",
12570+
"locationName":"instanceType"
12571+
},
12572+
"GroupName":{
12573+
"shape":"String",
12574+
"documentation":"<p>The name of the placement group that the Capacity Reservation is in.</p>",
12575+
"locationName":"groupName"
12576+
},
12577+
"NetworkNodes":{
12578+
"shape":"NetworkNodeSet",
12579+
"documentation":"<p>The network nodes. The nodes are hashed based on your account. Capacity Reservations from different accounts running under the same server will return a different hashed list of strings.</p> <p>The value is <code>null</code> or empty if:</p> <ul> <li> <p>The instance type is not supported.</p> </li> <li> <p>The Capacity Reservation is in a state other than <code>active</code> or <code>pending</code>.</p> </li> </ul>",
12580+
"locationName":"networkNodeSet"
12581+
},
12582+
"AvailabilityZoneId":{
12583+
"shape":"String",
12584+
"documentation":"<p>The ID of the Availability Zone or Local Zone that the Capacity Reservation is in.</p>",
12585+
"locationName":"availabilityZoneId"
12586+
},
12587+
"AvailabilityZone":{
12588+
"shape":"String",
12589+
"documentation":"<p>The name of the Availability Zone or Local Zone that the Capacity Reservation is in.</p>",
12590+
"locationName":"availabilityZone"
12591+
}
12592+
},
12593+
"documentation":"<p>Information about the Capacity Reservation topology.</p>"
12594+
},
12595+
"CapacityReservationTopologySet":{
12596+
"type":"list",
12597+
"member":{
12598+
"shape":"CapacityReservationTopology",
12599+
"locationName":"item"
12600+
}
12601+
},
1253912602
"CapacityReservationType":{
1254012603
"type":"string",
1254112604
"enum":[
@@ -22780,6 +22843,53 @@
2278022843
}
2278122844
}
2278222845
},
22846+
"DescribeCapacityReservationTopologyMaxResults":{
22847+
"type":"integer",
22848+
"max":10,
22849+
"min":1
22850+
},
22851+
"DescribeCapacityReservationTopologyRequest":{
22852+
"type":"structure",
22853+
"members":{
22854+
"DryRun":{
22855+
"shape":"Boolean",
22856+
"documentation":"<p>Checks whether you have the required permissions for the operation, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
22857+
},
22858+
"NextToken":{
22859+
"shape":"String",
22860+
"documentation":"<p>The token returned from a previous paginated request. Pagination continues from the end of the items returned by the previous request.</p>"
22861+
},
22862+
"MaxResults":{
22863+
"shape":"DescribeCapacityReservationTopologyMaxResults",
22864+
"documentation":"<p>The maximum number of items to return for this request. To get the next page of items, make another request with the token returned in the output. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination\">Pagination</a>.</p> <p>You can't specify this parameter and the Capacity Reservation IDs parameter in the same request.</p> <p>Default: <code>10</code> </p>"
22865+
},
22866+
"CapacityReservationIds":{
22867+
"shape":"CapacityReservationIdSet",
22868+
"documentation":"<p>The Capacity Reservation IDs.</p> <p>Default: Describes all your Capacity Reservations.</p> <p>Constraints: Maximum 100 explicitly specified Capacity Reservation IDs.</p>",
22869+
"locationName":"CapacityReservationId"
22870+
},
22871+
"Filters":{
22872+
"shape":"FilterList",
22873+
"documentation":"<p>The filters.</p> <ul> <li> <p> <code>availability-zone</code> - The name of the Availability Zone (for example, <code>us-west-2a</code>) or Local Zone (for example, <code>us-west-2-lax-1b</code>) that the Capacity Reservation is in.</p> </li> <li> <p> <code>instance-type</code> - The instance type (for example, <code>p4d.24xlarge</code>) or instance family (for example, <code>p4d*</code>). You can use the <code>*</code> wildcard to match zero or more characters, or the <code>?</code> wildcard to match zero or one character.</p> </li> </ul>",
22874+
"locationName":"Filter"
22875+
}
22876+
}
22877+
},
22878+
"DescribeCapacityReservationTopologyResult":{
22879+
"type":"structure",
22880+
"members":{
22881+
"NextToken":{
22882+
"shape":"String",
22883+
"documentation":"<p>The token to include in another request to get the next page of items. This value is <code>null</code> when there are no more items to return.</p>",
22884+
"locationName":"nextToken"
22885+
},
22886+
"CapacityReservations":{
22887+
"shape":"CapacityReservationTopologySet",
22888+
"documentation":"<p>Information about the topology of each Capacity Reservation.</p>",
22889+
"locationName":"capacityReservationSet"
22890+
}
22891+
}
22892+
},
2278322893
"DescribeCapacityReservationsMaxResults":{
2278422894
"type":"integer",
2278522895
"max":1000,
@@ -42401,7 +42511,7 @@
4240142511
},
4240242512
"NetworkNodes":{
4240342513
"shape":"NetworkNodesList",
42404-
"documentation":"<p>The network nodes. The nodes are hashed based on your account. Instances from different accounts running under the same server will return a different hashed list of strings.</p>",
42514+
"documentation":"<p>The network nodes. The nodes are hashed based on your account. Instances from different accounts running under the same server will return a different hashed list of strings.</p> <p>The value is <code>null</code> or empty if:</p> <ul> <li> <p>The instance type is not supported.</p> </li> <li> <p>The instance is in a state other than <code>running</code>.</p> </li> </ul>",
4240542515
"locationName":"networkNodeSet"
4240642516
},
4240742517
"AvailabilityZone":{
@@ -42416,7 +42526,7 @@
4241642526
},
4241742527
"CapacityBlockId":{
4241842528
"shape":"String",
42419-
"documentation":"<p>The ID of the Capacity Block. This parameter is only supported for Ultraserver instances and identifies instances within the Ultraserver domain.</p>",
42529+
"documentation":"<p>The ID of the Capacity Block. This parameter is only supported for UltraServer instances and identifies instances within the UltraServer domain.</p>",
4242042530
"locationName":"capacityBlockId"
4242142531
}
4242242532
},
@@ -53797,6 +53907,13 @@
5379753907
"aws_codestar_connections_managed"
5379853908
]
5379953909
},
53910+
"NetworkNodeSet":{
53911+
"type":"list",
53912+
"member":{
53913+
"shape":"String",
53914+
"locationName":"item"
53915+
}
53916+
},
5380053917
"NetworkNodesList":{
5380153918
"type":"list",
5380253919
"member":{

sdk/code-analysis/ServiceAnalysis/EC2/Generated/PropertyValueRules.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@
165165
<min>1</min>
166166
<max>1000</max>
167167
</property-value-rule>
168+
<property-value-rule>
169+
<property>Amazon.EC2.Model.DescribeCapacityReservationTopologyRequest.MaxResults</property>
170+
<min>1</min>
171+
<max>10</max>
172+
</property-value-rule>
168173
<property-value-rule>
169174
<property>Amazon.EC2.Model.DescribeCarrierGatewaysRequest.MaxResults</property>
170175
<min>5</min>

0 commit comments

Comments
 (0)