From a5debd71387ff85fda1a130d419bdcf960d7c118 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Nov 2023 09:49:09 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#7046) Co-authored-by: bblommers --- .../availability-zone-id/ap-northeast-1.json | 228 +++++++++ .../availability-zone-id/ap-northeast-2.json | 216 +++++++++ .../availability-zone-id/ap-south-1.json | 296 ++++++++++++ .../availability-zone-id/ap-southeast-1.json | 80 ++++ .../availability-zone-id/ap-southeast-2.json | 324 +++++++++++++ .../availability-zone-id/eu-central-1.json | 4 + .../availability-zone-id/eu-north-1.json | 108 +++++ .../availability-zone-id/eu-south-2.json | 80 ++++ .../availability-zone-id/eu-west-2.json | 16 + .../availability-zone-id/me-central-1.json | 4 - .../availability-zone-id/us-west-1.json | 432 ++++++++++++++++++ .../availability-zone-id/us-west-2.json | 44 ++ .../availability-zone/ap-northeast-1.json | 228 +++++++++ .../availability-zone/ap-northeast-2.json | 216 +++++++++ .../availability-zone/ap-south-1.json | 296 ++++++++++++ .../availability-zone/ap-southeast-1.json | 80 ++++ .../availability-zone/ap-southeast-2.json | 324 +++++++++++++ .../availability-zone/eu-central-1.json | 4 + .../availability-zone/eu-north-1.json | 108 +++++ .../availability-zone/eu-south-2.json | 80 ++++ .../availability-zone/eu-west-2.json | 16 + .../availability-zone/me-central-1.json | 4 - .../availability-zone/us-west-1.json | 432 ++++++++++++++++++ .../availability-zone/us-west-2.json | 44 ++ .../region/ap-northeast-1.json | 76 +++ .../region/ap-northeast-2.json | 108 +++++ .../region/ap-south-1.json | 96 ++++ .../region/ap-southeast-2.json | 108 +++++ .../region/eu-central-1.json | 4 + .../region/eu-north-1.json | 36 ++ .../region/eu-south-2.json | 40 ++ .../region/eu-west-2.json | 8 + .../region/me-central-1.json | 4 - .../region/us-west-1.json | 216 +++++++++ .../region/us-west-2.json | 8 + 35 files changed, 4356 insertions(+), 12 deletions(-) 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 00cce5553..64c6193c5 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 @@ -515,6 +515,38 @@ "InstanceType": "c7gd.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az1" @@ -1799,6 +1831,50 @@ "InstanceType": "r5n.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "apne1-az1" @@ -2795,6 +2871,38 @@ "InstanceType": "c7gd.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az2" @@ -3919,6 +4027,50 @@ "InstanceType": "r5n.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "apne1-az2" @@ -4963,6 +5115,38 @@ "InstanceType": "c7gd.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az4" @@ -6279,6 +6463,50 @@ "InstanceType": "r5n.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.metal", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "r6g.12xlarge", "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 b0010211b..d9f75aee4 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 @@ -335,6 +335,42 @@ "InstanceType": "c6in.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az1" @@ -883,6 +919,42 @@ "InstanceType": "m6i.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne2-az1" @@ -1351,6 +1423,42 @@ "InstanceType": "r6id.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "apne2-az1" @@ -1899,6 +2007,42 @@ "InstanceType": "c6in.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az2" @@ -2227,6 +2371,42 @@ "InstanceType": "m6i.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "apne2-az2" @@ -2523,6 +2703,42 @@ "InstanceType": "r6id.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "apne2-az2" 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 408e01623..a1421dcc0 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 @@ -267,6 +267,14 @@ "InstanceType": "c6gd.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "c6gn.2xlarge", "Location": "aps1-az1" @@ -407,6 +415,38 @@ "InstanceType": "c7g.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az1" @@ -1007,6 +1047,38 @@ "InstanceType": "m7g.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "mac1.metal", "Location": "aps1-az1" @@ -1471,6 +1543,38 @@ "InstanceType": "r7g.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-az1" @@ -2119,6 +2223,38 @@ "InstanceType": "c7g.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az2" @@ -2647,6 +2783,38 @@ "InstanceType": "m7g.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "mac1.metal", "Location": "aps1-az2" @@ -3055,6 +3223,38 @@ "InstanceType": "r7g.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "aps1-az2" @@ -3615,6 +3815,38 @@ "InstanceType": "c7g.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az3" @@ -4191,6 +4423,38 @@ "InstanceType": "m7g.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "aps1-az3" @@ -4651,6 +4915,38 @@ "InstanceType": "r7g.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index 3344f0748..0c7bb1b07 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 @@ -5759,6 +5759,86 @@ "InstanceType": "m6i.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "m7g.12xlarge", "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 2cdff9b7d..e5c3a1260 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 @@ -1415,6 +1415,38 @@ "InstanceType": "m7g.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "mac1.metal", "Location": "apse2-az1" @@ -1731,6 +1763,50 @@ "InstanceType": "r5n.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "apse2-az1" @@ -1919,6 +1995,38 @@ "InstanceType": "r7g.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "t1.micro", "Location": "apse2-az1" @@ -3511,6 +3619,38 @@ "InstanceType": "m7g.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "apse2-az2" @@ -3811,6 +3951,50 @@ "InstanceType": "r5n.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "apse2-az2" @@ -3999,6 +4183,38 @@ "InstanceType": "r7g.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apse2-az2" @@ -5551,6 +5767,38 @@ "InstanceType": "m7g.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "mac1.metal", "Location": "apse2-az3" @@ -5843,6 +6091,50 @@ "InstanceType": "r5n.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "r6g.12xlarge", "Location": "apse2-az3" @@ -6031,6 +6323,38 @@ "InstanceType": "r7g.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "t1.micro", "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 ed208c7dd..5df5e731b 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 @@ -575,6 +575,10 @@ "InstanceType": "d3en.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "dl2q.24xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "f1.2xlarge", "Location": "euc1-az1" 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 5245e575f..1cd2da9b5 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 @@ -315,6 +315,42 @@ "InstanceType": "c6in.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "c7i.12xlarge", "Location": "eun1-az1" @@ -1615,6 +1651,42 @@ "InstanceType": "c6in.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "eun1-az2" @@ -3011,6 +3083,42 @@ "InstanceType": "c6in.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "d2.2xlarge", "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 3820a3317..2357c7a10 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 @@ -755,6 +755,14 @@ "InstanceType": "t4g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eus2-az1" @@ -771,6 +779,38 @@ "InstanceType": "x2idn.metal", "Location": "eus2-az1" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "eus2-az2" @@ -1459,6 +1499,14 @@ "InstanceType": "t4g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eus2-az2" @@ -1475,6 +1523,38 @@ "InstanceType": "x2idn.metal", "Location": "eus2-az2" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "eus2-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 f60376835..cd1fc9da4 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 @@ -1487,6 +1487,14 @@ "InstanceType": "t4g.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "euw2-az1" @@ -4575,6 +4583,14 @@ "InstanceType": "t4g.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "x1.16xlarge", "Location": "euw2-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 d9349fa94..ed70ce266 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,10 +827,6 @@ "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-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json index 2ec5a39d0..c23bcc795 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 @@ -367,6 +367,46 @@ "InstanceType": "c6i.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "usw1-az1" @@ -403,6 +443,38 @@ "InstanceType": "c7g.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "usw1-az1" @@ -979,6 +1051,86 @@ "InstanceType": "m6i.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "usw1-az1" @@ -1015,6 +1167,38 @@ "InstanceType": "m7g.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "usw1-az1" @@ -1423,6 +1607,38 @@ "InstanceType": "r7g.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "t1.micro", "Location": "usw1-az1" @@ -1983,6 +2199,46 @@ "InstanceType": "c6i.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "usw1-az3" @@ -2019,6 +2275,38 @@ "InstanceType": "c7g.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "usw1-az3" @@ -2595,6 +2883,86 @@ "InstanceType": "m6i.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "m7g.12xlarge", "Location": "usw1-az3" @@ -2631,6 +2999,38 @@ "InstanceType": "m7g.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "r3.2xlarge", "Location": "usw1-az3" @@ -3039,6 +3439,38 @@ "InstanceType": "r7g.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "t1.micro", "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 ff1ba8f8e..99fd0a4a5 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 @@ -1863,6 +1863,10 @@ "InstanceType": "mac1.metal", "Location": "usw2-az1" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "usw2-az1" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "usw2-az1" @@ -7739,6 +7743,10 @@ "InstanceType": "mac1.metal", "Location": "usw2-az3" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "usw2-az3" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "usw2-az3" @@ -9459,6 +9467,10 @@ "InstanceType": "d3en.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "dl2q.24xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "i3.16xlarge", "Location": "usw2-az4" @@ -9919,6 +9931,38 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "m7i-flex.2xlarge", "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 b5c81a49c..2a0fc076c 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 @@ -539,6 +539,38 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1a" @@ -1855,6 +1887,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-northeast-1a" @@ -2951,6 +3027,38 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1c" @@ -4235,6 +4343,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-northeast-1c" @@ -5231,6 +5383,38 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1d" @@ -6355,6 +6539,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r6g.12xlarge", "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 9174966cd..b5efc5304 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 @@ -335,6 +335,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2a" @@ -883,6 +919,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-2a" @@ -1351,6 +1423,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2a" @@ -1899,6 +2007,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2b" @@ -2227,6 +2371,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-northeast-2b" @@ -2523,6 +2703,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-northeast-2b" 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 a5ef41a21..86a586a6e 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 @@ -267,6 +267,14 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "c6gn.2xlarge", "Location": "ap-south-1a" @@ -407,6 +415,38 @@ "InstanceType": "c7g.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1a" @@ -1007,6 +1047,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1a" @@ -1471,6 +1543,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1a" @@ -2139,6 +2243,38 @@ "InstanceType": "c7g.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1b" @@ -2715,6 +2851,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-south-1b" @@ -3175,6 +3343,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1b" @@ -3827,6 +4027,38 @@ "InstanceType": "c7g.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1c" @@ -4355,6 +4587,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1c" @@ -4763,6 +5027,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-south-1c" 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 ce344dc77..62da41c13 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 @@ -5759,6 +5759,86 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "m7g.12xlarge", "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 e286dfe45..1ca9c5515 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 @@ -1319,6 +1319,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2a" @@ -1611,6 +1643,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-southeast-2a" @@ -1799,6 +1875,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2a" @@ -3423,6 +3531,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2b" @@ -3739,6 +3879,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-southeast-2b" @@ -3927,6 +4111,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2b" @@ -5519,6 +5735,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-2c" @@ -5819,6 +6067,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-southeast-2c" @@ -6007,6 +6299,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "t2.2xlarge", "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 2727e4d9f..494b3ba92 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 @@ -5159,6 +5159,10 @@ "InstanceType": "d3en.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "dl2q.24xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "f1.2xlarge", "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 e41853bf3..589c1452a 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 @@ -315,6 +315,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-north-1a" @@ -1615,6 +1651,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-north-1b" @@ -3011,6 +3083,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "d2.2xlarge", "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 82c87ea75..650ab8d81 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 @@ -755,6 +755,14 @@ "InstanceType": "t4g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eu-south-2a" @@ -771,6 +779,38 @@ "InstanceType": "x2idn.metal", "Location": "eu-south-2a" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-south-2b" @@ -1459,6 +1499,14 @@ "InstanceType": "t4g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eu-south-2b" @@ -1475,6 +1523,38 @@ "InstanceType": "x2idn.metal", "Location": "eu-south-2b" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-south-2c" 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 177e19290..d5204ef33 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 @@ -3003,6 +3003,14 @@ "InstanceType": "t4g.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-2b" @@ -4575,6 +4583,14 @@ "InstanceType": "t4g.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-2c" 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 84a7ab8cb..348207dc1 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,10 +827,6 @@ "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-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json index 82068049d..4506b84f6 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 @@ -367,6 +367,46 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-1a" @@ -403,6 +443,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1a" @@ -979,6 +1051,86 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "us-west-1a" @@ -1015,6 +1167,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1a" @@ -1423,6 +1607,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "t1.micro", "Location": "us-west-1a" @@ -1983,6 +2199,46 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-1b" @@ -2019,6 +2275,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1b" @@ -2595,6 +2883,86 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "m7g.12xlarge", "Location": "us-west-1b" @@ -2631,6 +2999,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1b" @@ -3039,6 +3439,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "t1.micro", "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 405e26a4d..6786f4e0b 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 @@ -1863,6 +1863,10 @@ "InstanceType": "mac1.metal", "Location": "us-west-2a" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2a" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2a" @@ -7739,6 +7743,10 @@ "InstanceType": "mac1.metal", "Location": "us-west-2c" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2c" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2c" @@ -9459,6 +9467,10 @@ "InstanceType": "d3en.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "dl2q.24xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "i3.16xlarge", "Location": "us-west-2d" @@ -9919,6 +9931,38 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "m7i-flex.2xlarge", "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 12c9a724f..cf7aa60fd 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 @@ -539,6 +539,38 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1" @@ -1879,6 +1911,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index d0a9d8de5..964816cde 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -335,6 +335,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2" @@ -883,6 +919,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-2" @@ -1355,6 +1427,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index 73fe8ba56..ae4b10d5b 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 @@ -439,6 +439,38 @@ "InstanceType": "c7g.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1" @@ -1039,6 +1071,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1" @@ -1503,6 +1567,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-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 8261026cf..53409356e 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 @@ -1415,6 +1415,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2" @@ -1731,6 +1763,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-southeast-2" @@ -1919,6 +1995,38 @@ "InstanceType": "r7g.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "t1.micro", "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 da910af18..83752c1d1 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 @@ -619,6 +619,10 @@ "InstanceType": "d3en.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "dl2q.24xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "f1.2xlarge", "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 c65e7226c..b0791b44f 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 @@ -315,6 +315,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "c7i.12xlarge", "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 917a84389..7af22f886 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 @@ -755,6 +755,14 @@ "InstanceType": "t4g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eu-south-2" @@ -770,5 +778,37 @@ { "InstanceType": "x2idn.metal", "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-2" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 65ffae7bb..d7642bc91 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -1547,6 +1547,14 @@ "InstanceType": "t4g.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-2" 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 b28de308a..5f9ecb962 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,10 +147,6 @@ "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-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index 68f3dc2f3..fcdb77e10 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 @@ -367,6 +367,46 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.large", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-1" @@ -403,6 +443,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1" @@ -979,6 +1051,86 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "m7g.12xlarge", "Location": "us-west-1" @@ -1015,6 +1167,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1" @@ -1423,6 +1607,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "t1.micro", "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 8498ef478..d70e09554 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 @@ -755,6 +755,10 @@ "InstanceType": "dl1.24xlarge", "Location": "us-west-2" }, + { + "InstanceType": "dl2q.24xlarge", + "Location": "us-west-2" + }, { "InstanceType": "f1.16xlarge", "Location": "us-west-2" @@ -1887,6 +1891,10 @@ "InstanceType": "mac1.metal", "Location": "us-west-2" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2"