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 f4682f3d8..8565adb08 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 @@ -559,6 +559,10 @@ "InstanceType": "c7gd.medium", "Location": "apne1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "apne1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "apne1-az1" @@ -1699,6 +1703,10 @@ "InstanceType": "m7gd.medium", "Location": "apne1-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "apne1-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "apne1-az1" @@ -2439,6 +2447,10 @@ "InstanceType": "r7gd.medium", "Location": "apne1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "apne1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "apne1-az1" @@ -3291,6 +3303,10 @@ "InstanceType": "c7gd.medium", "Location": "apne1-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "apne1-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "apne1-az2" @@ -4287,6 +4303,10 @@ "InstanceType": "m7gd.medium", "Location": "apne1-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "apne1-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "apne1-az2" @@ -4947,6 +4967,10 @@ "InstanceType": "r7gd.medium", "Location": "apne1-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "apne1-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "apne1-az2" @@ -5783,6 +5807,10 @@ "InstanceType": "c7gd.medium", "Location": "apne1-az4" }, + { + "InstanceType": "c7gd.metal", + "Location": "apne1-az4" + }, { "InstanceType": "c7gd.xlarge", "Location": "apne1-az4" @@ -6915,6 +6943,10 @@ "InstanceType": "m7gd.medium", "Location": "apne1-az4" }, + { + "InstanceType": "m7gd.metal", + "Location": "apne1-az4" + }, { "InstanceType": "m7gd.xlarge", "Location": "apne1-az4" @@ -7695,6 +7727,10 @@ "InstanceType": "r7gd.medium", "Location": "apne1-az4" }, + { + "InstanceType": "r7gd.metal", + "Location": "apne1-az4" + }, { "InstanceType": "r7gd.xlarge", "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 e910111e1..699f80d67 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 @@ -4967,6 +4967,10 @@ "InstanceType": "t4g.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "u-24tb1.112xlarge", "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 39bc94b30..84957962a 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 @@ -443,6 +443,10 @@ "InstanceType": "c7gd.medium", "Location": "aps1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "aps1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "aps1-az1" @@ -1175,6 +1179,10 @@ "InstanceType": "m7gd.medium", "Location": "aps1-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "aps1-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "aps1-az1" @@ -1735,6 +1743,10 @@ "InstanceType": "r7gd.medium", "Location": "aps1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "aps1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "aps1-az1" @@ -2459,6 +2471,10 @@ "InstanceType": "c7gd.medium", "Location": "aps1-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "aps1-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "aps1-az2" @@ -3103,6 +3119,10 @@ "InstanceType": "m7gd.medium", "Location": "aps1-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "aps1-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "aps1-az2" @@ -3607,6 +3627,10 @@ "InstanceType": "r7gd.medium", "Location": "aps1-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "aps1-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "aps1-az2" @@ -4243,6 +4267,10 @@ "InstanceType": "c7gd.medium", "Location": "aps1-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "aps1-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "aps1-az3" @@ -4951,6 +4979,10 @@ "InstanceType": "m7gd.medium", "Location": "aps1-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "aps1-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "aps1-az3" @@ -5507,6 +5539,10 @@ "InstanceType": "r7gd.medium", "Location": "aps1-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "aps1-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json index 174d6bf0b..b7f31c8bc 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json @@ -147,6 +147,46 @@ "InstanceType": "c6i.xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "aps2-az1" @@ -983,6 +1023,46 @@ "InstanceType": "c6i.xlarge", "Location": "aps2-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "aps2-az2" + }, { "InstanceType": "c7g.12xlarge", "Location": "aps2-az2" @@ -1815,6 +1895,46 @@ "InstanceType": "c6i.xlarge", "Location": "aps2-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "aps2-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "aps2-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 3d80ea509..b5b2ab37c 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 @@ -535,6 +535,10 @@ "InstanceType": "c7gd.medium", "Location": "apse1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "apse1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "apse1-az1" @@ -1555,6 +1559,10 @@ "InstanceType": "m7gd.medium", "Location": "apse1-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "apse1-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "apse1-az1" @@ -2283,6 +2291,10 @@ "InstanceType": "r7gd.medium", "Location": "apse1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "apse1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "apse1-az1" @@ -3143,6 +3155,10 @@ "InstanceType": "c7gd.medium", "Location": "apse1-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "apse1-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "apse1-az2" @@ -4159,6 +4175,10 @@ "InstanceType": "m7gd.medium", "Location": "apse1-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "apse1-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "apse1-az2" @@ -4887,6 +4907,10 @@ "InstanceType": "r7gd.medium", "Location": "apse1-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "apse1-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "apse1-az2" @@ -5695,6 +5719,10 @@ "InstanceType": "c7gd.medium", "Location": "apse1-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "apse1-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "apse1-az3" @@ -6555,6 +6583,10 @@ "InstanceType": "m7gd.medium", "Location": "apse1-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "apse1-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "apse1-az3" @@ -7187,6 +7219,10 @@ "InstanceType": "r7gd.medium", "Location": "apse1-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "apse1-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "apse1-az3" 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 053248f1b..dcc5efdbe 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 @@ -567,6 +567,10 @@ "InstanceType": "c7gd.medium", "Location": "apse2-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "apse2-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "apse2-az1" @@ -1491,6 +1495,10 @@ "InstanceType": "m7gd.medium", "Location": "apse2-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "apse2-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "apse2-az1" @@ -2143,6 +2151,10 @@ "InstanceType": "r7gd.medium", "Location": "apse2-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "apse2-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "apse2-az1" @@ -2991,6 +3003,10 @@ "InstanceType": "c7gd.medium", "Location": "apse2-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "apse2-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "apse2-az2" @@ -3855,6 +3871,10 @@ "InstanceType": "m7gd.medium", "Location": "apse2-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "apse2-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "apse2-az2" @@ -4483,6 +4503,10 @@ "InstanceType": "r7gd.medium", "Location": "apse2-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "apse2-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "apse2-az2" @@ -5307,6 +5331,10 @@ "InstanceType": "c7gd.medium", "Location": "apse2-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "apse2-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "apse2-az3" @@ -6155,6 +6183,10 @@ "InstanceType": "m7gd.medium", "Location": "apse2-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "apse2-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "apse2-az3" @@ -6783,6 +6815,10 @@ "InstanceType": "r7gd.medium", "Location": "apse2-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "apse2-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "apse2-az3" 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 fc8e17aa4..0c3b9abcb 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 @@ -563,6 +563,10 @@ "InstanceType": "c7gd.medium", "Location": "euc1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "euc1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "euc1-az1" @@ -2199,6 +2203,10 @@ "InstanceType": "r7gd.medium", "Location": "euc1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "euc1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "euc1-az1" @@ -3995,6 +4003,42 @@ "InstanceType": "m7g.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "euc1-az2" @@ -5551,6 +5595,10 @@ "InstanceType": "c7gd.medium", "Location": "euc1-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "euc1-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "euc1-az3" @@ -7347,6 +7395,10 @@ "InstanceType": "r7gd.medium", "Location": "euc1-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "euc1-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index f34cfb8d5..f89d86d21 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json @@ -427,6 +427,10 @@ "InstanceType": "c7gd.medium", "Location": "eun1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "eun1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "eun1-az1" @@ -963,6 +967,10 @@ "InstanceType": "m7gd.medium", "Location": "eun1-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "eun1-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "eun1-az1" @@ -1447,6 +1455,10 @@ "InstanceType": "r7gd.medium", "Location": "eun1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "eun1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "eun1-az1" @@ -2039,6 +2051,10 @@ "InstanceType": "c7gd.medium", "Location": "eun1-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "eun1-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "eun1-az2" @@ -2615,6 +2631,10 @@ "InstanceType": "m7gd.medium", "Location": "eun1-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "eun1-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "eun1-az2" @@ -3171,6 +3191,10 @@ "InstanceType": "r7gd.medium", "Location": "eun1-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "eun1-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "eun1-az2" @@ -3759,6 +3783,10 @@ "InstanceType": "c7gd.medium", "Location": "eun1-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "eun1-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "eun1-az3" @@ -4327,6 +4355,10 @@ "InstanceType": "m7gd.medium", "Location": "eun1-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "eun1-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "eun1-az3" @@ -4847,6 +4879,10 @@ "InstanceType": "r7gd.medium", "Location": "eun1-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "eun1-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "eun1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json index 851a67cab..24e63aee2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json @@ -259,6 +259,10 @@ "InstanceType": "c7gd.medium", "Location": "eus2-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "eus2-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "eus2-az1" @@ -675,6 +679,10 @@ "InstanceType": "m7gd.medium", "Location": "eus2-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "eus2-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "eus2-az1" @@ -963,6 +971,10 @@ "InstanceType": "r7gd.medium", "Location": "eus2-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "eus2-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "eus2-az1" @@ -1383,6 +1395,10 @@ "InstanceType": "c7gd.medium", "Location": "eus2-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "eus2-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "eus2-az2" @@ -1775,6 +1791,10 @@ "InstanceType": "m7gd.medium", "Location": "eus2-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "eus2-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "eus2-az2" @@ -2063,6 +2083,10 @@ "InstanceType": "r7gd.medium", "Location": "eus2-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "eus2-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "eus2-az2" @@ -2483,6 +2507,10 @@ "InstanceType": "c7gd.medium", "Location": "eus2-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "eus2-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "eus2-az3" @@ -2875,6 +2903,10 @@ "InstanceType": "m7gd.medium", "Location": "eus2-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "eus2-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "eus2-az3" @@ -3163,6 +3195,10 @@ "InstanceType": "r7gd.medium", "Location": "eus2-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "eus2-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "eus2-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 6a11c7ff2..35c15b92f 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 @@ -615,6 +615,10 @@ "InstanceType": "c7gd.medium", "Location": "euw1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "euw1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "euw1-az1" @@ -1795,6 +1799,10 @@ "InstanceType": "m7gd.medium", "Location": "euw1-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "euw1-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "euw1-az1" @@ -2563,6 +2571,10 @@ "InstanceType": "r7gd.medium", "Location": "euw1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "euw1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "euw1-az1" @@ -3587,6 +3599,10 @@ "InstanceType": "c7gd.medium", "Location": "euw1-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "euw1-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "euw1-az2" @@ -4755,6 +4771,10 @@ "InstanceType": "m7gd.medium", "Location": "euw1-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "euw1-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "euw1-az2" @@ -5539,6 +5559,10 @@ "InstanceType": "r7gd.medium", "Location": "euw1-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "euw1-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "euw1-az2" @@ -6539,6 +6563,10 @@ "InstanceType": "c7gd.medium", "Location": "euw1-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "euw1-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "euw1-az3" @@ -7691,6 +7719,10 @@ "InstanceType": "m7gd.medium", "Location": "euw1-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "euw1-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "euw1-az3" @@ -8459,6 +8491,10 @@ "InstanceType": "r7gd.medium", "Location": "euw1-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "euw1-az3" + }, { "InstanceType": "r7gd.xlarge", "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 e5f762c45..02faf199d 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 @@ -455,6 +455,50 @@ "InstanceType": "c7g.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euw2-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index 2c9fabfcf..5970424e4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json @@ -1203,6 +1203,50 @@ "InstanceType": "r6i.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euw3-az1" @@ -2091,6 +2135,42 @@ "InstanceType": "m6i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.metal", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "euw3-az2" @@ -2499,6 +2579,50 @@ "InstanceType": "r6i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euw3-az2" @@ -3471,6 +3595,42 @@ "InstanceType": "m7g.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.metal", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "euw3-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 3b5a8a574..0e3899fd9 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 @@ -3255,6 +3255,10 @@ "InstanceType": "c7gd.medium", "Location": "use1-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "use1-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "use1-az2" @@ -5235,6 +5239,10 @@ "InstanceType": "r7gd.medium", "Location": "use1-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "use1-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "use1-az2" @@ -6515,6 +6523,10 @@ "InstanceType": "c7gd.medium", "Location": "use1-az4" }, + { + "InstanceType": "c7gd.metal", + "Location": "use1-az4" + }, { "InstanceType": "c7gd.xlarge", "Location": "use1-az4" @@ -8487,6 +8499,10 @@ "InstanceType": "r7gd.medium", "Location": "use1-az4" }, + { + "InstanceType": "r7gd.metal", + "Location": "use1-az4" + }, { "InstanceType": "r7gd.xlarge", "Location": "use1-az4" @@ -9439,6 +9455,10 @@ "InstanceType": "c7gd.medium", "Location": "use1-az5" }, + { + "InstanceType": "c7gd.metal", + "Location": "use1-az5" + }, { "InstanceType": "c7gd.xlarge", "Location": "use1-az5" @@ -11123,6 +11143,10 @@ "InstanceType": "r7gd.medium", "Location": "use1-az5" }, + { + "InstanceType": "r7gd.metal", + "Location": "use1-az5" + }, { "InstanceType": "r7gd.xlarge", "Location": "use1-az5" @@ -12071,6 +12095,10 @@ "InstanceType": "c7gd.medium", "Location": "use1-az6" }, + { + "InstanceType": "c7gd.metal", + "Location": "use1-az6" + }, { "InstanceType": "c7gd.xlarge", "Location": "use1-az6" @@ -14075,6 +14103,10 @@ "InstanceType": "r7gd.medium", "Location": "use1-az6" }, + { + "InstanceType": "r7gd.metal", + "Location": "use1-az6" + }, { "InstanceType": "r7gd.xlarge", "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 c1d6e1ef5..2d1ac45cc 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 @@ -587,6 +587,10 @@ "InstanceType": "c7gd.medium", "Location": "use2-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "use2-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "use2-az1" @@ -1679,6 +1683,10 @@ "InstanceType": "m7gd.medium", "Location": "use2-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "use2-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "use2-az1" @@ -2459,6 +2467,10 @@ "InstanceType": "r7gd.medium", "Location": "use2-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "use2-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "use2-az1" @@ -3411,6 +3423,10 @@ "InstanceType": "c7gd.medium", "Location": "use2-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "use2-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "use2-az2" @@ -4527,6 +4543,10 @@ "InstanceType": "m7gd.medium", "Location": "use2-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "use2-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "use2-az2" @@ -5319,6 +5339,10 @@ "InstanceType": "r7gd.medium", "Location": "use2-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "use2-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "use2-az2" @@ -6215,6 +6239,10 @@ "InstanceType": "c7gd.medium", "Location": "use2-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "use2-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "use2-az3" @@ -7307,6 +7335,10 @@ "InstanceType": "m7gd.medium", "Location": "use2-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "use2-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "use2-az3" @@ -8079,6 +8111,10 @@ "InstanceType": "r7gd.medium", "Location": "use2-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "use2-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json index e7cdf595d..eef46a553 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json @@ -471,6 +471,10 @@ "InstanceType": "c7gd.medium", "Location": "usw1-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "usw1-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "usw1-az1" @@ -1239,6 +1243,10 @@ "InstanceType": "m7gd.medium", "Location": "usw1-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "usw1-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "usw1-az1" @@ -1743,6 +1751,10 @@ "InstanceType": "r7gd.medium", "Location": "usw1-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "usw1-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "usw1-az1" @@ -2455,6 +2467,10 @@ "InstanceType": "c7gd.medium", "Location": "usw1-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "usw1-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "usw1-az3" @@ -3223,6 +3239,10 @@ "InstanceType": "m7gd.medium", "Location": "usw1-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "usw1-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "usw1-az3" @@ -3727,6 +3747,10 @@ "InstanceType": "r7gd.medium", "Location": "usw1-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "usw1-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "usw1-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 e2ac85c10..c933b5248 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 @@ -591,6 +591,10 @@ "InstanceType": "c7gd.medium", "Location": "usw2-az1" }, + { + "InstanceType": "c7gd.metal", + "Location": "usw2-az1" + }, { "InstanceType": "c7gd.xlarge", "Location": "usw2-az1" @@ -1791,6 +1795,10 @@ "InstanceType": "m7gd.medium", "Location": "usw2-az1" }, + { + "InstanceType": "m7gd.metal", + "Location": "usw2-az1" + }, { "InstanceType": "m7gd.xlarge", "Location": "usw2-az1" @@ -2587,6 +2595,10 @@ "InstanceType": "r7gd.medium", "Location": "usw2-az1" }, + { + "InstanceType": "r7gd.metal", + "Location": "usw2-az1" + }, { "InstanceType": "r7gd.xlarge", "Location": "usw2-az1" @@ -3575,6 +3587,10 @@ "InstanceType": "c7gd.medium", "Location": "usw2-az2" }, + { + "InstanceType": "c7gd.metal", + "Location": "usw2-az2" + }, { "InstanceType": "c7gd.xlarge", "Location": "usw2-az2" @@ -4755,6 +4771,10 @@ "InstanceType": "m7gd.medium", "Location": "usw2-az2" }, + { + "InstanceType": "m7gd.metal", + "Location": "usw2-az2" + }, { "InstanceType": "m7gd.xlarge", "Location": "usw2-az2" @@ -5539,6 +5559,10 @@ "InstanceType": "r7gd.medium", "Location": "usw2-az2" }, + { + "InstanceType": "r7gd.metal", + "Location": "usw2-az2" + }, { "InstanceType": "r7gd.xlarge", "Location": "usw2-az2" @@ -6479,6 +6503,10 @@ "InstanceType": "c7gd.medium", "Location": "usw2-az3" }, + { + "InstanceType": "c7gd.metal", + "Location": "usw2-az3" + }, { "InstanceType": "c7gd.xlarge", "Location": "usw2-az3" @@ -7675,6 +7703,10 @@ "InstanceType": "m7gd.medium", "Location": "usw2-az3" }, + { + "InstanceType": "m7gd.metal", + "Location": "usw2-az3" + }, { "InstanceType": "m7gd.xlarge", "Location": "usw2-az3" @@ -8467,6 +8499,10 @@ "InstanceType": "r7gd.medium", "Location": "usw2-az3" }, + { + "InstanceType": "r7gd.metal", + "Location": "usw2-az3" + }, { "InstanceType": "r7gd.xlarge", "Location": "usw2-az3" @@ -9367,6 +9403,10 @@ "InstanceType": "c7gd.medium", "Location": "usw2-az4" }, + { + "InstanceType": "c7gd.metal", + "Location": "usw2-az4" + }, { "InstanceType": "c7gd.xlarge", "Location": "usw2-az4" @@ -10103,6 +10143,10 @@ "InstanceType": "m7gd.medium", "Location": "usw2-az4" }, + { + "InstanceType": "m7gd.metal", + "Location": "usw2-az4" + }, { "InstanceType": "m7gd.xlarge", "Location": "usw2-az4" @@ -10655,6 +10699,10 @@ "InstanceType": "r7gd.medium", "Location": "usw2-az4" }, + { + "InstanceType": "r7gd.metal", + "Location": "usw2-az4" + }, { "InstanceType": "r7gd.xlarge", "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 9f8fd28de..d2964041c 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 @@ -583,6 +583,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1a" @@ -1715,6 +1719,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1a" @@ -2495,6 +2503,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1a" @@ -3423,6 +3435,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1c" @@ -4563,6 +4579,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1c" @@ -5303,6 +5323,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1c" @@ -6155,6 +6179,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1d" @@ -7151,6 +7179,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1d" @@ -7811,6 +7843,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r7gd.xlarge", "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 b08ed0dea..16e76f8b2 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 @@ -4967,6 +4967,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "u-24tb1.112xlarge", "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 fce71cfb4..a730dc8e7 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 @@ -443,6 +443,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-south-1a" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-south-1a" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-south-1a" @@ -1175,6 +1179,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-south-1a" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-south-1a" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-south-1a" @@ -1735,6 +1743,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-south-1a" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-south-1a" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-south-1a" @@ -2479,6 +2491,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-south-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-south-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-south-1b" @@ -3187,6 +3203,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-south-1b" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-south-1b" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-south-1b" @@ -3743,6 +3763,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-south-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-south-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-south-1b" @@ -4471,6 +4495,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-south-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-south-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-south-1c" @@ -5115,6 +5143,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-south-1c" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-south-1c" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-south-1c" @@ -5619,6 +5651,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-south-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-south-1c" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json index 023abc4fe..4c49da563 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json @@ -147,6 +147,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "c7g.12xlarge", "Location": "ap-south-2a" @@ -983,6 +1023,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-south-2b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-south-2b" + }, { "InstanceType": "c7g.12xlarge", "Location": "ap-south-2b" @@ -1815,6 +1895,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-south-2c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-south-2c" + }, { "InstanceType": "c7g.12xlarge", "Location": "ap-south-2c" 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 554a1a3ed..3fcdb786d 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 @@ -567,6 +567,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1a" @@ -1583,6 +1587,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1a" @@ -2311,6 +2319,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1a" @@ -3139,6 +3151,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1b" @@ -4159,6 +4175,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1b" @@ -4887,6 +4907,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1b" @@ -5695,6 +5719,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1c" @@ -6555,6 +6583,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-1c" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-1c" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1c" @@ -7187,6 +7219,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-1c" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1c" 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 95cbad592..ee3353dc7 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 @@ -543,6 +543,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-2a" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-2a" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2a" @@ -1391,6 +1395,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-2a" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-2a" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2a" @@ -2019,6 +2027,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-2a" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2a" @@ -2843,6 +2855,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-2b" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-2b" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2b" @@ -3767,6 +3783,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-2b" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2b" @@ -4419,6 +4439,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-2b" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2b" @@ -5267,6 +5291,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-2c" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-2c" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2c" @@ -6131,6 +6159,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-2c" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-2c" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2c" @@ -6759,6 +6791,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-2c" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2c" 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 6abf1b945..d31bddb9c 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 @@ -1467,6 +1467,42 @@ "InstanceType": "m7g.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-central-1a" @@ -3023,6 +3059,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-central-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-central-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-central-1b" @@ -4819,6 +4859,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-central-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-central-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-central-1b" @@ -5711,6 +5755,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-central-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-central-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-central-1c" @@ -7347,6 +7395,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-central-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-central-1c" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index 0d59b3e61..d1f143a7f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json @@ -427,6 +427,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-north-1a" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-north-1a" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-north-1a" @@ -963,6 +967,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-north-1a" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-north-1a" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-north-1a" @@ -1447,6 +1455,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-north-1a" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-north-1a" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-north-1a" @@ -2039,6 +2051,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-north-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-north-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-north-1b" @@ -2615,6 +2631,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-north-1b" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-north-1b" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-north-1b" @@ -3171,6 +3191,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-north-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-north-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-north-1b" @@ -3759,6 +3783,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-north-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-north-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-north-1c" @@ -4327,6 +4355,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-north-1c" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-north-1c" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-north-1c" @@ -4847,6 +4879,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-north-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-north-1c" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-north-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json index a719dcbef..f14a3ca74 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json @@ -259,6 +259,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-south-2a" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-south-2a" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-south-2a" @@ -675,6 +679,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-south-2a" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-south-2a" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-south-2a" @@ -963,6 +971,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-south-2a" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-south-2a" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-south-2a" @@ -1383,6 +1395,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-south-2b" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-south-2b" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-south-2b" @@ -1775,6 +1791,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-south-2b" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-south-2b" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-south-2b" @@ -2063,6 +2083,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-south-2b" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-south-2b" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-south-2b" @@ -2483,6 +2507,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-south-2c" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-south-2c" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-south-2c" @@ -2875,6 +2903,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-south-2c" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-south-2c" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-south-2c" @@ -3163,6 +3195,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-south-2c" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-south-2c" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-south-2c" 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 347903267..aaa986807 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 @@ -615,6 +615,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-west-1a" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-west-1a" @@ -1795,6 +1799,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-west-1a" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-west-1a" @@ -2563,6 +2571,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-west-1a" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-west-1a" @@ -3587,6 +3599,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-west-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-west-1b" @@ -4755,6 +4771,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-west-1b" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-west-1b" @@ -5539,6 +5559,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-west-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-west-1b" @@ -6539,6 +6563,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-west-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-west-1c" @@ -7691,6 +7719,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-west-1c" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-west-1c" @@ -8459,6 +8491,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-west-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "r7gd.xlarge", "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 be9d1c457..b496edd93 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 @@ -4119,6 +4119,50 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json index 27bb17c73..4b37de384 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json @@ -1203,6 +1203,50 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-3a" @@ -2091,6 +2135,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-west-3b" @@ -2499,6 +2579,50 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-3b" @@ -3471,6 +3595,42 @@ "InstanceType": "m7g.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-west-3c" 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 5b72d317e..fa8c05842 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 @@ -3255,6 +3255,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-1b" @@ -5235,6 +5239,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-1b" @@ -6259,6 +6267,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-1c" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-1c" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-1c" @@ -8231,6 +8243,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-1c" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-1c" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-1c" @@ -9247,6 +9263,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-1d" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-1d" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-1d" @@ -11251,6 +11271,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-1d" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-1d" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-1d" @@ -12471,6 +12495,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-1f" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-1f" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-1f" @@ -14155,6 +14183,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-1f" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-1f" + }, { "InstanceType": "r7gd.xlarge", "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 92708a3c2..0983bfe5c 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 @@ -587,6 +587,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-2a" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-2a" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-2a" @@ -1679,6 +1683,10 @@ "InstanceType": "m7gd.medium", "Location": "us-east-2a" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-east-2a" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-east-2a" @@ -2459,6 +2467,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-2a" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-2a" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-2a" @@ -3411,6 +3423,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-2b" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-2b" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-2b" @@ -4527,6 +4543,10 @@ "InstanceType": "m7gd.medium", "Location": "us-east-2b" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-east-2b" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-east-2b" @@ -5319,6 +5339,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-2b" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-2b" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-2b" @@ -6215,6 +6239,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-2c" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-2c" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-2c" @@ -7307,6 +7335,10 @@ "InstanceType": "m7gd.medium", "Location": "us-east-2c" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-east-2c" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-east-2c" @@ -8079,6 +8111,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-2c" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-2c" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json index d799e42d4..21ddbda08 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json @@ -471,6 +471,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-1a" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-1a" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-1a" @@ -1239,6 +1243,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-1a" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-1a" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-1a" @@ -1743,6 +1751,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-1a" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-1a" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-1a" @@ -2455,6 +2467,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-1b" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-1b" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-1b" @@ -3223,6 +3239,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-1b" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-1b" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-1b" @@ -3727,6 +3747,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-1b" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-1b" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-1b" 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 ae234ee63..12efeb32d 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 @@ -591,6 +591,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-2a" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-2a" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-2a" @@ -1791,6 +1795,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-2a" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-2a" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-2a" @@ -2587,6 +2595,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-2a" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-2a" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-2a" @@ -3575,6 +3587,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-2b" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-2b" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-2b" @@ -4755,6 +4771,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-2b" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-2b" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-2b" @@ -5539,6 +5559,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-2b" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-2b" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-2b" @@ -6479,6 +6503,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-2c" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-2c" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-2c" @@ -7675,6 +7703,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-2c" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-2c" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-2c" @@ -8467,6 +8499,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-2c" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-2c" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-2c" @@ -9367,6 +9403,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-2d" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-2d" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-2d" @@ -10103,6 +10143,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-2d" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-2d" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-2d" @@ -10655,6 +10699,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-2d" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-2d" + }, { "InstanceType": "r7gd.xlarge", "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 c29e167c1..afc617334 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 @@ -583,6 +583,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-northeast-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1" @@ -1739,6 +1743,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-northeast-1" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1" @@ -2519,6 +2527,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-northeast-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1" 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 755d31c00..4ba3d1637 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 @@ -467,6 +467,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-south-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-south-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-south-1" @@ -1199,6 +1203,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-south-1" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-south-1" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-south-1" @@ -1759,6 +1767,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-south-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-south-1" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json index e97eaf335..bbb0e4195 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json @@ -147,6 +147,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "c7g.12xlarge", "Location": "ap-south-2" 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 aa4e49d89..81e0e6e48 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 @@ -567,6 +567,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1" @@ -1603,6 +1607,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-1" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1" @@ -2331,6 +2339,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "r7gd.xlarge", "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 7821ea37b..68bd4f793 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 @@ -567,6 +567,10 @@ "InstanceType": "c7gd.medium", "Location": "ap-southeast-2" }, + { + "InstanceType": "c7gd.metal", + "Location": "ap-southeast-2" + }, { "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2" @@ -1491,6 +1495,10 @@ "InstanceType": "m7gd.medium", "Location": "ap-southeast-2" }, + { + "InstanceType": "m7gd.metal", + "Location": "ap-southeast-2" + }, { "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2" @@ -2143,6 +2151,10 @@ "InstanceType": "r7gd.medium", "Location": "ap-southeast-2" }, + { + "InstanceType": "r7gd.metal", + "Location": "ap-southeast-2" + }, { "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2" 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 bfba64232..5db8cb539 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 @@ -607,6 +607,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-central-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-central-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-central-1" @@ -2439,6 +2443,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-central-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-central-1" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index b0c29603d..e73bb7322 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -427,6 +427,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-north-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-north-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-north-1" @@ -1019,6 +1023,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-north-1" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-north-1" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-north-1" @@ -1579,6 +1587,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-north-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-north-1" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json index c13ff5e4c..c6c49d5a4 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json @@ -259,6 +259,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-south-2" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-south-2" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-south-2" @@ -675,6 +679,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-south-2" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-south-2" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-south-2" @@ -963,6 +971,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-south-2" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-south-2" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-south-2" 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 d6af8f55f..b764423ed 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 @@ -615,6 +615,10 @@ "InstanceType": "c7gd.medium", "Location": "eu-west-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "eu-west-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "eu-west-1" @@ -1811,6 +1815,10 @@ "InstanceType": "m7gd.medium", "Location": "eu-west-1" }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-1" + }, { "InstanceType": "m7gd.xlarge", "Location": "eu-west-1" @@ -2595,6 +2603,10 @@ "InstanceType": "r7gd.medium", "Location": "eu-west-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-1" + }, { "InstanceType": "r7gd.xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json index 6d94c29b4..743117d03 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json @@ -795,6 +795,42 @@ "InstanceType": "m7g.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.metal", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-west-3" @@ -1203,6 +1239,50 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-3" 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 32028bf0b..2a6e5b52c 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 @@ -615,6 +615,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-1" @@ -2627,6 +2631,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-1" + }, { "InstanceType": "r7gd.xlarge", "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 bcb7d751b..2469ff2c5 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 @@ -587,6 +587,10 @@ "InstanceType": "c7gd.medium", "Location": "us-east-2" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-east-2" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-east-2" @@ -1703,6 +1707,10 @@ "InstanceType": "m7gd.medium", "Location": "us-east-2" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-east-2" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-east-2" @@ -2495,6 +2503,10 @@ "InstanceType": "r7gd.medium", "Location": "us-east-2" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-east-2" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index 5cac74cf3..ea38afb5b 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json @@ -471,6 +471,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-1" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-1" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-1" @@ -1239,6 +1243,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-1" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-1" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-1" @@ -1743,6 +1751,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-1" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-1" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-1" 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 d70e09554..57e14a706 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 @@ -615,6 +615,10 @@ "InstanceType": "c7gd.medium", "Location": "us-west-2" }, + { + "InstanceType": "c7gd.metal", + "Location": "us-west-2" + }, { "InstanceType": "c7gd.xlarge", "Location": "us-west-2" @@ -1819,6 +1823,10 @@ "InstanceType": "m7gd.medium", "Location": "us-west-2" }, + { + "InstanceType": "m7gd.metal", + "Location": "us-west-2" + }, { "InstanceType": "m7gd.xlarge", "Location": "us-west-2" @@ -2615,6 +2623,10 @@ "InstanceType": "r7gd.medium", "Location": "us-west-2" }, + { + "InstanceType": "r7gd.metal", + "Location": "us-west-2" + }, { "InstanceType": "r7gd.xlarge", "Location": "us-west-2"