diff --git a/moto/ec2/resources/instance_types.json b/moto/ec2/resources/instance_types.json index 6ff67eecc977..8d768af44e3f 100644 --- a/moto/ec2/resources/instance_types.json +++ b/moto/ec2/resources/instance_types.json @@ -30519,17 +30519,38 @@ "DedicatedHostsSupported": true, "EbsInfo": { "AttachmentLimitType": "dedicated", + "EbsCards": [ + { + "BaselineBandwidthInMbps": 60000, + "BaselineIops": 240000, + "BaselineThroughputInMBps": 7500.0, + "EbsCardIndex": 0, + "MaximumBandwidthInMbps": 60000, + "MaximumIops": 240000, + "MaximumThroughputInMBps": 7500.0 + }, + { + "BaselineBandwidthInMbps": 60000, + "BaselineIops": 240000, + "BaselineThroughputInMBps": 7500.0, + "EbsCardIndex": 1, + "MaximumBandwidthInMbps": 60000, + "MaximumIops": 240000, + "MaximumThroughputInMBps": 7500.0 + } + ], "EbsOptimizedInfo": { - "BaselineBandwidthInMbps": 60000, - "BaselineIops": 240000, - "BaselineThroughputInMBps": 7500.0, - "MaximumBandwidthInMbps": 60000, - "MaximumIops": 240000, - "MaximumThroughputInMBps": 7500.0 + "BaselineBandwidthInMbps": 120000, + "BaselineIops": 480000, + "BaselineThroughputInMBps": 15000.0, + "MaximumBandwidthInMbps": 120000, + "MaximumIops": 480000, + "MaximumThroughputInMBps": 15000.0 }, "EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "MaximumEbsAttachments": 78, + "MaximumEbsCards": 2, "NvmeSupport": "required" }, "FreeTierEligible": false, @@ -38200,8 +38221,8 @@ }, "Name": "Radeon Pro V520", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -38338,8 +38359,8 @@ }, "Name": "Radeon Pro V520", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -38473,8 +38494,8 @@ }, "Name": "Radeon Pro V520", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -38609,8 +38630,8 @@ }, "Name": "Radeon Pro V520", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -38746,8 +38767,8 @@ }, "Name": "Radeon Pro V520", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -38880,8 +38901,8 @@ }, "Name": "T4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -39034,8 +39055,8 @@ }, "Name": "T4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -39192,8 +39213,8 @@ }, "Name": "T4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -39333,8 +39354,8 @@ }, "Name": "T4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -39476,8 +39497,8 @@ }, "Name": "T4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -39755,8 +39776,8 @@ }, "Name": "T4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -40031,8 +40052,8 @@ }, "Name": "A10G", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -40167,8 +40188,8 @@ }, "Name": "A10G", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -40303,8 +40324,8 @@ }, "Name": "A10G", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -40572,8 +40593,8 @@ }, "Name": "A10G", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -40705,8 +40726,8 @@ }, "Name": "A10G", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -40841,8 +40862,8 @@ }, "Name": "A10G", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -40974,8 +40995,8 @@ }, "Name": "T4g", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -41158,8 +41179,8 @@ }, "Name": "T4g", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -41286,8 +41307,8 @@ }, "Name": "T4g", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -41688,8 +41709,8 @@ }, "Name": "T4g", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -41812,8 +41833,8 @@ }, "Name": "L4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -41965,8 +41986,8 @@ }, "Name": "L4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -42119,8 +42140,8 @@ }, "Name": "L4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -42275,8 +42296,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -42419,8 +42440,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -42574,8 +42595,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -42722,8 +42743,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -42874,8 +42895,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -43016,8 +43037,8 @@ }, "Name": "L40S", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -43167,8 +43188,8 @@ }, "Name": "L40S", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -43318,8 +43339,8 @@ }, "Name": "L40S", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -43477,8 +43498,8 @@ }, "Name": "L40S", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -43621,8 +43642,8 @@ }, "Name": "L40S", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -43796,8 +43817,8 @@ }, "Name": "L40S", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -43944,8 +43965,8 @@ }, "Name": "L40S", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -44095,8 +44116,8 @@ }, "Name": "L40S", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -44237,8 +44258,8 @@ }, "Name": "L4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -44381,8 +44402,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -44529,8 +44550,8 @@ }, "Name": "L4", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -44812,8 +44833,8 @@ }, "Name": "RTX PRO Server 6000", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -44979,8 +45000,8 @@ }, "Name": "RTX PRO Server 6000", "Workloads": [ - "graphics", - "ml-ai" + "ml-ai", + "graphics" ] } ], @@ -45322,8 +45343,8 @@ }, "Name": "RTX PRO Server 6000", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -45536,8 +45557,8 @@ }, "Name": "RTX PRO Server 6000", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -45843,8 +45864,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -45991,8 +46012,8 @@ }, "Name": "L4", "Workloads": [ - "ml-ai", - "graphics" + "graphics", + "ml-ai" ] } ], @@ -47487,7 +47508,7 @@ "ConnectionTrackingConfiguration": { "DefaultTcpEstablishedTimeout": 432000, "DefaultUdpStreamTimeout": 180, - "DefaultUdpTimeout": 60 + "DefaultUdpTimeout": 30 }, "DefaultNetworkCardIndex": 0, "EfaInfo": { @@ -47586,7 +47607,7 @@ "ConnectionTrackingConfiguration": { "DefaultTcpEstablishedTimeout": 432000, "DefaultUdpStreamTimeout": 180, - "DefaultUdpTimeout": 60 + "DefaultUdpTimeout": 30 }, "DefaultNetworkCardIndex": 0, "EfaInfo": { @@ -47685,7 +47706,7 @@ "ConnectionTrackingConfiguration": { "DefaultTcpEstablishedTimeout": 432000, "DefaultUdpStreamTimeout": 180, - "DefaultUdpTimeout": 60 + "DefaultUdpTimeout": 30 }, "DefaultNetworkCardIndex": 0, "EfaInfo": { @@ -94155,17 +94176,38 @@ "DedicatedHostsSupported": true, "EbsInfo": { "AttachmentLimitType": "dedicated", + "EbsCards": [ + { + "BaselineBandwidthInMbps": 60000, + "BaselineIops": 240000, + "BaselineThroughputInMBps": 7500.0, + "EbsCardIndex": 0, + "MaximumBandwidthInMbps": 60000, + "MaximumIops": 240000, + "MaximumThroughputInMBps": 7500.0 + }, + { + "BaselineBandwidthInMbps": 60000, + "BaselineIops": 240000, + "BaselineThroughputInMBps": 7500.0, + "EbsCardIndex": 1, + "MaximumBandwidthInMbps": 60000, + "MaximumIops": 240000, + "MaximumThroughputInMBps": 7500.0 + } + ], "EbsOptimizedInfo": { - "BaselineBandwidthInMbps": 60000, - "BaselineIops": 240000, - "BaselineThroughputInMBps": 7500.0, - "MaximumBandwidthInMbps": 60000, - "MaximumIops": 240000, - "MaximumThroughputInMBps": 7500.0 + "BaselineBandwidthInMbps": 120000, + "BaselineIops": 480000, + "BaselineThroughputInMBps": 15000.0, + "MaximumBandwidthInMbps": 120000, + "MaximumIops": 480000, + "MaximumThroughputInMBps": 15000.0 }, "EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "MaximumEbsAttachments": 78, + "MaximumEbsCards": 2, "NvmeSupport": "required" }, "FreeTierEligible": false, @@ -134226,17 +134268,38 @@ "DedicatedHostsSupported": true, "EbsInfo": { "AttachmentLimitType": "dedicated", + "EbsCards": [ + { + "BaselineBandwidthInMbps": 60000, + "BaselineIops": 240000, + "BaselineThroughputInMBps": 7500.0, + "EbsCardIndex": 0, + "MaximumBandwidthInMbps": 60000, + "MaximumIops": 240000, + "MaximumThroughputInMBps": 7500.0 + }, + { + "BaselineBandwidthInMbps": 60000, + "BaselineIops": 240000, + "BaselineThroughputInMBps": 7500.0, + "EbsCardIndex": 1, + "MaximumBandwidthInMbps": 60000, + "MaximumIops": 240000, + "MaximumThroughputInMBps": 7500.0 + } + ], "EbsOptimizedInfo": { - "BaselineBandwidthInMbps": 60000, - "BaselineIops": 240000, - "BaselineThroughputInMBps": 7500.0, - "MaximumBandwidthInMbps": 60000, - "MaximumIops": 240000, - "MaximumThroughputInMBps": 7500.0 + "BaselineBandwidthInMbps": 120000, + "BaselineIops": 480000, + "BaselineThroughputInMBps": 15000.0, + "MaximumBandwidthInMbps": 120000, + "MaximumIops": 480000, + "MaximumThroughputInMBps": 15000.0 }, "EbsOptimizedSupport": "default", "EncryptionSupport": "supported", "MaximumEbsAttachments": 78, + "MaximumEbsCards": 2, "NvmeSupport": "required" }, "FreeTierEligible": false,