Skip to content

Commit 2908733

Browse files
Enabling Asset Level Capacity Management feature, which allows customers to create a Capacity Task for a single Asset on their active Outpost.
1 parent 67e9309 commit 2908733

18 files changed

+249
-14
lines changed

generator/ServiceModels/outposts/outposts-2019-12-03.api.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,12 @@
610610
"min":1,
611611
"pattern":"^(\\w+)$"
612612
},
613+
"AssetIdInput":{
614+
"type":"string",
615+
"max":10,
616+
"min":10,
617+
"pattern":"\\d{10}"
618+
},
613619
"AssetIdList":{
614620
"type":"list",
615621
"member":{"shape":"AssetId"}
@@ -815,6 +821,7 @@
815821
"CapacityTaskId":{"shape":"CapacityTaskId"},
816822
"OutpostId":{"shape":"OutpostId"},
817823
"OrderId":{"shape":"OrderId"},
824+
"AssetId":{"shape":"AssetId"},
818825
"CapacityTaskStatus":{"shape":"CapacityTaskStatus"},
819826
"CreationDate":{"shape":"ISO8601Timestamp"},
820827
"CompletionDate":{"shape":"ISO8601Timestamp"},
@@ -1106,6 +1113,7 @@
11061113
"CapacityTaskId":{"shape":"CapacityTaskId"},
11071114
"OutpostId":{"shape":"OutpostId"},
11081115
"OrderId":{"shape":"OrderId"},
1116+
"AssetId":{"shape":"AssetId"},
11091117
"RequestedInstancePools":{"shape":"RequestedInstancePools"},
11101118
"InstancesToExclude":{"shape":"InstancesToExclude"},
11111119
"DryRun":{"shape":"DryRun"},
@@ -1230,6 +1238,11 @@
12301238
"location":"querystring",
12311239
"locationName":"OrderId"
12321240
},
1241+
"AssetId":{
1242+
"shape":"AssetIdInput",
1243+
"location":"querystring",
1244+
"locationName":"AssetId"
1245+
},
12331246
"MaxResults":{
12341247
"shape":"MaxResults1000",
12351248
"location":"querystring",
@@ -2144,6 +2157,7 @@
21442157
"locationName":"OutpostId"
21452158
},
21462159
"OrderId":{"shape":"OrderId"},
2160+
"AssetId":{"shape":"AssetIdInput"},
21472161
"InstancePools":{"shape":"RequestedInstancePools"},
21482162
"InstancesToExclude":{"shape":"InstancesToExclude"},
21492163
"DryRun":{"shape":"DryRun"},
@@ -2156,6 +2170,7 @@
21562170
"CapacityTaskId":{"shape":"CapacityTaskId"},
21572171
"OutpostId":{"shape":"OutpostId"},
21582172
"OrderId":{"shape":"OrderId"},
2173+
"AssetId":{"shape":"AssetId"},
21592174
"RequestedInstancePools":{"shape":"RequestedInstancePools"},
21602175
"InstancesToExclude":{"shape":"InstancesToExclude"},
21612176
"DryRun":{"shape":"DryRun"},

