|
459 | 459 | "requestUri":"/"
|
460 | 460 | },
|
461 | 461 | "input":{"shape":"CancelConversionRequest"},
|
462 |
| - "documentation":"<p>Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is in the process of transferring the final disk image, the command fails and returns an exception.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/ec2-cli-vmimport-export.html\">Importing a Virtual Machine Using the Amazon EC2 CLI</a>.</p>" |
| 462 | + "documentation":"<p>Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is in the process of transferring the final disk image, the command fails and returns an exception.</p>" |
463 | 463 | },
|
464 | 464 | "CancelExportTask":{
|
465 | 465 | "name":"CancelExportTask",
|
|
4827 | 4827 | },
|
4828 | 4828 | "input":{"shape":"ImportInstanceRequest"},
|
4829 | 4829 | "output":{"shape":"ImportInstanceResult"},
|
4830 |
| - "documentation":"<note> <p>We recommend that you use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html\"> <code>ImportImage</code> </a> API. For more information, see <a href=\"https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html\">Importing a VM as an image using VM Import/Export</a> in the <i>VM Import/Export User Guide</i>.</p> </note> <p>Creates an import instance task using metadata from the specified disk image.</p> <p>This API action is not supported by the Command Line Interface (CLI). For information about using the Amazon EC2 CLI, which is deprecated, see <a href=\"https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#UsingVirtualMachinesinAmazonEC2\">Importing a VM to Amazon EC2</a> in the <i>Amazon EC2 CLI Reference</i> PDF file.</p> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>" |
| 4830 | + "documentation":"<note> <p>We recommend that you use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html\"> <code>ImportImage</code> </a> API instead. For more information, see <a href=\"https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html\">Importing a VM as an image using VM Import/Export</a> in the <i>VM Import/Export User Guide</i>.</p> </note> <p>Creates an import instance task using metadata from the specified disk image.</p> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p> <p>This API action is not supported by the Command Line Interface (CLI).</p>" |
4831 | 4831 | },
|
4832 | 4832 | "ImportKeyPair":{
|
4833 | 4833 | "name":"ImportKeyPair",
|
|
4857 | 4857 | },
|
4858 | 4858 | "input":{"shape":"ImportVolumeRequest"},
|
4859 | 4859 | "output":{"shape":"ImportVolumeResult"},
|
4860 |
| - "documentation":"<p>Creates an import volume task using metadata from the specified disk image.</p> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead. To import a disk to a snapshot, use <a>ImportSnapshot</a> instead.</p> <p>This API action is not supported by the Command Line Interface (CLI). For information about using the Amazon EC2 CLI, which is deprecated, see <a href=\"https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#importing-your-volumes-into-amazon-ebs\">Importing Disks to Amazon EBS</a> in the <i>Amazon EC2 CLI Reference</i> PDF file.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>" |
| 4860 | + "documentation":"<note> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead. To import a disk to a snapshot, use <a>ImportSnapshot</a> instead.</p> </note> <p>Creates an import volume task using metadata from the specified disk image.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p> <p>This API action is not supported by the Command Line Interface (CLI).</p>" |
4861 | 4861 | },
|
4862 | 4862 | "ListImagesInRecycleBin":{
|
4863 | 4863 | "name":"ListImagesInRecycleBin",
|
|
17321 | 17321 | "type":"structure",
|
17322 | 17322 | "members":{
|
17323 | 17323 | "KeyName":{
|
17324 |
| - "shape":"KeyPairName", |
| 17324 | + "shape":"KeyPairNameWithResolver", |
17325 | 17325 | "documentation":"<p>The name of the key pair.</p>"
|
17326 | 17326 | },
|
17327 | 17327 | "KeyPairId":{
|
|
19306 | 19306 | },
|
19307 | 19307 | "DescribeCapacityBlockOfferingsRequest":{
|
19308 | 19308 | "type":"structure",
|
19309 |
| - "required":[ |
19310 |
| - "InstanceType", |
19311 |
| - "InstanceCount", |
19312 |
| - "CapacityDurationHours" |
19313 |
| - ], |
| 19309 | + "required":["CapacityDurationHours"], |
19314 | 19310 | "members":{
|
19315 | 19311 | "DryRun":{
|
19316 | 19312 | "shape":"Boolean",
|
|
29887 | 29883 | },
|
29888 | 29884 | "FleetCapacityReservationUsageStrategy":{
|
29889 | 29885 | "type":"string",
|
29890 |
| - "enum":["use-capacity-reservations-first"] |
| 29886 | + "enum":[ |
| 29887 | + "use-capacity-reservations-first", |
| 29888 | + "use-capacity-reservations-only", |
| 29889 | + "none" |
| 29890 | + ] |
29891 | 29891 | },
|
29892 | 29892 | "FleetData":{
|
29893 | 29893 | "type":"structure",
|
|
37483 | 37483 | "r8g.48xlarge",
|
37484 | 37484 | "r8g.metal-24xl",
|
37485 | 37485 | "r8g.metal-48xl",
|
37486 |
| - "mac2-m1ultra.metal" |
| 37486 | + "mac2-m1ultra.metal", |
| 37487 | + "g6e.xlarge", |
| 37488 | + "g6e.2xlarge", |
| 37489 | + "g6e.4xlarge", |
| 37490 | + "g6e.8xlarge", |
| 37491 | + "g6e.12xlarge", |
| 37492 | + "g6e.16xlarge", |
| 37493 | + "g6e.24xlarge", |
| 37494 | + "g6e.48xlarge" |
37487 | 37495 | ]
|
37488 | 37496 | },
|
37489 | 37497 | "InstanceTypeHypervisor":{
|
|
39755 | 39763 | }
|
39756 | 39764 | },
|
39757 | 39765 | "KeyPairName":{"type":"string"},
|
| 39766 | + "KeyPairNameWithResolver":{"type":"string"}, |
39758 | 39767 | "KeyType":{
|
39759 | 39768 | "type":"string",
|
39760 | 39769 | "enum":[
|
|
54262 | 54271 | "members":{
|
54263 | 54272 | "Description":{
|
54264 | 54273 | "shape":"String",
|
54265 |
| - "documentation":"<p>The description of the snapshot.</p>", |
| 54274 | + "documentation":"<p>The description of the disk image being imported.</p>", |
54266 | 54275 | "locationName":"description"
|
54267 | 54276 | },
|
54268 | 54277 | "DiskImageSize":{
|
|
0 commit comments