From 7a4bdfd11b0102c3c28947329a9e26fd3824ede4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 08:52:28 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings (#6870) --- .../availability-zone-id/ap-northeast-1.json | 28 +- .../availability-zone-id/ap-southeast-1.json | 16 - .../availability-zone-id/eu-central-1.json | 16 - .../availability-zone-id/eu-central-2.json | 40 +++ .../availability-zone-id/eu-north-1.json | 216 ++++++++++++ .../availability-zone-id/eu-south-2.json | 324 ++++++++++++++++++ .../availability-zone-id/eu-west-1.json | 36 +- .../availability-zone-id/us-east-1.json | 68 ++++ .../availability-zone-id/us-east-2.json | 4 + .../availability-zone-id/us-west-1.json | 16 - .../availability-zone-id/us-west-2.json | 56 +++ .../availability-zone/ap-northeast-1.json | 28 +- .../availability-zone/ap-southeast-1.json | 16 - .../availability-zone/eu-central-1.json | 16 - .../availability-zone/eu-central-2.json | 40 +++ .../availability-zone/eu-north-1.json | 216 ++++++++++++ .../availability-zone/eu-south-2.json | 324 ++++++++++++++++++ .../availability-zone/eu-west-1.json | 36 +- .../availability-zone/us-east-1.json | 68 ++++ .../availability-zone/us-east-2.json | 4 + .../availability-zone/us-west-1.json | 16 - .../availability-zone/us-west-2.json | 56 +++ .../region/ap-northeast-1.json | 20 +- .../region/ap-southeast-1.json | 8 - .../region/eu-central-1.json | 8 - .../region/eu-north-1.json | 72 ++++ .../region/eu-south-2.json | 108 ++++++ .../region/eu-west-1.json | 20 +- .../region/us-east-2.json | 4 + .../region/us-west-1.json | 8 - 30 files changed, 1672 insertions(+), 216 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 0c28a9c0b..bf82fe174 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 @@ -539,14 +539,6 @@ "InstanceType": "d3en.xlarge", "Location": "apne1-az1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "apne1-az1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "apne1-az1" - }, { "InstanceType": "g3.16xlarge", "Location": "apne1-az1" @@ -4787,14 +4779,6 @@ "InstanceType": "d3en.xlarge", "Location": "apne1-az4" }, - { - "InstanceType": "g2.2xlarge", - "Location": "apne1-az4" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "apne1-az4" - }, { "InstanceType": "g3.16xlarge", "Location": "apne1-az4" @@ -4891,6 +4875,18 @@ "InstanceType": "g5.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "i2.2xlarge", "Location": "apne1-az4" 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 7a2e685da..3ab7b41d2 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 @@ -523,14 +523,6 @@ "InstanceType": "d3en.xlarge", "Location": "apse1-az1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "apse1-az1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "apse1-az1" - }, { "InstanceType": "g3.16xlarge", "Location": "apse1-az1" @@ -2735,14 +2727,6 @@ "InstanceType": "d3en.xlarge", "Location": "apse1-az2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "apse1-az2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "apse1-az2" - }, { "InstanceType": "g3.16xlarge", "Location": "apse1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index e02036ffa..45b06a4f7 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 @@ -2767,14 +2767,6 @@ "InstanceType": "d3en.xlarge", "Location": "euc1-az2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "euc1-az2" - }, { "InstanceType": "g3.16xlarge", "Location": "euc1-az2" @@ -4887,14 +4879,6 @@ "InstanceType": "f1.4xlarge", "Location": "euc1-az3" }, - { - "InstanceType": "g2.2xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "euc1-az3" - }, { "InstanceType": "g3.16xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json index 524cb8930..2eba644c7 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json @@ -1099,6 +1099,46 @@ "InstanceType": "m6gd.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "euc2-az2" 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 8387269de..fcc104834 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 @@ -687,6 +687,42 @@ "InstanceType": "m6i.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eun1-az1" @@ -967,6 +1003,42 @@ "InstanceType": "r6i.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az1" @@ -1791,6 +1863,42 @@ "InstanceType": "m6i.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eun1-az2" @@ -2143,6 +2251,42 @@ "InstanceType": "r6i.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az2" @@ -2939,6 +3083,42 @@ "InstanceType": "m6i.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eun1-az3" @@ -3251,6 +3431,42 @@ "InstanceType": "r6i.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "t3.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 3baf7037e..a8d8e2a4d 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 @@ -107,6 +107,42 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "c7i.12xlarge", "Location": "eus2-az1" @@ -367,6 +403,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eus2-az1" @@ -531,6 +603,42 @@ "InstanceType": "r6g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "eus2-az1" @@ -711,6 +819,42 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "eus2-az2" @@ -911,6 +1055,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eus2-az2" @@ -1075,6 +1255,42 @@ "InstanceType": "r6g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "eus2-az2" @@ -1255,6 +1471,42 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "c7i.12xlarge", "Location": "eus2-az3" @@ -1491,6 +1743,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eus2-az3" @@ -1655,6 +1943,42 @@ "InstanceType": "r6g.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "eus2-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "eus2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index ac7fe68eb..a30c68df6 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -707,14 +707,6 @@ "InstanceType": "f1.4xlarge", "Location": "euw1-az1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "euw1-az1" - }, { "InstanceType": "g3.16xlarge", "Location": "euw1-az1" @@ -827,6 +819,18 @@ "InstanceType": "hpc7a.96xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "i2.2xlarge", "Location": "euw1-az1" @@ -3499,14 +3503,6 @@ "InstanceType": "f1.4xlarge", "Location": "euw1-az2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "euw1-az2" - }, { "InstanceType": "g3.16xlarge", "Location": "euw1-az2" @@ -6283,14 +6279,6 @@ "InstanceType": "f1.4xlarge", "Location": "euw1-az3" }, - { - "InstanceType": "g2.2xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "euw1-az3" - }, { "InstanceType": "g3.16xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 611c73fa6..83c03d2e9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json @@ -3855,6 +3855,38 @@ "InstanceType": "m7g.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "use1-az2" @@ -3911,6 +3943,10 @@ "InstanceType": "m7i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "mac2.metal", + "Location": "use1-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "use1-az2" @@ -11067,6 +11103,38 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.large", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "c7gn.12xlarge", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index 24affad68..80e9fa5ba 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json @@ -4391,6 +4391,10 @@ "InstanceType": "p4d.24xlarge", "Location": "use2-az2" }, + { + "InstanceType": "p5.48xlarge", + "Location": "use2-az2" + }, { "InstanceType": "r3.2xlarge", "Location": "use2-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 c91538716..85dbe33df 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 @@ -383,14 +383,6 @@ "InstanceType": "d2.xlarge", "Location": "usw1-az1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "usw1-az1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "usw1-az1" - }, { "InstanceType": "g3.16xlarge", "Location": "usw1-az1" @@ -1847,14 +1839,6 @@ "InstanceType": "d2.xlarge", "Location": "usw1-az3" }, - { - "InstanceType": "g2.2xlarge", - "Location": "usw1-az3" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "usw1-az3" - }, { "InstanceType": "g3.16xlarge", "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 ff4573e82..e86e62234 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 @@ -9475,6 +9475,62 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json index b09d62b83..80e54b363 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 @@ -563,14 +563,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-northeast-1a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-northeast-1a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-northeast-1a" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-northeast-1a" @@ -667,6 +659,18 @@ "InstanceType": "g5.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-northeast-1a" @@ -2867,14 +2871,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-northeast-1c" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-northeast-1c" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-northeast-1c" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-northeast-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 cd35f865b..dd6ef0d6b 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 @@ -555,14 +555,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-southeast-1a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-southeast-1a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-southeast-1a" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-southeast-1a" @@ -2731,14 +2723,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-southeast-1b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-southeast-1b" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-southeast-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json index aab9a069c..d33573bf0 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 @@ -547,14 +547,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-central-1a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-central-1a" - }, { "InstanceType": "g3.16xlarge", "Location": "eu-central-1a" @@ -2667,14 +2659,6 @@ "InstanceType": "f1.4xlarge", "Location": "eu-central-1b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-central-1b" - }, { "InstanceType": "g3.16xlarge", "Location": "eu-central-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json index 7c3852ddb..2f4a38430 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json @@ -1099,6 +1099,46 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-central-2b" 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 b4832896d..7b9a9b1c6 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 @@ -687,6 +687,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1a" @@ -967,6 +1003,42 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1a" @@ -1791,6 +1863,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1b" @@ -2143,6 +2251,42 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1b" @@ -2939,6 +3083,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1c" @@ -3251,6 +3431,42 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "t3.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 4c211699e..fb849fe8d 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 @@ -107,6 +107,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2a" @@ -367,6 +403,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2a" @@ -531,6 +603,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-2a" @@ -711,6 +819,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-south-2b" @@ -911,6 +1055,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2b" @@ -1075,6 +1255,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-2b" @@ -1255,6 +1471,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2c" @@ -1491,6 +1743,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2c" @@ -1655,6 +1943,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-south-2c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index e251f6cbd..ab9fddf75 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -707,14 +707,6 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-1a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "g3.16xlarge", "Location": "eu-west-1a" @@ -827,6 +819,18 @@ "InstanceType": "hpc7a.96xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-west-1a" @@ -3499,14 +3503,6 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "g3.16xlarge", "Location": "eu-west-1b" @@ -6283,14 +6279,6 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-1c" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-west-1c" - }, { "InstanceType": "g3.16xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index f5200640a..9232b52a0 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json @@ -3855,6 +3855,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "us-east-1b" @@ -3911,6 +3943,10 @@ "InstanceType": "m7i.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1b" @@ -8367,6 +8403,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index ce2c0023b..354a4c752 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json @@ -4391,6 +4391,10 @@ "InstanceType": "p4d.24xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "r3.2xlarge", "Location": "us-east-2b" 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 1ea2d85f2..67eeb0f14 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 @@ -383,14 +383,6 @@ "InstanceType": "d2.xlarge", "Location": "us-west-1a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-1a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-1a" - }, { "InstanceType": "g3.16xlarge", "Location": "us-west-1a" @@ -1847,14 +1839,6 @@ "InstanceType": "d2.xlarge", "Location": "us-west-1b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-1b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-1b" - }, { "InstanceType": "g3.16xlarge", "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 12744d43c..a756b5ddd 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 @@ -9475,6 +9475,62 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index 56f42ba6d..c6c429ab1 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 @@ -563,14 +563,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-northeast-1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-northeast-1" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-northeast-1" @@ -691,6 +683,18 @@ "InstanceType": "g5g.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index 8ad0bdc11..26df6aae0 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json @@ -555,14 +555,6 @@ "InstanceType": "d3en.xlarge", "Location": "ap-southeast-1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-southeast-1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-southeast-1" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 50dcb81a1..65fe42db5 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 @@ -627,14 +627,6 @@ "InstanceType": "f1.4xlarge", "Location": "eu-central-1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-central-1" - }, { "InstanceType": "g3.16xlarge", "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 cffb2444a..3b4fa0e22 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 @@ -727,6 +727,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1" @@ -1079,6 +1115,42 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "t3.2xlarge", "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 f0b990208..a4f28ce8b 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 @@ -107,6 +107,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2" @@ -367,6 +403,42 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2" @@ -531,6 +603,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index b96205a90..a654f2909 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -707,14 +707,6 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "eu-west-1" - }, { "InstanceType": "g3.16xlarge", "Location": "eu-west-1" @@ -843,6 +835,18 @@ "InstanceType": "hpc7a.96xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index 1829b16d2..e8ac697a6 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json @@ -1739,6 +1739,10 @@ "InstanceType": "p4d.24xlarge", "Location": "us-east-2" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-east-2" + }, { "InstanceType": "r3.2xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index cc8e6a5cb..aa4f6bc2d 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 @@ -383,14 +383,6 @@ "InstanceType": "d2.xlarge", "Location": "us-west-1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-1" - }, { "InstanceType": "g3.16xlarge", "Location": "us-west-1"