generator/ServiceModels/outposts/outposts-2019-12-03.docs.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,20 @@
122122
"base": null,
123123
"refs": {
124124
"AssetIdList$member": null,
125-
"AssetInfo$AssetId": "<p> The ID of the asset. </p>",
126-
"AssetInstance$AssetId": "<p>The ID of the asset.</p>",
127-
"LineItemAssetInformation$AssetId": "<p> The ID of the asset. </p>",
128-
"StartConnectionRequest$AssetId": "<p> The ID of the Outpost server. </p>"
125+
"AssetInfo$AssetId": "<p> The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
126+
"AssetInstance$AssetId": "<p>The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
127+
"CapacityTaskSummary$AssetId": "<p>The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
128+
"GetCapacityTaskOutput$AssetId": "<p>The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
129+
"LineItemAssetInformation$AssetId": "<p> The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
130+
"StartCapacityTaskOutput$AssetId": "<p>The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
131+
"StartConnectionRequest$AssetId": "<p> The ID of the Outpost server.</p>"
132+
}
133+
},
134+
"AssetIdInput": {
135+
"base": null,
136+
"refs": {
137+
"GetOutpostSupportedInstanceTypesInput$AssetId": "<p>The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
138+
"StartCapacityTaskInput$AssetId": "<p>The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
129139
}
130140
},
131141
"AssetIdList": {
@@ -297,7 +307,7 @@
297307
"refs": {
298308
"CapacityTaskStatusList$member": null,
299309
"CapacityTaskSummary$CapacityTaskStatus": "<p>The status of the capacity task.</p>",
300-
"GetCapacityTaskOutput$CapacityTaskStatus": "<p>Status of the capacity task.</p> <p>A capacity task can have one of the following statuses:</p> <ul> <li> <p> <code>REQUESTED</code> - The capacity task was created and is awaiting the next step by Amazon Web Services Outposts.</p> </li> <li> <p> <code>IN_PROGRESS</code> - The capacity task is running and cannot be cancelled.</p> </li> <li> <p> <code>WAITING_FOR_EVACUATION</code> - The capacity task requires capacity to run. You must stop the recommended EC2 running instances to free up capacity for the task to run.</p> </li> </ul>",
310+
"GetCapacityTaskOutput$CapacityTaskStatus": "<p>Status of the capacity task.</p> <p>A capacity task can have one of the following statuses:</p> <ul> <li> <p> <code>REQUESTED</code> - The capacity task was created and is awaiting the next step by Amazon Web Services Outposts.</p> </li> <li> <p> <code>IN_PROGRESS</code> - The capacity task is running and cannot be cancelled.</p> </li> <li> <p> <code>FAILED</code> - The capacity task could not be completed.</p> </li> <li> <p> <code>COMPLETED</code> - The capacity task has completed successfully.</p> </li> <li> <p> <code>WAITING_FOR_EVACUATION</code> - The capacity task requires capacity to run. You must stop the recommended EC2 running instances to free up capacity for the task to run.</p> </li> <li> <p> <code>CANCELLATION_IN_PROGRESS</code> - The capacity task has been cancelled and is in the process of cleaning up resources.</p> </li> <li> <p> <code>CANCELLED</code> - The capacity task is cancelled.</p> </li> </ul>",
301311
"StartCapacityTaskOutput$CapacityTaskStatus": "<p>Status of the specified capacity task.</p>"
302312
}
303313
},

