From 182b2602caf0111ccd93e5555e0b2343f3e9ccb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:19:27 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#6989) --- .../availability-zone-id/eu-north-1.json | 64 +++++++++ .../availability-zone-id/eu-south-2.json | 64 +++++++++ .../availability-zone-id/eu-west-1.json | 72 ++++++++++ .../availability-zone-id/me-central-1.json | 4 + .../availability-zone-id/us-east-1.json | 128 ++++++++++++++++++ .../availability-zone-id/us-east-2.json | 76 +++++++++++ .../availability-zone-id/us-west-2.json | 120 ++++++++++++++++ .../availability-zone/eu-north-1.json | 64 +++++++++ .../availability-zone/eu-south-2.json | 64 +++++++++ .../availability-zone/eu-west-1.json | 72 ++++++++++ .../availability-zone/me-central-1.json | 4 + .../availability-zone/us-east-1.json | 128 ++++++++++++++++++ .../availability-zone/us-east-2.json | 76 +++++++++++ .../availability-zone/us-west-2.json | 120 ++++++++++++++++ .../region/eu-north-1.json | 24 ++++ .../region/eu-south-2.json | 24 ++++ .../region/eu-west-1.json | 24 ++++ .../region/me-central-1.json | 4 + .../region/us-east-1.json | 32 +++++ .../region/us-east-2.json | 24 ++++ .../region/us-west-2.json | 32 +++++ 21 files changed, 1220 insertions(+) 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 ef3cb4557..5245e575f 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 @@ -347,6 +347,14 @@ "InstanceType": "c7i.large", "Location": "eun1-az1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eun1-az1" + }, { "InstanceType": "c7i.xlarge", "Location": "eun1-az1" @@ -863,6 +871,14 @@ "InstanceType": "m7i.large", "Location": "eun1-az1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eun1-az1" + }, { "InstanceType": "m7i.xlarge", "Location": "eun1-az1" @@ -1159,6 +1175,14 @@ "InstanceType": "r7i.large", "Location": "eun1-az1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eun1-az1" + }, { "InstanceType": "r7i.xlarge", "Location": "eun1-az1" @@ -1623,6 +1647,14 @@ "InstanceType": "c7i.large", "Location": "eun1-az2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eun1-az2" + }, { "InstanceType": "c7i.xlarge", "Location": "eun1-az2" @@ -2163,6 +2195,14 @@ "InstanceType": "m7i.large", "Location": "eun1-az2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eun1-az2" + }, { "InstanceType": "m7i.xlarge", "Location": "eun1-az2" @@ -2531,6 +2571,14 @@ "InstanceType": "r7i.large", "Location": "eun1-az2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eun1-az2" + }, { "InstanceType": "r7i.xlarge", "Location": "eun1-az2" @@ -3507,6 +3555,14 @@ "InstanceType": "m7i.large", "Location": "eun1-az3" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eun1-az3" + }, { "InstanceType": "m7i.xlarge", "Location": "eun1-az3" @@ -3835,6 +3891,14 @@ "InstanceType": "r7i.large", "Location": "eun1-az3" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eun1-az3" + }, { "InstanceType": "r7i.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 bdb75752f..3820a3317 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 @@ -175,6 +175,14 @@ "InstanceType": "c7i.large", "Location": "eus2-az1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eus2-az1" + }, { "InstanceType": "c7i.xlarge", "Location": "eus2-az1" @@ -491,6 +499,14 @@ "InstanceType": "m7i.large", "Location": "eus2-az1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eus2-az1" + }, { "InstanceType": "m7i.xlarge", "Location": "eus2-az1" @@ -671,6 +687,14 @@ "InstanceType": "r7i.large", "Location": "eus2-az1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eus2-az1" + }, { "InstanceType": "r7i.xlarge", "Location": "eus2-az1" @@ -1179,6 +1203,14 @@ "InstanceType": "m7i.large", "Location": "eus2-az2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eus2-az2" + }, { "InstanceType": "m7i.xlarge", "Location": "eus2-az2" @@ -1359,6 +1391,14 @@ "InstanceType": "r7i.large", "Location": "eus2-az2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eus2-az2" + }, { "InstanceType": "r7i.xlarge", "Location": "eus2-az2" @@ -1611,6 +1651,14 @@ "InstanceType": "c7i.large", "Location": "eus2-az3" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eus2-az3" + }, { "InstanceType": "c7i.xlarge", "Location": "eus2-az3" @@ -1903,6 +1951,14 @@ "InstanceType": "m7i.large", "Location": "eus2-az3" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eus2-az3" + }, { "InstanceType": "m7i.xlarge", "Location": "eus2-az3" @@ -2083,6 +2139,14 @@ "InstanceType": "r7i.large", "Location": "eus2-az3" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eus2-az3" + }, { "InstanceType": "r7i.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 796294cc6..9f875ae60 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 @@ -683,6 +683,14 @@ "InstanceType": "c7i.large", "Location": "euw1-az1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euw1-az1" + }, { "InstanceType": "c7i.xlarge", "Location": "euw1-az1" @@ -1827,6 +1835,14 @@ "InstanceType": "m7i.large", "Location": "euw1-az1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw1-az1" + }, { "InstanceType": "m7i.xlarge", "Location": "euw1-az1" @@ -2567,6 +2583,14 @@ "InstanceType": "r7i.large", "Location": "euw1-az1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw1-az1" + }, { "InstanceType": "r7i.xlarge", "Location": "euw1-az1" @@ -3575,6 +3599,14 @@ "InstanceType": "c7i.large", "Location": "euw1-az2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euw1-az2" + }, { "InstanceType": "c7i.xlarge", "Location": "euw1-az2" @@ -4707,6 +4739,14 @@ "InstanceType": "m7i.large", "Location": "euw1-az2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw1-az2" + }, { "InstanceType": "m7i.xlarge", "Location": "euw1-az2" @@ -5463,6 +5503,14 @@ "InstanceType": "r7i.large", "Location": "euw1-az2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw1-az2" + }, { "InstanceType": "r7i.xlarge", "Location": "euw1-az2" @@ -6447,6 +6495,14 @@ "InstanceType": "c7i.large", "Location": "euw1-az3" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euw1-az3" + }, { "InstanceType": "c7i.xlarge", "Location": "euw1-az3" @@ -7579,6 +7635,14 @@ "InstanceType": "m7i.large", "Location": "euw1-az3" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw1-az3" + }, { "InstanceType": "m7i.xlarge", "Location": "euw1-az3" @@ -8319,6 +8383,14 @@ "InstanceType": "r7i.large", "Location": "euw1-az3" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw1-az3" + }, { "InstanceType": "r7i.xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json index ed70ce266..d9349fa94 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json @@ -827,6 +827,10 @@ "InstanceType": "c6in.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "f1.4xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "g5.12xlarge", "Location": "mec1-az2" 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 2471c2bb9..101817abf 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 @@ -2807,6 +2807,14 @@ "InstanceType": "c7i.large", "Location": "use1-az2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use1-az2" + }, { "InstanceType": "c7i.xlarge", "Location": "use1-az2" @@ -3987,6 +3995,14 @@ "InstanceType": "m7i.large", "Location": "use1-az2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use1-az2" + }, { "InstanceType": "m7i.xlarge", "Location": "use1-az2" @@ -4735,6 +4751,14 @@ "InstanceType": "r7i.large", "Location": "use1-az2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use1-az2" + }, { "InstanceType": "r7i.xlarge", "Location": "use1-az2" @@ -4767,6 +4791,14 @@ "InstanceType": "r7iz.large", "Location": "use1-az2" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use1-az2" + }, { "InstanceType": "r7iz.xlarge", "Location": "use1-az2" @@ -6031,6 +6063,14 @@ "InstanceType": "c7i.large", "Location": "use1-az4" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use1-az4" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use1-az4" + }, { "InstanceType": "c7i.xlarge", "Location": "use1-az4" @@ -7207,6 +7247,14 @@ "InstanceType": "m7i.large", "Location": "use1-az4" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use1-az4" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use1-az4" + }, { "InstanceType": "m7i.xlarge", "Location": "use1-az4" @@ -7947,6 +7995,14 @@ "InstanceType": "r7i.large", "Location": "use1-az4" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use1-az4" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use1-az4" + }, { "InstanceType": "r7i.xlarge", "Location": "use1-az4" @@ -7979,6 +8035,14 @@ "InstanceType": "r7iz.large", "Location": "use1-az4" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use1-az4" + }, { "InstanceType": "r7iz.xlarge", "Location": "use1-az4" @@ -8919,6 +8983,14 @@ "InstanceType": "c7i.large", "Location": "use1-az5" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use1-az5" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use1-az5" + }, { "InstanceType": "c7i.xlarge", "Location": "use1-az5" @@ -9875,6 +9947,14 @@ "InstanceType": "m7i.large", "Location": "use1-az5" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use1-az5" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use1-az5" + }, { "InstanceType": "m7i.xlarge", "Location": "use1-az5" @@ -10551,6 +10631,14 @@ "InstanceType": "r7i.large", "Location": "use1-az5" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use1-az5" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use1-az5" + }, { "InstanceType": "r7i.xlarge", "Location": "use1-az5" @@ -10583,6 +10671,14 @@ "InstanceType": "r7iz.large", "Location": "use1-az5" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use1-az5" + }, { "InstanceType": "r7iz.xlarge", "Location": "use1-az5" @@ -11515,6 +11611,14 @@ "InstanceType": "c7i.large", "Location": "use1-az6" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use1-az6" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use1-az6" + }, { "InstanceType": "c7i.xlarge", "Location": "use1-az6" @@ -12703,6 +12807,14 @@ "InstanceType": "m7i.large", "Location": "use1-az6" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use1-az6" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use1-az6" + }, { "InstanceType": "m7i.xlarge", "Location": "use1-az6" @@ -13463,6 +13575,14 @@ "InstanceType": "r7i.large", "Location": "use1-az6" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use1-az6" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use1-az6" + }, { "InstanceType": "r7i.xlarge", "Location": "use1-az6" @@ -13495,6 +13615,14 @@ "InstanceType": "r7iz.large", "Location": "use1-az6" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use1-az6" + }, { "InstanceType": "r7iz.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 f4c64ef0e..7694a52e4 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 @@ -655,6 +655,14 @@ "InstanceType": "c7i.large", "Location": "use2-az1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use2-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use2-az1" + }, { "InstanceType": "c7i.xlarge", "Location": "use2-az1" @@ -1727,6 +1735,14 @@ "InstanceType": "m7i.large", "Location": "use2-az1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use2-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use2-az1" + }, { "InstanceType": "m7i.xlarge", "Location": "use2-az1" @@ -1759,6 +1775,10 @@ "InstanceType": "p3.8xlarge", "Location": "use2-az1" }, + { + "InstanceType": "p5.48xlarge", + "Location": "use2-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "use2-az1" @@ -2471,6 +2491,14 @@ "InstanceType": "r7i.large", "Location": "use2-az1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use2-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use2-az1" + }, { "InstanceType": "r7i.xlarge", "Location": "use2-az1" @@ -3355,6 +3383,14 @@ "InstanceType": "c7i.large", "Location": "use2-az2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use2-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use2-az2" + }, { "InstanceType": "c7i.xlarge", "Location": "use2-az2" @@ -4451,6 +4487,14 @@ "InstanceType": "m7i.large", "Location": "use2-az2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use2-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use2-az2" + }, { "InstanceType": "m7i.xlarge", "Location": "use2-az2" @@ -5215,6 +5259,14 @@ "InstanceType": "r7i.large", "Location": "use2-az2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use2-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use2-az2" + }, { "InstanceType": "r7i.xlarge", "Location": "use2-az2" @@ -6091,6 +6143,14 @@ "InstanceType": "c7i.large", "Location": "use2-az3" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use2-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use2-az3" + }, { "InstanceType": "c7i.xlarge", "Location": "use2-az3" @@ -7163,6 +7223,14 @@ "InstanceType": "m7i.large", "Location": "use2-az3" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use2-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use2-az3" + }, { "InstanceType": "m7i.xlarge", "Location": "use2-az3" @@ -7907,6 +7975,14 @@ "InstanceType": "r7i.large", "Location": "use2-az3" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use2-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use2-az3" + }, { "InstanceType": "r7i.xlarge", "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 f348063cb..ff1ba8f8e 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 @@ -659,6 +659,14 @@ "InstanceType": "c7i.large", "Location": "usw2-az1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "usw2-az1" + }, { "InstanceType": "c7i.xlarge", "Location": "usw2-az1" @@ -1839,6 +1847,14 @@ "InstanceType": "m7i.large", "Location": "usw2-az1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "usw2-az1" + }, { "InstanceType": "m7i.xlarge", "Location": "usw2-az1" @@ -2599,6 +2615,14 @@ "InstanceType": "r7i.large", "Location": "usw2-az1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "usw2-az1" + }, { "InstanceType": "r7i.xlarge", "Location": "usw2-az1" @@ -2631,6 +2655,14 @@ "InstanceType": "r7iz.large", "Location": "usw2-az1" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "usw2-az1" + }, { "InstanceType": "r7iz.xlarge", "Location": "usw2-az1" @@ -3603,6 +3635,14 @@ "InstanceType": "c7i.large", "Location": "usw2-az2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "usw2-az2" + }, { "InstanceType": "c7i.xlarge", "Location": "usw2-az2" @@ -4763,6 +4803,14 @@ "InstanceType": "m7i.large", "Location": "usw2-az2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "usw2-az2" + }, { "InstanceType": "m7i.xlarge", "Location": "usw2-az2" @@ -5515,6 +5563,14 @@ "InstanceType": "r7iz.large", "Location": "usw2-az2" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "usw2-az2" + }, { "InstanceType": "r7iz.xlarge", "Location": "usw2-az2" @@ -6483,6 +6539,14 @@ "InstanceType": "c7i.large", "Location": "usw2-az3" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "usw2-az3" + }, { "InstanceType": "c7i.xlarge", "Location": "usw2-az3" @@ -7659,6 +7723,14 @@ "InstanceType": "m7i.large", "Location": "usw2-az3" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "usw2-az3" + }, { "InstanceType": "m7i.xlarge", "Location": "usw2-az3" @@ -8419,6 +8491,14 @@ "InstanceType": "r7i.large", "Location": "usw2-az3" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "usw2-az3" + }, { "InstanceType": "r7i.xlarge", "Location": "usw2-az3" @@ -8451,6 +8531,14 @@ "InstanceType": "r7iz.large", "Location": "usw2-az3" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "usw2-az3" + }, { "InstanceType": "r7iz.xlarge", "Location": "usw2-az3" @@ -9303,6 +9391,14 @@ "InstanceType": "c7i.large", "Location": "usw2-az4" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "usw2-az4" + }, { "InstanceType": "c7i.xlarge", "Location": "usw2-az4" @@ -9875,6 +9971,14 @@ "InstanceType": "m7i.large", "Location": "usw2-az4" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "usw2-az4" + }, { "InstanceType": "m7i.xlarge", "Location": "usw2-az4" @@ -10363,6 +10467,14 @@ "InstanceType": "r7i.large", "Location": "usw2-az4" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "usw2-az4" + }, { "InstanceType": "r7i.xlarge", "Location": "usw2-az4" @@ -10395,6 +10507,14 @@ "InstanceType": "r7iz.large", "Location": "usw2-az4" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "usw2-az4" + }, { "InstanceType": "r7iz.xlarge", "Location": "usw2-az4" 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 effa72feb..e41853bf3 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 @@ -347,6 +347,14 @@ "InstanceType": "c7i.large", "Location": "eu-north-1a" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-north-1a" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-north-1a" @@ -863,6 +871,14 @@ "InstanceType": "m7i.large", "Location": "eu-north-1a" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-north-1a" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-north-1a" @@ -1159,6 +1175,14 @@ "InstanceType": "r7i.large", "Location": "eu-north-1a" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-north-1a" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-north-1a" @@ -1623,6 +1647,14 @@ "InstanceType": "c7i.large", "Location": "eu-north-1b" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-north-1b" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-north-1b" @@ -2163,6 +2195,14 @@ "InstanceType": "m7i.large", "Location": "eu-north-1b" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-north-1b" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-north-1b" @@ -2531,6 +2571,14 @@ "InstanceType": "r7i.large", "Location": "eu-north-1b" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-north-1b" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-north-1b" @@ -3507,6 +3555,14 @@ "InstanceType": "m7i.large", "Location": "eu-north-1c" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-north-1c" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-north-1c" @@ -3835,6 +3891,14 @@ "InstanceType": "r7i.large", "Location": "eu-north-1c" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-north-1c" + }, { "InstanceType": "r7i.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 5b41dc2b0..82c87ea75 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 @@ -175,6 +175,14 @@ "InstanceType": "c7i.large", "Location": "eu-south-2a" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-south-2a" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-south-2a" @@ -491,6 +499,14 @@ "InstanceType": "m7i.large", "Location": "eu-south-2a" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-south-2a" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-south-2a" @@ -671,6 +687,14 @@ "InstanceType": "r7i.large", "Location": "eu-south-2a" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-south-2a" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-south-2a" @@ -1179,6 +1203,14 @@ "InstanceType": "m7i.large", "Location": "eu-south-2b" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-south-2b" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-south-2b" @@ -1359,6 +1391,14 @@ "InstanceType": "r7i.large", "Location": "eu-south-2b" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-south-2b" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-south-2b" @@ -1611,6 +1651,14 @@ "InstanceType": "c7i.large", "Location": "eu-south-2c" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-south-2c" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-south-2c" @@ -1903,6 +1951,14 @@ "InstanceType": "m7i.large", "Location": "eu-south-2c" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-south-2c" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-south-2c" @@ -2083,6 +2139,14 @@ "InstanceType": "r7i.large", "Location": "eu-south-2c" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-south-2c" + }, { "InstanceType": "r7i.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 21ddda2be..d45cdf3e1 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 @@ -683,6 +683,14 @@ "InstanceType": "c7i.large", "Location": "eu-west-1a" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-1a" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-west-1a" @@ -1827,6 +1835,14 @@ "InstanceType": "m7i.large", "Location": "eu-west-1a" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-1a" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-west-1a" @@ -2567,6 +2583,14 @@ "InstanceType": "r7i.large", "Location": "eu-west-1a" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-1a" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-west-1a" @@ -3575,6 +3599,14 @@ "InstanceType": "c7i.large", "Location": "eu-west-1b" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-1b" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-west-1b" @@ -4707,6 +4739,14 @@ "InstanceType": "m7i.large", "Location": "eu-west-1b" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-1b" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-west-1b" @@ -5463,6 +5503,14 @@ "InstanceType": "r7i.large", "Location": "eu-west-1b" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-1b" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-west-1b" @@ -6447,6 +6495,14 @@ "InstanceType": "c7i.large", "Location": "eu-west-1c" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-1c" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-west-1c" @@ -7579,6 +7635,14 @@ "InstanceType": "m7i.large", "Location": "eu-west-1c" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-1c" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-west-1c" @@ -8319,6 +8383,14 @@ "InstanceType": "r7i.large", "Location": "eu-west-1c" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-1c" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json index 348207dc1..84a7ab8cb 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json @@ -827,6 +827,10 @@ "InstanceType": "c6in.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "f1.4xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "g5.12xlarge", "Location": "me-central-1b" 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 72335c044..5ac495e12 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 @@ -2807,6 +2807,14 @@ "InstanceType": "c7i.large", "Location": "us-east-1b" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-1b" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-1b" @@ -3987,6 +3995,14 @@ "InstanceType": "m7i.large", "Location": "us-east-1b" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-1b" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-1b" @@ -4735,6 +4751,14 @@ "InstanceType": "r7i.large", "Location": "us-east-1b" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-1b" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-1b" @@ -4767,6 +4791,14 @@ "InstanceType": "r7iz.large", "Location": "us-east-1b" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-1b" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-east-1b" @@ -5775,6 +5807,14 @@ "InstanceType": "c7i.large", "Location": "us-east-1c" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-1c" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-1c" @@ -6951,6 +6991,14 @@ "InstanceType": "m7i.large", "Location": "us-east-1c" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-1c" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-1c" @@ -7691,6 +7739,14 @@ "InstanceType": "r7i.large", "Location": "us-east-1c" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-1c" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-1c" @@ -7723,6 +7779,14 @@ "InstanceType": "r7iz.large", "Location": "us-east-1c" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-1c" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-east-1c" @@ -8727,6 +8791,14 @@ "InstanceType": "c7i.large", "Location": "us-east-1d" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-1d" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-1d" @@ -9915,6 +9987,14 @@ "InstanceType": "m7i.large", "Location": "us-east-1d" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-1d" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-1d" @@ -10675,6 +10755,14 @@ "InstanceType": "r7i.large", "Location": "us-east-1d" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-1d" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-1d" @@ -10707,6 +10795,14 @@ "InstanceType": "r7iz.large", "Location": "us-east-1d" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-1d" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-east-1d" @@ -11911,6 +12007,14 @@ "InstanceType": "c7i.large", "Location": "us-east-1f" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-1f" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-1f" @@ -12867,6 +12971,14 @@ "InstanceType": "m7i.large", "Location": "us-east-1f" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-1f" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-1f" @@ -13543,6 +13655,14 @@ "InstanceType": "r7i.large", "Location": "us-east-1f" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-1f" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-1f" @@ -13575,6 +13695,14 @@ "InstanceType": "r7iz.large", "Location": "us-east-1f" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-1f" + }, { "InstanceType": "r7iz.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 d8a067c83..e0fc0a679 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 @@ -655,6 +655,14 @@ "InstanceType": "c7i.large", "Location": "us-east-2a" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-2a" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-2a" @@ -1727,6 +1735,14 @@ "InstanceType": "m7i.large", "Location": "us-east-2a" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-2a" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-2a" @@ -1759,6 +1775,10 @@ "InstanceType": "p3.8xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "r3.2xlarge", "Location": "us-east-2a" @@ -2471,6 +2491,14 @@ "InstanceType": "r7i.large", "Location": "us-east-2a" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-2a" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-2a" @@ -3355,6 +3383,14 @@ "InstanceType": "c7i.large", "Location": "us-east-2b" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-2b" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-2b" @@ -4451,6 +4487,14 @@ "InstanceType": "m7i.large", "Location": "us-east-2b" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-2b" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-2b" @@ -5215,6 +5259,14 @@ "InstanceType": "r7i.large", "Location": "us-east-2b" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-2b" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-2b" @@ -6091,6 +6143,14 @@ "InstanceType": "c7i.large", "Location": "us-east-2c" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-2c" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-2c" @@ -7163,6 +7223,14 @@ "InstanceType": "m7i.large", "Location": "us-east-2c" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-2c" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-2c" @@ -7907,6 +7975,14 @@ "InstanceType": "r7i.large", "Location": "us-east-2c" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-2c" + }, { "InstanceType": "r7i.xlarge", "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 64b7049d7..405e26a4d 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 @@ -659,6 +659,14 @@ "InstanceType": "c7i.large", "Location": "us-west-2a" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-2a" + }, { "InstanceType": "c7i.xlarge", "Location": "us-west-2a" @@ -1839,6 +1847,14 @@ "InstanceType": "m7i.large", "Location": "us-west-2a" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-2a" + }, { "InstanceType": "m7i.xlarge", "Location": "us-west-2a" @@ -2599,6 +2615,14 @@ "InstanceType": "r7i.large", "Location": "us-west-2a" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-2a" + }, { "InstanceType": "r7i.xlarge", "Location": "us-west-2a" @@ -2631,6 +2655,14 @@ "InstanceType": "r7iz.large", "Location": "us-west-2a" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-west-2a" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-west-2a" @@ -3603,6 +3635,14 @@ "InstanceType": "c7i.large", "Location": "us-west-2b" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-2b" + }, { "InstanceType": "c7i.xlarge", "Location": "us-west-2b" @@ -4763,6 +4803,14 @@ "InstanceType": "m7i.large", "Location": "us-west-2b" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-2b" + }, { "InstanceType": "m7i.xlarge", "Location": "us-west-2b" @@ -5515,6 +5563,14 @@ "InstanceType": "r7iz.large", "Location": "us-west-2b" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-west-2b" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-west-2b" @@ -6483,6 +6539,14 @@ "InstanceType": "c7i.large", "Location": "us-west-2c" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-2c" + }, { "InstanceType": "c7i.xlarge", "Location": "us-west-2c" @@ -7659,6 +7723,14 @@ "InstanceType": "m7i.large", "Location": "us-west-2c" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-2c" + }, { "InstanceType": "m7i.xlarge", "Location": "us-west-2c" @@ -8419,6 +8491,14 @@ "InstanceType": "r7i.large", "Location": "us-west-2c" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-2c" + }, { "InstanceType": "r7i.xlarge", "Location": "us-west-2c" @@ -8451,6 +8531,14 @@ "InstanceType": "r7iz.large", "Location": "us-west-2c" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-west-2c" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-west-2c" @@ -9303,6 +9391,14 @@ "InstanceType": "c7i.large", "Location": "us-west-2d" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-2d" + }, { "InstanceType": "c7i.xlarge", "Location": "us-west-2d" @@ -9875,6 +9971,14 @@ "InstanceType": "m7i.large", "Location": "us-west-2d" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-2d" + }, { "InstanceType": "m7i.xlarge", "Location": "us-west-2d" @@ -10363,6 +10467,14 @@ "InstanceType": "r7i.large", "Location": "us-west-2d" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-2d" + }, { "InstanceType": "r7i.xlarge", "Location": "us-west-2d" @@ -10395,6 +10507,14 @@ "InstanceType": "r7iz.large", "Location": "us-west-2d" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-west-2d" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-west-2d" 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 49af3b1be..c65e7226c 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 @@ -347,6 +347,14 @@ "InstanceType": "c7i.large", "Location": "eu-north-1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-north-1" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-north-1" @@ -903,6 +911,14 @@ "InstanceType": "m7i.large", "Location": "eu-north-1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-north-1" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-north-1" @@ -1271,6 +1287,14 @@ "InstanceType": "r7i.large", "Location": "eu-north-1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-north-1" + }, { "InstanceType": "r7i.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 1f178d43c..917a84389 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 @@ -175,6 +175,14 @@ "InstanceType": "c7i.large", "Location": "eu-south-2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-south-2" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-south-2" @@ -491,6 +499,14 @@ "InstanceType": "m7i.large", "Location": "eu-south-2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-south-2" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-south-2" @@ -671,6 +687,14 @@ "InstanceType": "r7i.large", "Location": "eu-south-2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-south-2" + }, { "InstanceType": "r7i.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 388ea0e0c..7e3141f6b 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 @@ -683,6 +683,14 @@ "InstanceType": "c7i.large", "Location": "eu-west-1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-1" + }, { "InstanceType": "c7i.xlarge", "Location": "eu-west-1" @@ -1843,6 +1851,14 @@ "InstanceType": "m7i.large", "Location": "eu-west-1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-1" + }, { "InstanceType": "m7i.xlarge", "Location": "eu-west-1" @@ -2599,6 +2615,14 @@ "InstanceType": "r7i.large", "Location": "eu-west-1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-1" + }, { "InstanceType": "r7i.xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json index 5f9ecb962..b28de308a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json @@ -147,6 +147,10 @@ "InstanceType": "c6in.xlarge", "Location": "me-central-1" }, + { + "InstanceType": "f1.4xlarge", + "Location": "me-central-1" + }, { "InstanceType": "g5.12xlarge", "Location": "me-central-1" 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 e88063519..2d71f9e10 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 @@ -683,6 +683,14 @@ "InstanceType": "c7i.large", "Location": "us-east-1" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-1" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-1" @@ -1875,6 +1883,14 @@ "InstanceType": "m7i.large", "Location": "us-east-1" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-1" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-1" @@ -2639,6 +2655,14 @@ "InstanceType": "r7i.large", "Location": "us-east-1" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-1" + }, { "InstanceType": "r7i.xlarge", "Location": "us-east-1" @@ -2671,6 +2695,14 @@ "InstanceType": "r7iz.large", "Location": "us-east-1" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-1" + }, { "InstanceType": "r7iz.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 4f8764c53..115ca1f65 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 @@ -655,6 +655,14 @@ "InstanceType": "c7i.large", "Location": "us-east-2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-2" + }, { "InstanceType": "c7i.xlarge", "Location": "us-east-2" @@ -1751,6 +1759,14 @@ "InstanceType": "m7i.large", "Location": "us-east-2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-2" + }, { "InstanceType": "m7i.xlarge", "Location": "us-east-2" @@ -2515,6 +2531,14 @@ "InstanceType": "r7i.large", "Location": "us-east-2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-2" + }, { "InstanceType": "r7i.xlarge", "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 236a2f941..8498ef478 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 @@ -683,6 +683,14 @@ "InstanceType": "c7i.large", "Location": "us-west-2" }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-2" + }, { "InstanceType": "c7i.xlarge", "Location": "us-west-2" @@ -1863,6 +1871,14 @@ "InstanceType": "m7i.large", "Location": "us-west-2" }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-2" + }, { "InstanceType": "m7i.xlarge", "Location": "us-west-2" @@ -2627,6 +2643,14 @@ "InstanceType": "r7i.large", "Location": "us-west-2" }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-2" + }, { "InstanceType": "r7i.xlarge", "Location": "us-west-2" @@ -2659,6 +2683,14 @@ "InstanceType": "r7iz.large", "Location": "us-west-2" }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-west-2" + }, { "InstanceType": "r7iz.xlarge", "Location": "us-west-2"