diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json index 9266180a9565..3e74dd8942b1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json @@ -995,6 +995,30 @@ "InstanceType": "c8in.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8ine.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az1" @@ -2679,18 +2703,6 @@ "InstanceType": "mac1.metal", "Location": "apne1-az1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apne1-az1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apne1-az1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apne1-az1" - }, { "InstanceType": "p4d.24xlarge", "Location": "apne1-az1" @@ -3771,6 +3783,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "apne1-az1" @@ -4943,6 +4959,30 @@ "InstanceType": "c8in.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8ine.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az2" @@ -8683,6 +8723,30 @@ "InstanceType": "c8in.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8ine.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az4" @@ -10363,18 +10427,6 @@ "InstanceType": "mac1.metal", "Location": "apne1-az4" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apne1-az4" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apne1-az4" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apne1-az4" - }, { "InstanceType": "p3dn.24xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index f0aa60a58d28..b5d6acd49be2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json @@ -1835,18 +1835,6 @@ "InstanceType": "mac1.metal", "Location": "apne2-az1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apne2-az1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apne2-az1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apne2-az1" - }, { "InstanceType": "p5.48xlarge", "Location": "apne2-az1" @@ -6723,18 +6711,6 @@ "InstanceType": "m8i.xlarge", "Location": "apne2-az3" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apne2-az3" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apne2-az3" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apne2-az3" - }, { "InstanceType": "r3.2xlarge", "Location": "apne2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json index c9ecd6050e9e..a87ac8e2a6d9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json @@ -815,6 +815,38 @@ "InstanceType": "g6.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "g6f.2xlarge", "Location": "aps1-az1" @@ -6195,6 +6227,38 @@ "InstanceType": "g6.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "g6f.2xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index 211430aa2df8..765c33e9c62f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json @@ -2131,18 +2131,6 @@ "InstanceType": "mac2.metal", "Location": "apse1-az1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apse1-az1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apse1-az1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apse1-az1" - }, { "InstanceType": "r3.2xlarge", "Location": "apse1-az1" @@ -5379,18 +5367,6 @@ "InstanceType": "mac2.metal", "Location": "apse1-az2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apse1-az2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apse1-az2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apse1-az2" - }, { "InstanceType": "p4de.24xlarge", "Location": "apse1-az2" @@ -6339,6 +6315,10 @@ "InstanceType": "u7i-6tb.112xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "apse1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index ae7bcae69ae9..01c8b8db5404 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json @@ -919,18 +919,6 @@ "InstanceType": "d3en.xlarge", "Location": "apse2-az1" }, - { - "InstanceType": "f1.16xlarge", - "Location": "apse2-az1" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "apse2-az1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "apse2-az1" - }, { "InstanceType": "f2.12xlarge", "Location": "apse2-az1" @@ -2351,18 +2339,6 @@ "InstanceType": "mac2-m2pro.metal", "Location": "apse2-az1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "apse2-az1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "apse2-az1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "apse2-az1" - }, { "InstanceType": "p4d.24xlarge", "Location": "apse2-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json index 7687d8321880..62d733b67b4c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json @@ -4803,18 +4803,6 @@ "InstanceType": "mac2-m2.metal", "Location": "cac1-az2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "cac1-az2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "cac1-az2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "cac1-az2" - }, { "InstanceType": "p4d.24xlarge", "Location": "cac1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index 2ff9a72ac632..92485d0d4d94 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json @@ -971,14 +971,6 @@ "InstanceType": "dl2q.24xlarge", "Location": "euc1-az1" }, - { - "InstanceType": "f1.2xlarge", - "Location": "euc1-az1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euc1-az1" - }, { "InstanceType": "f2.12xlarge", "Location": "euc1-az1" @@ -6299,18 +6291,6 @@ "InstanceType": "mac2-m2.metal", "Location": "euc1-az2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "euc1-az2" - }, { "InstanceType": "p4d.24xlarge", "Location": "euc1-az2" @@ -8775,14 +8755,6 @@ "InstanceType": "d3en.xlarge", "Location": "euc1-az3" }, - { - "InstanceType": "f1.2xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euc1-az3" - }, { "InstanceType": "f2.12xlarge", "Location": "euc1-az3" @@ -10387,18 +10359,6 @@ "InstanceType": "m8id.xlarge", "Location": "euc1-az3" }, - { - "InstanceType": "p3.16xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "euc1-az3" - }, { "InstanceType": "p4d.24xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index d24f3606a6f6..19cee6011c78 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -999,18 +999,6 @@ "InstanceType": "d3en.xlarge", "Location": "euw1-az1" }, - { - "InstanceType": "f1.16xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euw1-az1" - }, { "InstanceType": "g4ad.16xlarge", "Location": "euw1-az1" @@ -4859,18 +4847,6 @@ "InstanceType": "d3en.xlarge", "Location": "euw1-az2" }, - { - "InstanceType": "f1.16xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euw1-az2" - }, { "InstanceType": "g4ad.16xlarge", "Location": "euw1-az2" @@ -6231,18 +6207,6 @@ "InstanceType": "mac2.metal", "Location": "euw1-az2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "euw1-az2" - }, { "InstanceType": "p3dn.24xlarge", "Location": "euw1-az2" @@ -8515,18 +8479,6 @@ "InstanceType": "d3en.xlarge", "Location": "euw1-az3" }, - { - "InstanceType": "f1.16xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euw1-az3" - }, { "InstanceType": "g4ad.16xlarge", "Location": "euw1-az3" @@ -9963,18 +9915,6 @@ "InstanceType": "mac-m4.metal", "Location": "euw1-az3" }, - { - "InstanceType": "p3.16xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "euw1-az3" - }, { "InstanceType": "r3.2xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 5a32a72102d7..436ac3c551fd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json @@ -811,14 +811,6 @@ "InstanceType": "d3.xlarge", "Location": "euw2-az1" }, - { - "InstanceType": "f1.2xlarge", - "Location": "euw2-az1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euw2-az1" - }, { "InstanceType": "f2.12xlarge", "Location": "euw2-az1" @@ -3635,14 +3627,6 @@ "InstanceType": "d3.xlarge", "Location": "euw2-az2" }, - { - "InstanceType": "f1.2xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "euw2-az2" - }, { "InstanceType": "f2.12xlarge", "Location": "euw2-az2" @@ -4791,18 +4775,6 @@ "InstanceType": "mac1.metal", "Location": "euw2-az2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "euw2-az2" - }, { "InstanceType": "p4d.24xlarge", "Location": "euw2-az2" @@ -7671,18 +7643,6 @@ "InstanceType": "m8i.xlarge", "Location": "euw2-az3" }, - { - "InstanceType": "p3.16xlarge", - "Location": "euw2-az3" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "euw2-az3" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "euw2-az3" - }, { "InstanceType": "p4d.24xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index fab96cb47b35..97d5031f07e3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json @@ -1019,18 +1019,6 @@ "InstanceType": "d3en.xlarge", "Location": "use1-az1" }, - { - "InstanceType": "f1.16xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "use1-az1" - }, { "InstanceType": "f2.12xlarge", "Location": "use1-az1" @@ -2627,18 +2615,6 @@ "InstanceType": "mac2.metal", "Location": "use1-az1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "use1-az1" - }, { "InstanceType": "p3dn.24xlarge", "Location": "use1-az1" @@ -5347,6 +5323,30 @@ "InstanceType": "c8in.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8ine.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az2" @@ -5407,18 +5407,6 @@ "InstanceType": "dl1.24xlarge", "Location": "use1-az2" }, - { - "InstanceType": "f1.16xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "use1-az2" - }, { "InstanceType": "f2.12xlarge", "Location": "use1-az2" @@ -7187,6 +7175,50 @@ "InstanceType": "m8i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "m8id.12xlarge", "Location": "use1-az2" @@ -7240,27 +7272,83 @@ "Location": "use1-az2" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "use1-az2" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.16xlarge", "Location": "use1-az2" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8in.8xlarge", "Location": "use1-az2" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8in.96xlarge", "Location": "use1-az2" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "m8in.large", "Location": "use1-az2" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "m8in.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ine.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "mac2.metal", "Location": "use1-az2" }, { @@ -8367,6 +8455,50 @@ "InstanceType": "r8i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "r8id.12xlarge", "Location": "use1-az2" @@ -8419,6 +8551,50 @@ "InstanceType": "r8id.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "t1.micro", "Location": "use1-az2" @@ -8907,18 +9083,6 @@ "InstanceType": "d2.xlarge", "Location": "use1-az3" }, - { - "InstanceType": "f1.16xlarge", - "Location": "use1-az3" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "use1-az3" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "use1-az3" - }, { "InstanceType": "f2.12xlarge", "Location": "use1-az3" @@ -10303,6 +10467,30 @@ "InstanceType": "c8in.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c8ine.large", + "Location": "use1-az4" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az4" @@ -10359,18 +10547,6 @@ "InstanceType": "d3en.xlarge", "Location": "use1-az4" }, - { - "InstanceType": "f1.16xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "use1-az4" - }, { "InstanceType": "f2.12xlarge", "Location": "use1-az4" @@ -12116,83 +12292,195 @@ "Location": "use1-az4" }, { - "InstanceType": "m8id.12xlarge", + "InstanceType": "m8ib.12xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.16xlarge", + "InstanceType": "m8ib.16xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.24xlarge", + "InstanceType": "m8ib.24xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.2xlarge", + "InstanceType": "m8ib.2xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.32xlarge", + "InstanceType": "m8ib.32xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.48xlarge", + "InstanceType": "m8ib.48xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.4xlarge", + "InstanceType": "m8ib.4xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.8xlarge", + "InstanceType": "m8ib.8xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.96xlarge", + "InstanceType": "m8ib.96xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.large", + "InstanceType": "m8ib.large", "Location": "use1-az4" }, { - "InstanceType": "m8id.metal-48xl", + "InstanceType": "m8ib.xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.metal-96xl", + "InstanceType": "m8id.12xlarge", "Location": "use1-az4" }, { - "InstanceType": "m8id.xlarge", + "InstanceType": "m8id.16xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8id.24xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8id.2xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8id.32xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8id.48xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8id.4xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8id.8xlarge", "Location": "use1-az4" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8id.96xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8id.large", + "Location": "use1-az4" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "use1-az4" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "use1-az4" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.large", + "Location": "use1-az4" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m8ine.large", + "Location": "use1-az4" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "mac1.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "mac2.metal", "Location": "use1-az4" }, { @@ -13299,6 +13587,50 @@ "InstanceType": "r8i.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "r8id.12xlarge", "Location": "use1-az4" @@ -13351,6 +13683,50 @@ "InstanceType": "r8id.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "t1.micro", "Location": "use1-az4" @@ -16139,18 +16515,6 @@ "InstanceType": "m8id.xlarge", "Location": "use1-az5" }, - { - "InstanceType": "p3.16xlarge", - "Location": "use1-az5" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "use1-az5" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "use1-az5" - }, { "InstanceType": "p5.48xlarge", "Location": "use1-az5" @@ -18607,6 +18971,30 @@ "InstanceType": "c8in.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c8ine.large", + "Location": "use1-az6" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az6" @@ -18663,18 +19051,6 @@ "InstanceType": "d3en.xlarge", "Location": "use1-az6" }, - { - "InstanceType": "f1.16xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "use1-az6" - }, { "InstanceType": "f2.12xlarge", "Location": "use1-az6" @@ -20455,6 +20831,50 @@ "InstanceType": "m8i.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.large", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "m8id.12xlarge", "Location": "use1-az6" @@ -20508,47 +20928,103 @@ "Location": "use1-az6" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8in.16xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.24xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.2xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.32xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.48xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.4xlarge", "Location": "use1-az6" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8in.large", "Location": "use1-az6" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8in.xlarge", "Location": "use1-az6" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "m8ine.12xlarge", "Location": "use1-az6" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "m8ine.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ine.large", + "Location": "use1-az6" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac1.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "mac2.metal", "Location": "use1-az6" }, { @@ -21667,6 +22143,50 @@ "InstanceType": "r8i.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "r8id.12xlarge", "Location": "use1-az6" @@ -21719,6 +22239,50 @@ "InstanceType": "r8id.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "t1.micro", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index 7c2e405c7227..8a72d5abd534 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json @@ -2707,18 +2707,6 @@ "InstanceType": "mac2.metal", "Location": "use2-az1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "use2-az1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "use2-az1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "use2-az1" - }, { "InstanceType": "p4d.24xlarge", "Location": "use2-az1" @@ -3735,6 +3723,50 @@ "InstanceType": "r8i.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "r8id.12xlarge", "Location": "use2-az1" @@ -3787,6 +3819,50 @@ "InstanceType": "r8id.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az1" @@ -6931,18 +7007,6 @@ "InstanceType": "mac2.metal", "Location": "use2-az2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "use2-az2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "use2-az2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "use2-az2" - }, { "InstanceType": "p4d.24xlarge", "Location": "use2-az2" @@ -7959,6 +8023,50 @@ "InstanceType": "r8i.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "r8id.12xlarge", "Location": "use2-az2" @@ -8011,6 +8119,50 @@ "InstanceType": "r8id.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az2" @@ -12059,6 +12211,50 @@ "InstanceType": "r8i.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "r8id.12xlarge", "Location": "use2-az3" @@ -12111,6 +12307,50 @@ "InstanceType": "r8id.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index c49c92f5b96c..c3f5c8ef7c72 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json @@ -1159,6 +1159,30 @@ "InstanceType": "c8in.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c8ine.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az1" @@ -1219,18 +1243,6 @@ "InstanceType": "dl1.24xlarge", "Location": "usw2-az1" }, - { - "InstanceType": "f1.16xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "usw2-az1" - }, { "InstanceType": "f2.12xlarge", "Location": "usw2-az1" @@ -2983,6 +2995,50 @@ "InstanceType": "m8i.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "m8id.12xlarge", "Location": "usw2-az1" @@ -3036,43 +3092,99 @@ "Location": "usw2-az1" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "usw2-az1" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.16xlarge", "Location": "usw2-az1" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.24xlarge", "Location": "usw2-az1" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.2xlarge", "Location": "usw2-az1" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.32xlarge", "Location": "usw2-az1" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.48xlarge", "Location": "usw2-az1" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8in.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ine.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "mac1.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "mac2-m1ultra.metal", "Location": "usw2-az1" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "mac2-m2.metal", "Location": "usw2-az1" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac2-m2pro.metal", "Location": "usw2-az1" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "usw2-az1" }, { @@ -4171,6 +4283,50 @@ "InstanceType": "r8i.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "r8id.12xlarge", "Location": "usw2-az1" @@ -4223,6 +4379,50 @@ "InstanceType": "r8id.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "t1.micro", "Location": "usw2-az1" @@ -5883,6 +6083,30 @@ "InstanceType": "c8in.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c8ine.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az2" @@ -5939,18 +6163,6 @@ "InstanceType": "d3en.xlarge", "Location": "usw2-az2" }, - { - "InstanceType": "f1.16xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "usw2-az2" - }, { "InstanceType": "g4ad.16xlarge", "Location": "usw2-az2" @@ -7676,151 +7888,251 @@ "Location": "usw2-az2" }, { - "InstanceType": "m8id.12xlarge", + "InstanceType": "m8ib.12xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.16xlarge", + "InstanceType": "m8ib.16xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.24xlarge", + "InstanceType": "m8ib.24xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.2xlarge", + "InstanceType": "m8ib.2xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.32xlarge", + "InstanceType": "m8ib.32xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.48xlarge", + "InstanceType": "m8ib.48xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.4xlarge", + "InstanceType": "m8ib.4xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.8xlarge", + "InstanceType": "m8ib.8xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.96xlarge", + "InstanceType": "m8ib.96xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.large", + "InstanceType": "m8ib.large", "Location": "usw2-az2" }, { - "InstanceType": "m8id.metal-48xl", + "InstanceType": "m8ib.xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.metal-96xl", + "InstanceType": "m8id.12xlarge", "Location": "usw2-az2" }, { - "InstanceType": "m8id.xlarge", + "InstanceType": "m8id.16xlarge", "Location": "usw2-az2" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8id.24xlarge", "Location": "usw2-az2" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8id.2xlarge", "Location": "usw2-az2" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8id.32xlarge", "Location": "usw2-az2" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8id.48xlarge", "Location": "usw2-az2" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8id.4xlarge", "Location": "usw2-az2" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8id.8xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8id.96xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "m8id.large", "Location": "usw2-az2" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "m8id.metal-48xl", "Location": "usw2-az2" }, { - "InstanceType": "p4d.24xlarge", + "InstanceType": "m8id.metal-96xl", "Location": "usw2-az2" }, { - "InstanceType": "p4de.24xlarge", + "InstanceType": "m8id.xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p5.48xlarge", + "InstanceType": "m8in.12xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p5.4xlarge", + "InstanceType": "m8in.16xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p5en.48xlarge", + "InstanceType": "m8in.24xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p6-b200.48xlarge", + "InstanceType": "m8in.2xlarge", "Location": "usw2-az2" }, { - "InstanceType": "p6-b300.48xlarge", + "InstanceType": "m8in.32xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r3.2xlarge", + "InstanceType": "m8in.48xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r3.4xlarge", + "InstanceType": "m8in.4xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r3.8xlarge", + "InstanceType": "m8in.8xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r3.large", + "InstanceType": "m8in.96xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r3.xlarge", + "InstanceType": "m8in.large", "Location": "usw2-az2" }, { - "InstanceType": "r4.16xlarge", + "InstanceType": "m8in.xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r4.2xlarge", + "InstanceType": "m8ine.12xlarge", "Location": "usw2-az2" }, { - "InstanceType": "r4.4xlarge", + "InstanceType": "m8ine.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m8ine.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "mac1.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "mac2.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "p4d.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "p4de.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "p5.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "p5.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "p5en.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "p6-b200.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "p6-b300.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r3.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r3.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r3.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r3.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r3.xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r4.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r4.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r4.4xlarge", "Location": "usw2-az2" }, { @@ -8863,6 +9175,50 @@ "InstanceType": "r8i.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "r8id.12xlarge", "Location": "usw2-az2" @@ -8915,6 +9271,50 @@ "InstanceType": "r8id.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "Location": "usw2-az2" @@ -10519,6 +10919,30 @@ "InstanceType": "c8in.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c8ine.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az3" @@ -10575,18 +10999,6 @@ "InstanceType": "d3en.xlarge", "Location": "usw2-az3" }, - { - "InstanceType": "f1.16xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "usw2-az3" - }, { "InstanceType": "f2.12xlarge", "Location": "usw2-az3" @@ -12339,6 +12751,50 @@ "InstanceType": "m8i.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "m8id.12xlarge", "Location": "usw2-az3" @@ -12392,47 +12848,103 @@ "Location": "usw2-az3" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8in.16xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.24xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.2xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.32xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.48xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.4xlarge", "Location": "usw2-az3" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8in.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ine.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "mac-m4pro.metal", "Location": "usw2-az3" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "mac1.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "mac2-m2.metal", "Location": "usw2-az3" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac2-m2pro.metal", "Location": "usw2-az3" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "usw2-az3" }, { @@ -13535,6 +14047,50 @@ "InstanceType": "r8i.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "r8id.12xlarge", "Location": "usw2-az3" @@ -13587,6 +14143,50 @@ "InstanceType": "r8id.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "t1.micro", "Location": "usw2-az3" @@ -16319,6 +16919,50 @@ "InstanceType": "m8i.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "m8id.12xlarge", "Location": "usw2-az4" @@ -16371,6 +17015,74 @@ "InstanceType": "m8id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m8in.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ine.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "mac-m4.metal", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json index 08634914bc18..752109928fab 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json @@ -1067,6 +1067,30 @@ "InstanceType": "c8in.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8ine.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1a" @@ -2747,18 +2771,6 @@ "InstanceType": "mac1.metal", "Location": "ap-northeast-1a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-northeast-1a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-northeast-1a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-northeast-1a" - }, { "InstanceType": "p3dn.24xlarge", "Location": "ap-northeast-1a" @@ -5095,6 +5107,30 @@ "InstanceType": "c8in.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8ine.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1c" @@ -6779,18 +6815,6 @@ "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-northeast-1c" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-northeast-1c" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-northeast-1c" - }, { "InstanceType": "p4d.24xlarge", "Location": "ap-northeast-1c" @@ -7871,6 +7895,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "x1.16xlarge", "Location": "ap-northeast-1c" @@ -9043,6 +9071,30 @@ "InstanceType": "c8in.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8ine.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 6eef188b9a19..45479420faaf 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json @@ -1835,18 +1835,6 @@ "InstanceType": "mac1.metal", "Location": "ap-northeast-2a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-northeast-2a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-northeast-2a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-northeast-2a" - }, { "InstanceType": "p5.48xlarge", "Location": "ap-northeast-2a" @@ -6723,18 +6711,6 @@ "InstanceType": "m8i.xlarge", "Location": "ap-northeast-2c" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-northeast-2c" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-northeast-2c" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-northeast-2c" - }, { "InstanceType": "r3.2xlarge", "Location": "ap-northeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json index 8bdf459cc370..ce025eac1135 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json @@ -815,6 +815,38 @@ "InstanceType": "g6.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "g6f.2xlarge", "Location": "ap-south-1a" @@ -3711,6 +3743,38 @@ "InstanceType": "g6.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "g6f.2xlarge", "Location": "ap-south-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json index 38c8c46875d4..2fab3da7187f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json @@ -2175,18 +2175,6 @@ "InstanceType": "mac2.metal", "Location": "ap-southeast-1a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-southeast-1a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-southeast-1a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-southeast-1a" - }, { "InstanceType": "p4de.24xlarge", "Location": "ap-southeast-1a" @@ -3135,6 +3123,10 @@ "InstanceType": "u7i-6tb.112xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "ap-southeast-1a" @@ -5379,18 +5371,6 @@ "InstanceType": "mac2.metal", "Location": "ap-southeast-1b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-southeast-1b" - }, { "InstanceType": "r3.2xlarge", "Location": "ap-southeast-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index db6b0956c972..86a888c05039 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json @@ -4259,18 +4259,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-southeast-2b" }, - { - "InstanceType": "f1.16xlarge", - "Location": "ap-southeast-2b" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "ap-southeast-2b" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "ap-southeast-2b" - }, { "InstanceType": "f2.12xlarge", "Location": "ap-southeast-2b" @@ -5691,18 +5679,6 @@ "InstanceType": "mac2-m2pro.metal", "Location": "ap-southeast-2b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-southeast-2b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-southeast-2b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-southeast-2b" - }, { "InstanceType": "p4d.24xlarge", "Location": "ap-southeast-2b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json index d4dece5b952b..ff2207c48b49 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json @@ -4803,18 +4803,6 @@ "InstanceType": "mac2-m2.metal", "Location": "ca-central-1b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ca-central-1b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ca-central-1b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ca-central-1b" - }, { "InstanceType": "p4d.24xlarge", "Location": "ca-central-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json index 84594e4cfe75..704ff325638b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json @@ -2583,18 +2583,6 @@ "InstanceType": "mac2-m2.metal", "Location": "eu-central-1a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-central-1a" - }, { "InstanceType": "p4d.24xlarge", "Location": "eu-central-1a" @@ -5059,14 +5047,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-central-1b" }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-central-1b" - }, { "InstanceType": "f2.12xlarge", "Location": "eu-central-1b" @@ -6671,18 +6651,6 @@ "InstanceType": "m8id.xlarge", "Location": "eu-central-1b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-central-1b" - }, { "InstanceType": "p4d.24xlarge", "Location": "eu-central-1b" @@ -9055,14 +9023,6 @@ "InstanceType": "dl2q.24xlarge", "Location": "eu-central-1c" }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-central-1c" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-central-1c" - }, { "InstanceType": "f2.12xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index 6b8cbcb019f8..600d7ffecd1c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -975,18 +975,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1a" }, - { - "InstanceType": "f1.16xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-1a" @@ -2347,18 +2335,6 @@ "InstanceType": "mac2.metal", "Location": "eu-west-1a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "p3dn.24xlarge", "Location": "eu-west-1a" @@ -4631,18 +4607,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "f1.16xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-1b" @@ -6079,18 +6043,6 @@ "InstanceType": "mac-m4.metal", "Location": "eu-west-1b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "r3.2xlarge", "Location": "eu-west-1b" @@ -8315,18 +8267,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1c" }, - { - "InstanceType": "f1.16xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-1c" - }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index 8d473314a939..551c28253894 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json @@ -807,14 +807,6 @@ "InstanceType": "d3.xlarge", "Location": "eu-west-2a" }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-2a" - }, { "InstanceType": "f2.12xlarge", "Location": "eu-west-2a" @@ -1963,18 +1955,6 @@ "InstanceType": "mac1.metal", "Location": "eu-west-2a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-2a" - }, { "InstanceType": "p4d.24xlarge", "Location": "eu-west-2a" @@ -4843,18 +4823,6 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-2b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-2b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-2b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-2b" - }, { "InstanceType": "p4d.24xlarge", "Location": "eu-west-2b" @@ -6523,14 +6491,6 @@ "InstanceType": "d3.xlarge", "Location": "eu-west-2c" }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-2c" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-2c" - }, { "InstanceType": "f2.12xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 3f8a91cfb7cf..77d2581ff939 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json @@ -1207,6 +1207,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1a" @@ -1263,18 +1287,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1a" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1a" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1a" @@ -3055,6 +3067,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-east-1a" @@ -3108,47 +3164,103 @@ "Location": "us-east-1a" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8in.16xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.24xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.2xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.32xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.48xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.4xlarge", "Location": "us-east-1a" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8in.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac1.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac2-m1ultra.metal", "Location": "us-east-1a" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "mac2-m2.metal", "Location": "us-east-1a" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac2-m2pro.metal", "Location": "us-east-1a" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "us-east-1a" }, { @@ -4267,6 +4379,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-1a" @@ -4319,6 +4475,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "t1.micro", "Location": "us-east-1a" @@ -5767,18 +5967,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1b" @@ -7375,18 +7563,6 @@ "InstanceType": "mac2.metal", "Location": "us-east-1b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "p3dn.24xlarge", "Location": "us-east-1b" @@ -10095,6 +10271,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1c" @@ -10155,18 +10355,6 @@ "InstanceType": "dl1.24xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1c" @@ -11936,87 +12124,187 @@ "Location": "us-east-1c" }, { - "InstanceType": "m8id.12xlarge", + "InstanceType": "m8ib.12xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.16xlarge", + "InstanceType": "m8ib.16xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.24xlarge", + "InstanceType": "m8ib.24xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.2xlarge", + "InstanceType": "m8ib.2xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.32xlarge", + "InstanceType": "m8ib.32xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.48xlarge", + "InstanceType": "m8ib.48xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.4xlarge", + "InstanceType": "m8ib.4xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.8xlarge", + "InstanceType": "m8ib.8xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.96xlarge", + "InstanceType": "m8ib.96xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.large", + "InstanceType": "m8ib.large", "Location": "us-east-1c" }, { - "InstanceType": "m8id.metal-48xl", + "InstanceType": "m8ib.xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.metal-96xl", + "InstanceType": "m8id.12xlarge", "Location": "us-east-1c" }, { - "InstanceType": "m8id.xlarge", + "InstanceType": "m8id.16xlarge", "Location": "us-east-1c" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8id.24xlarge", "Location": "us-east-1c" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8id.2xlarge", "Location": "us-east-1c" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8id.32xlarge", "Location": "us-east-1c" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8id.48xlarge", "Location": "us-east-1c" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "m8id.4xlarge", "Location": "us-east-1c" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "m8id.8xlarge", "Location": "us-east-1c" }, { - "InstanceType": "p4d.24xlarge", + "InstanceType": "m8id.96xlarge", "Location": "us-east-1c" }, { - "InstanceType": "p5.48xlarge", + "InstanceType": "m8id.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "p4d.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "p5.48xlarge", "Location": "us-east-1c" }, { @@ -13115,6 +13403,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-1c" @@ -13167,6 +13499,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "t1.micro", "Location": "us-east-1c" @@ -14807,6 +15183,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1d" @@ -14863,18 +15263,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1d" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1d" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1d" @@ -16619,6 +17007,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-east-1d" @@ -16671,6 +17103,74 @@ "InstanceType": "m8id.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m8in.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "mac-m4.metal", "Location": "us-east-1d" @@ -17803,6 +18303,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-1d" @@ -17855,6 +18399,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "t1.micro", "Location": "us-east-1d" @@ -18339,18 +18927,6 @@ "InstanceType": "d2.xlarge", "Location": "us-east-1e" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1e" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1e" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1e" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1e" @@ -20887,18 +21463,6 @@ "InstanceType": "m8id.xlarge", "Location": "us-east-1f" }, - { - "InstanceType": "p3.16xlarge", - "Location": "us-east-1f" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "us-east-1f" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "us-east-1f" - }, { "InstanceType": "p5.48xlarge", "Location": "us-east-1f" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index a30cad9cedab..e55db1469c77 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json @@ -2707,18 +2707,6 @@ "InstanceType": "mac2.metal", "Location": "us-east-2a" }, - { - "InstanceType": "p3.16xlarge", - "Location": "us-east-2a" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "us-east-2a" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "us-east-2a" - }, { "InstanceType": "p4d.24xlarge", "Location": "us-east-2a" @@ -3735,6 +3723,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-2a" @@ -3787,6 +3819,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2a" @@ -6931,18 +7007,6 @@ "InstanceType": "mac2.metal", "Location": "us-east-2b" }, - { - "InstanceType": "p3.16xlarge", - "Location": "us-east-2b" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "us-east-2b" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "us-east-2b" - }, { "InstanceType": "p4d.24xlarge", "Location": "us-east-2b" @@ -7959,6 +8023,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-2b" @@ -8011,6 +8119,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2b" @@ -12059,6 +12211,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-2c" @@ -12111,6 +12307,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index 927a76dca2f2..981a987802d8 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json @@ -1183,6 +1183,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2a" @@ -1239,18 +1263,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-west-2a" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-west-2a" - }, { "InstanceType": "g4ad.16xlarge", "Location": "us-west-2a" @@ -2975,6 +2987,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-west-2a" @@ -3028,39 +3084,95 @@ "Location": "us-west-2a" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "us-west-2a" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.16xlarge", "Location": "us-west-2a" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.24xlarge", "Location": "us-west-2a" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.2xlarge", "Location": "us-west-2a" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.32xlarge", "Location": "us-west-2a" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8in.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m8ine.large", "Location": "us-west-2a" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8ine.xlarge", "Location": "us-west-2a" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac-m4.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "mac1.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2a" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "us-west-2a" }, { @@ -4163,6 +4275,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-west-2a" @@ -4215,6 +4371,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -5827,6 +6027,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2b" @@ -5887,18 +6111,6 @@ "InstanceType": "dl1.24xlarge", "Location": "us-west-2b" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-west-2b" - }, { "InstanceType": "f2.12xlarge", "Location": "us-west-2b" @@ -7652,159 +7864,259 @@ "Location": "us-west-2b" }, { - "InstanceType": "m8id.12xlarge", + "InstanceType": "m8ib.12xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.16xlarge", + "InstanceType": "m8ib.16xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.24xlarge", + "InstanceType": "m8ib.24xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.2xlarge", + "InstanceType": "m8ib.2xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.32xlarge", + "InstanceType": "m8ib.32xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.48xlarge", + "InstanceType": "m8ib.48xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.4xlarge", + "InstanceType": "m8ib.4xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.8xlarge", + "InstanceType": "m8ib.8xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.96xlarge", + "InstanceType": "m8ib.96xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.large", + "InstanceType": "m8ib.large", "Location": "us-west-2b" }, { - "InstanceType": "m8id.metal-48xl", + "InstanceType": "m8ib.xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.metal-96xl", + "InstanceType": "m8id.12xlarge", "Location": "us-west-2b" }, { - "InstanceType": "m8id.xlarge", + "InstanceType": "m8id.16xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8id.24xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8id.2xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8id.32xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8id.48xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8id.4xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8id.8xlarge", "Location": "us-west-2b" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8id.96xlarge", "Location": "us-west-2b" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8id.large", "Location": "us-west-2b" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "m8id.metal-48xl", "Location": "us-west-2b" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "m8id.metal-96xl", "Location": "us-west-2b" }, { - "InstanceType": "p3dn.24xlarge", + "InstanceType": "m8id.xlarge", "Location": "us-west-2b" }, { - "InstanceType": "p4d.24xlarge", + "InstanceType": "m8in.12xlarge", "Location": "us-west-2b" }, { - "InstanceType": "p4de.24xlarge", + "InstanceType": "m8in.16xlarge", "Location": "us-west-2b" }, { - "InstanceType": "p5.48xlarge", + "InstanceType": "m8in.24xlarge", "Location": "us-west-2b" }, { - "InstanceType": "p5.4xlarge", + "InstanceType": "m8in.2xlarge", "Location": "us-west-2b" }, { - "InstanceType": "p6-b200.48xlarge", + "InstanceType": "m8in.32xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r3.2xlarge", + "InstanceType": "m8in.48xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r3.4xlarge", + "InstanceType": "m8in.4xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r3.8xlarge", + "InstanceType": "m8in.8xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r3.large", + "InstanceType": "m8in.96xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r3.xlarge", + "InstanceType": "m8in.large", "Location": "us-west-2b" }, { - "InstanceType": "r4.16xlarge", + "InstanceType": "m8in.xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r4.2xlarge", + "InstanceType": "m8ine.12xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r4.4xlarge", + "InstanceType": "m8ine.2xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r4.8xlarge", + "InstanceType": "m8ine.4xlarge", "Location": "us-west-2b" }, { - "InstanceType": "r4.large", + "InstanceType": "m8ine.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac1.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "mac2.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "p3dn.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "p4d.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "p4de.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "p5.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "p6-b200.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r3.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r3.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r3.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r3.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r3.xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r4.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r4.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r4.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r4.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r4.large", "Location": "us-west-2b" }, { @@ -8839,6 +9151,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-west-2b" @@ -8891,6 +9247,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "t1.micro", "Location": "us-west-2b" @@ -10519,6 +10919,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2c" @@ -10575,18 +10999,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-west-2c" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-west-2c" - }, { "InstanceType": "f2.12xlarge", "Location": "us-west-2c" @@ -12339,6 +12751,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-west-2c" @@ -12392,47 +12848,103 @@ "Location": "us-west-2c" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8in.16xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.24xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.2xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.32xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.48xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.4xlarge", "Location": "us-west-2c" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8in.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "mac1.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "mac2-m1ultra.metal", "Location": "us-west-2c" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "mac2-m2.metal", "Location": "us-west-2c" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2c" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "us-west-2c" }, { @@ -13535,6 +14047,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-west-2c" @@ -13587,6 +14143,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "t1.micro", "Location": "us-west-2c" @@ -16319,6 +16919,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-west-2d" @@ -16371,6 +17015,74 @@ "InstanceType": "m8id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m8in.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "mac-m4.metal", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index 5e29012826c5..067ace83cc57 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json @@ -1067,6 +1067,30 @@ "InstanceType": "c8in.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8ine.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1" @@ -2783,18 +2807,6 @@ "InstanceType": "mac1.metal", "Location": "ap-northeast-1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-northeast-1" - }, { "InstanceType": "p3dn.24xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 52e6a2c1dbfb..c4d2e42af7b1 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -1875,18 +1875,6 @@ "InstanceType": "mac1.metal", "Location": "ap-northeast-2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-northeast-2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-northeast-2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-northeast-2" - }, { "InstanceType": "p4d.24xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index a2ab86faa4b5..b72a022899f4 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json @@ -839,6 +839,38 @@ "InstanceType": "g6.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "g6f.2xlarge", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index a00d8c1da0a9..d24913495b51 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json @@ -2179,18 +2179,6 @@ "InstanceType": "mac2.metal", "Location": "ap-southeast-1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-southeast-1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-southeast-1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-southeast-1" - }, { "InstanceType": "p4de.24xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index f241f979419e..2740ab0b248d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json @@ -919,18 +919,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-southeast-2" }, - { - "InstanceType": "f1.16xlarge", - "Location": "ap-southeast-2" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "ap-southeast-2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "ap-southeast-2" - }, { "InstanceType": "f2.12xlarge", "Location": "ap-southeast-2" @@ -2351,18 +2339,6 @@ "InstanceType": "mac2-m2pro.metal", "Location": "ap-southeast-2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ap-southeast-2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ap-southeast-2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ap-southeast-2" - }, { "InstanceType": "p4d.24xlarge", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json index 91515cbada83..71d2d8a0016b 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json @@ -2003,18 +2003,6 @@ "InstanceType": "mac2-m2.metal", "Location": "ca-central-1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "ca-central-1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "ca-central-1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "ca-central-1" - }, { "InstanceType": "p4d.24xlarge", "Location": "ca-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 20bee4d3635c..98491c06651d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json @@ -1063,14 +1063,6 @@ "InstanceType": "dl2q.24xlarge", "Location": "eu-central-1" }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-central-1" - }, { "InstanceType": "f2.12xlarge", "Location": "eu-central-1" @@ -2711,18 +2703,6 @@ "InstanceType": "mac2-m2.metal", "Location": "eu-central-1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-central-1" - }, { "InstanceType": "p4d.24xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 45d709f2e5c5..cb6e10aa92a4 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -1051,18 +1051,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1" }, - { - "InstanceType": "f1.16xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-1" - }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-1" @@ -2583,18 +2571,6 @@ "InstanceType": "mac2.metal", "Location": "eu-west-1" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-1" - }, { "InstanceType": "p3dn.24xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index b6bd17d1c201..e97be256ce41 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -859,14 +859,6 @@ "InstanceType": "d3.xlarge", "Location": "eu-west-2" }, - { - "InstanceType": "f1.2xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "eu-west-2" - }, { "InstanceType": "f2.12xlarge", "Location": "eu-west-2" @@ -2095,18 +2087,6 @@ "InstanceType": "mac1.metal", "Location": "eu-west-2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-2" - }, { "InstanceType": "p4d.24xlarge", "Location": "eu-west-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index 33e0f4171ec4..e367e573593d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json @@ -1207,6 +1207,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-east-1" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1" @@ -1267,18 +1291,6 @@ "InstanceType": "dl1.24xlarge", "Location": "us-east-1" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1" @@ -3059,6 +3071,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-east-1" @@ -3112,47 +3168,103 @@ "Location": "us-east-1" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8in.16xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.24xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.2xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.32xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.48xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.4xlarge", "Location": "us-east-1" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8in.large", + "Location": "us-east-1" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m8ine.large", "Location": "us-east-1" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8ine.xlarge", "Location": "us-east-1" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac-m4.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "mac1.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "mac2-m2pro.metal", "Location": "us-east-1" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "us-east-1" }, { @@ -4271,6 +4383,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-1" @@ -4323,6 +4479,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "t1.micro", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index 292ac6d8f465..d15ff0cb7bed 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json @@ -2747,18 +2747,6 @@ "InstanceType": "mac2.metal", "Location": "us-east-2" }, - { - "InstanceType": "p3.16xlarge", - "Location": "us-east-2" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "us-east-2" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "us-east-2" - }, { "InstanceType": "p4d.24xlarge", "Location": "us-east-2" @@ -3775,6 +3763,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-east-2" @@ -3827,6 +3859,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index fbe642bd6ab2..22e0625b60a5 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json @@ -1183,6 +1183,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-west-2" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2" @@ -1247,18 +1271,6 @@ "InstanceType": "dl2q.24xlarge", "Location": "us-west-2" }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-west-2" - }, { "InstanceType": "f2.12xlarge", "Location": "us-west-2" @@ -3011,6 +3023,50 @@ "InstanceType": "m8i.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "m8ib.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.96xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ib.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "m8id.12xlarge", "Location": "us-west-2" @@ -3064,47 +3120,103 @@ "Location": "us-west-2" }, { - "InstanceType": "mac-m4.metal", + "InstanceType": "m8in.12xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac-m4max.metal", + "InstanceType": "m8in.16xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac-m4pro.metal", + "InstanceType": "m8in.24xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac1.metal", + "InstanceType": "m8in.2xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac2-m1ultra.metal", + "InstanceType": "m8in.32xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac2-m2.metal", + "InstanceType": "m8in.48xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "m8in.4xlarge", "Location": "us-west-2" }, { - "InstanceType": "mac2.metal", + "InstanceType": "m8in.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8in.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m8ine.large", "Location": "us-west-2" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "m8ine.xlarge", "Location": "us-west-2" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "mac-m4.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "mac-m4max.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "mac1.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "mac2.metal", "Location": "us-west-2" }, { @@ -4215,6 +4327,50 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "r8id.12xlarge", "Location": "us-west-2" @@ -4267,6 +4423,50 @@ "InstanceType": "r8id.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "t1.micro", "Location": "us-west-2"