generator/ServiceModels/outposts/outposts-2019-12-03.normal.json

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,12 @@
679679
"min":1,
680680
"pattern":"^(\\w+)$"
681681
},
682+
"AssetIdInput":{
683+
"type":"string",
684+
"max":10,
685+
"min":10,
686+
"pattern":"\\d{10}"
687+
},
682688
"AssetIdList":{
683689
"type":"list",
684690
"member":{"shape":"AssetId"}
@@ -688,7 +694,7 @@
688694
"members":{
689695
"AssetId":{
690696
"shape":"AssetId",
691-
"documentation":"<p> The ID of the asset. </p>"
697+
"documentation":"<p> The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
692698
},
693699
"RackId":{
694700
"shape":"RackId",
@@ -722,7 +728,7 @@
722728
},
723729
"AssetId":{
724730
"shape":"AssetId",
725-
"documentation":"<p>The ID of the asset.</p>"
731+
"documentation":"<p>The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
726732
},
727733
"AccountId":{"shape":"AccountId"},
728734
"AwsServiceName":{
@@ -952,6 +958,10 @@
952958
"shape":"OrderId",
953959
"documentation":"<p>The ID of the Amazon Web Services Outposts order of the host associated with the capacity task.</p>"
954960
},
961+
"AssetId":{
962+
"shape":"AssetId",
963+
"documentation":"<p>The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
964+
},
955965
"CapacityTaskStatus":{
956966
"shape":"CapacityTaskStatus",
957967
"documentation":"<p>The status of the capacity task.</p>"
@@ -1382,6 +1392,10 @@
13821392
"shape":"OrderId",
13831393
"documentation":"<p>ID of the Amazon Web Services Outposts order associated with the specified capacity task.</p>"
13841394
},
1395+
"AssetId":{
1396+
"shape":"AssetId",
1397+
"documentation":"<p>The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
1398+
},
13851399
"RequestedInstancePools":{
13861400
"shape":"RequestedInstancePools",
13871401
"documentation":"<p>List of instance pools requested in the capacity task.</p>"
@@ -1396,7 +1410,7 @@
13961410
},
13971411
"CapacityTaskStatus":{
13981412
"shape":"CapacityTaskStatus",
1399-
"documentation":"<p>Status of the capacity task.</p> <p>A capacity task can have one of the following statuses:</p> <ul> <li> <p> <code>REQUESTED</code> - The capacity task was created and is awaiting the next step by Amazon Web Services Outposts.</p> </li> <li> <p> <code>IN_PROGRESS</code> - The capacity task is running and cannot be cancelled.</p> </li> <li> <p> <code>WAITING_FOR_EVACUATION</code> - The capacity task requires capacity to run. You must stop the recommended EC2 running instances to free up capacity for the task to run.</p> </li> </ul>"
1413+
"documentation":"<p>Status of the capacity task.</p> <p>A capacity task can have one of the following statuses:</p> <ul> <li> <p> <code>REQUESTED</code> - The capacity task was created and is awaiting the next step by Amazon Web Services Outposts.</p> </li> <li> <p> <code>IN_PROGRESS</code> - The capacity task is running and cannot be cancelled.</p> </li> <li> <p> <code>FAILED</code> - The capacity task could not be completed.</p> </li> <li> <p> <code>COMPLETED</code> - The capacity task has completed successfully.</p> </li> <li> <p> <code>WAITING_FOR_EVACUATION</code> - The capacity task requires capacity to run. You must stop the recommended EC2 running instances to free up capacity for the task to run.</p> </li> <li> <p> <code>CANCELLATION_IN_PROGRESS</code> - The capacity task has been cancelled and is in the process of cleaning up resources.</p> </li> <li> <p> <code>CANCELLED</code> - The capacity task is cancelled.</p> </li> </ul>"
14001414
},
14011415
"Failed":{
14021416
"shape":"CapacityTaskFailure",
@@ -1552,6 +1566,12 @@
15521566
"location":"querystring",
15531567
"locationName":"OrderId"
15541568
},
1569+
"AssetId":{
1570+
"shape":"AssetIdInput",
1571+
"documentation":"<p>The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>",
1572+
"location":"querystring",
1573+
"locationName":"AssetId"
1574+
},
15551575
"MaxResults":{
15561576
"shape":"MaxResults1000",
15571577
"location":"querystring",
@@ -1787,7 +1807,7 @@
17871807
"members":{
17881808
"AssetId":{
17891809
"shape":"AssetId",
1790-
"documentation":"<p> The ID of the asset. </p>"
1810+
"documentation":"<p> The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
17911811
},
17921812
"MacAddressList":{
17931813
"shape":"MacAddressList",
@@ -2714,6 +2734,10 @@
27142734
"shape":"OrderId",
27152735
"documentation":"<p>The ID of the Amazon Web Services Outposts order associated with the specified capacity task.</p>"
27162736
},
2737+
"AssetId":{
2738+
"shape":"AssetIdInput",
2739+
"documentation":"<p>The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
2740+
},
27172741
"InstancePools":{
27182742
"shape":"RequestedInstancePools",
27192743
"documentation":"<p>The instance pools specified in the capacity task.</p>"
@@ -2747,6 +2771,10 @@
27472771
"shape":"OrderId",
27482772
"documentation":"<p>ID of the Amazon Web Services Outposts order of the host associated with the capacity task.</p>"
27492773
},
2774+
"AssetId":{
2775+
"shape":"AssetId",
2776+
"documentation":"<p>The ID of the asset. An Outpost asset can be a single server within an Outposts rack or an Outposts server configuration.</p>"
2777+
},
27502778
"RequestedInstancePools":{
27512779
"shape":"RequestedInstancePools",
27522780
"documentation":"<p>List of the instance pools requested in the specified capacity task.</p>"
@@ -2799,7 +2827,7 @@
27992827
},
28002828
"AssetId":{
28012829
"shape":"AssetId",
2802-
"documentation":"<p> The ID of the Outpost server. </p>"
2830+
"documentation":"<p> The ID of the Outpost server.</p>"
28032831
},
28042832
"ClientPublicKey":{
28052833
"shape":"WireGuardPublicKey",

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@
9696
<max>180</max>
9797
<pattern>^(arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:outpost/)?op-[a-f0-9]{17}$</pattern>
9898
</property-value-rule>
99+
<property-value-rule>
100+
<property>Amazon.Outposts.Model.GetCapacityTaskResponse.AssetId</property>
101+
<min>1</min>
102+
<max>100</max>
103+
<pattern>^(\w+)$</pattern>
104+
</property-value-rule>
99105
<property-value-rule>
100106
<property>Amazon.Outposts.Model.GetCapacityTaskResponse.CapacityTaskId</property>
101107
<min>21</min>
@@ -179,6 +185,12 @@
179185
<max>180</max>
180186
<pattern>^(arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:outpost/)?op-[a-f0-9]{17}$</pattern>
181187
</property-value-rule>
188+
<property-value-rule>
189+
<property>Amazon.Outposts.Model.GetOutpostSupportedInstanceTypesRequest.AssetId</property>
190+
<min>10</min>
191+
<max>10</max>
192+
<pattern>\d{10}</pattern>
193+
</property-value-rule>
182194
<property-value-rule>
183195
<property>Amazon.Outposts.Model.GetOutpostSupportedInstanceTypesRequest.MaxResults</property>
184196
<min>1</min>
@@ -403,6 +415,12 @@
403415
<max>1011</max>
404416
<pattern>^(arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:([a-z\d-]+)/)[a-z]{2,8}-[a-f0-9]{17}$</pattern>
405417
</property-value-rule>
418+
<property-value-rule>
419+
<property>Amazon.Outposts.Model.StartCapacityTaskRequest.AssetId</property>
420+
<min>10</min>
421+
<max>10</max>
422+
<pattern>\d{10}</pattern>
423+
</property-value-rule>
406424
<property-value-rule>
407425
<property>Amazon.Outposts.Model.StartCapacityTaskRequest.OrderId</property>
408426
<min>1</min>
@@ -415,6 +433,12 @@
415433
<max>180</max>
416434
<pattern>^(arn:aws([a-z-]+)?:outposts:[a-z\d-]+:\d{12}:outpost/)?op-[a-f0-9]{17}$</pattern>
417435
</property-value-rule>
436+
<property-value-rule>
437+
<property>Amazon.Outposts.Model.StartCapacityTaskResponse.AssetId</property>
438+
<min>1</min>
439+
<max>100</max>
440+
<pattern>^(\w+)$</pattern>
441+
</property-value-rule>
418442
<property-value-rule>
419443
<property>Amazon.Outposts.Model.StartCapacityTaskResponse.CapacityTaskId</property>
420444
<min>21</min>
@@ -666,6 +690,12 @@
666690
<property>Amazon.Outposts.Model.CapacityTaskFailure.Reason</property>
667691
<max>128</max>
668692
</property-value-rule>
693+
<property-value-rule>
694+
<property>Amazon.Outposts.Model.CapacityTaskSummary.AssetId</property>
695+
<min>1</min>
696+
<max>100</max>
697+
<pattern>^(\w+)$</pattern>
698+
</property-value-rule>
669699
<property-value-rule>
670700
<property>Amazon.Outposts.Model.CapacityTaskSummary.CapacityTaskId</property>
671701
<min>21</min>

sdk/src/Services/Outposts/Generated/Model/AssetInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public partial class AssetInfo
4343
/// <summary>
4444
/// Gets and sets the property AssetId.
4545
/// <para>
46-
/// The ID of the asset.
46+
/// The ID of the asset. An Outpost asset can be a single server within an Outposts rack
47+
/// or an Outposts server configuration.
4748
/// </para>
4849
/// </summary>
4950
[AWSProperty(Min=1, Max=100)]

sdk/src/Services/Outposts/Generated/Model/AssetInstance.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ internal bool IsSetAccountId()
5959
/// <summary>
6060
/// Gets and sets the property AssetId.
6161
/// <para>
62-
/// The ID of the asset.
62+
/// The ID of the asset. An Outpost asset can be a single server within an Outposts rack
63+
/// or an Outposts server configuration.
6364
/// </para>
6465
/// </summary>
6566
[AWSProperty(Min=1, Max=100)]

sdk/src/Services/Outposts/Generated/Model/CapacityTaskSummary.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace Amazon.Outposts.Model
3434
/// </summary>
3535
public partial class CapacityTaskSummary
3636
{
37+
private string _assetId;
3738
private string _capacityTaskId;
3839
private CapacityTaskStatus _capacityTaskStatus;
3940
private DateTime? _completionDate;
@@ -42,6 +43,26 @@ public partial class CapacityTaskSummary
4243
private string _orderId;
4344
private string _outpostId;
4445

46+
/// <summary>
47+
/// Gets and sets the property AssetId.
48+
/// <para>
49+
/// The ID of the asset. An Outpost asset can be a single server within an Outposts rack
50+
/// or an Outposts server configuration.
51+
/// </para>
52+
/// </summary>
53+
[AWSProperty(Min=1, Max=100)]
54+
public string AssetId
55+
{
56+
get { return this._assetId; }
57+
set { this._assetId = value; }
58+
}
59+
60+
// Check to see if AssetId property is set
61+
internal bool IsSetAssetId()
62+
{
63+
return this._assetId != null;
64+
}
65+
4566
/// <summary>
4667
/// Gets and sets the property CapacityTaskId.
4768
/// <para>

sdk/src/Services/Outposts/Generated/Model/GetCapacityTaskResponse.cs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace Amazon.Outposts.Model
3434
/// </summary>
3535
public partial class GetCapacityTaskResponse : AmazonWebServiceResponse
3636
{
37+
private string _assetId;
3738
private string _capacityTaskId;
3839
private CapacityTaskStatus _capacityTaskStatus;
3940
private DateTime? _completionDate;
@@ -47,6 +48,26 @@ public partial class GetCapacityTaskResponse : AmazonWebServiceResponse
4748
private List<InstanceTypeCapacity> _requestedInstancePools = AWSConfigs.InitializeCollections ? new List<InstanceTypeCapacity>() : null;
4849
private TaskActionOnBlockingInstances _taskActionOnBlockingInstances;
4950

51+
/// <summary>
52+
/// Gets and sets the property AssetId.
53+
/// <para>
54+
/// The ID of the Outpost asset. An Outpost asset can be a single server within an Outposts
55+
/// rack or an Outposts server configuration.
56+
/// </para>
57+
/// </summary>
58+
[AWSProperty(Min=1, Max=100)]
59+
public string AssetId
60+
{
61+
get { return this._assetId; }
62+
set { this._assetId = value; }
63+
}
64+
65+
// Check to see if AssetId property is set
66+
internal bool IsSetAssetId()
67+
{
68+
return this._assetId != null;
69+
}
70+
5071
/// <summary>
5172
/// Gets and sets the property CapacityTaskId.
5273
/// <para>
@@ -86,9 +107,26 @@ internal bool IsSetCapacityTaskId()
86107
/// </para>
87108
/// </li> <li>
88109
/// <para>
110+
/// <c>FAILED</c> - The capacity task could not be completed.
111+
/// </para>
112+
/// </li> <li>
113+
/// <para>
114+
/// <c>COMPLETED</c> - The capacity task has completed successfully.
115+
/// </para>
116+
/// </li> <li>
117+
/// <para>
89118
/// <c>WAITING_FOR_EVACUATION</c> - The capacity task requires capacity to run. You must
90119
/// stop the recommended EC2 running instances to free up capacity for the task to run.
91120
/// </para>
121+
/// </li> <li>
122+
/// <para>
123+
/// <c>CANCELLATION_IN_PROGRESS</c> - The capacity task has been cancelled and is in
124+
/// the process of cleaning up resources.
125+
/// </para>
126+
/// </li> <li>
127+
/// <para>
128+
/// <c>CANCELLED</c> - The capacity task is cancelled.
129+
/// </para>
92130
/// </li> </ul>
93131
/// </summary>
94132
public CapacityTaskStatus CapacityTaskStatus

0 commit comments

Comments
 (0)