From 546ba19c91280114a955ecde5fa238c5b994949b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 09:54:58 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#7131) --- .../availability-zone-id/ap-northeast-1.json | 32 ++++ .../availability-zone-id/ap-northeast-2.json | 120 ++++++++++++++ .../availability-zone-id/ap-northeast-3.json | 36 +++++ .../availability-zone-id/ap-south-1.json | 152 ++++++++++++++++++ .../availability-zone-id/ap-southeast-1.json | 136 ++++++++++++++++ .../availability-zone-id/ap-southeast-2.json | 4 + .../availability-zone-id/eu-central-1.json | 32 ++++ .../availability-zone-id/eu-north-1.json | 16 ++ .../availability-zone-id/eu-west-1.json | 32 ++++ .../availability-zone-id/eu-west-3.json | 72 +++++++++ .../availability-zone-id/me-south-1.json | 108 +++++++++++++ .../availability-zone-id/sa-east-1.json | 108 +++++++++++++ .../availability-zone-id/us-west-2.json | 72 +++++++++ .../availability-zone/ap-northeast-1.json | 32 ++++ .../availability-zone/ap-northeast-2.json | 120 ++++++++++++++ .../availability-zone/ap-northeast-3.json | 36 +++++ .../availability-zone/ap-south-1.json | 152 ++++++++++++++++++ .../availability-zone/ap-southeast-1.json | 136 ++++++++++++++++ .../availability-zone/ap-southeast-2.json | 4 + .../availability-zone/eu-central-1.json | 32 ++++ .../availability-zone/eu-north-1.json | 16 ++ .../availability-zone/eu-west-1.json | 32 ++++ .../availability-zone/eu-west-3.json | 72 +++++++++ .../availability-zone/me-south-1.json | 108 +++++++++++++ .../availability-zone/sa-east-1.json | 108 +++++++++++++ .../availability-zone/us-west-2.json | 72 +++++++++ .../region/ap-northeast-1.json | 16 ++ .../region/ap-northeast-2.json | 40 +++++ .../region/ap-south-1.json | 56 +++++++ .../region/ap-southeast-1.json | 56 +++++++ .../region/ap-southeast-2.json | 4 + .../region/eu-central-1.json | 16 ++ .../region/eu-north-1.json | 16 ++ .../region/eu-west-1.json | 16 ++ .../region/eu-west-3.json | 36 +++++ .../region/me-south-1.json | 36 +++++ .../region/sa-east-1.json | 36 +++++ 37 files changed, 2168 insertions(+) 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 64c6193c5..12e14c147 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 @@ -879,6 +879,22 @@ "InstanceType": "inf1.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "apne1-az1" @@ -5467,6 +5483,22 @@ "InstanceType": "inf1.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "is4gen.2xlarge", "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 ca2b0aac3..7239cfad6 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 @@ -919,6 +919,46 @@ "InstanceType": "m6i.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "apne2-az1" @@ -3787,6 +3827,46 @@ "InstanceType": "m6i.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "apne2-az3" @@ -4871,6 +4951,46 @@ "InstanceType": "m6i.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.metal", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "apne2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json index d90ee859b..40a9a774c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json @@ -1287,6 +1287,42 @@ "InstanceType": "m5d.xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.medium", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "m6gd.12xlarge", "Location": "apne3-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 31fc85109..e519cbd3c 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 @@ -671,6 +671,22 @@ "InstanceType": "inf1.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "aps1-az1" @@ -1011,6 +1027,46 @@ "InstanceType": "m6i.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "aps1-az1" @@ -2811,6 +2867,46 @@ "InstanceType": "m6i.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "m7g.12xlarge", "Location": "aps1-az2" @@ -4199,6 +4295,22 @@ "InstanceType": "inf1.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "m4.10xlarge", "Location": "aps1-az3" @@ -4515,6 +4627,46 @@ "InstanceType": "m6i.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "m7g.12xlarge", "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 0c7bb1b07..54b9c2a5c 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 @@ -1263,6 +1263,46 @@ "InstanceType": "m6i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "m6idn.12xlarge", "Location": "apse1-az1" @@ -3611,6 +3651,46 @@ "InstanceType": "m6i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "m6idn.12xlarge", "Location": "apse1-az2" @@ -5347,6 +5427,22 @@ "InstanceType": "inf1.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "is4gen.2xlarge", "Location": "apse1-az3" @@ -5759,6 +5855,46 @@ "InstanceType": "m6i.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "m6idn.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 a4a211189..3ed6b1a66 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 @@ -691,6 +691,10 @@ "InstanceType": "g5.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "i2.2xlarge", "Location": "apse2-az1" 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 e0980b914..c6c399bc2 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 @@ -3135,6 +3135,22 @@ "InstanceType": "inf1.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "is4gen.2xlarge", "Location": "euc1-az2" @@ -5399,6 +5415,22 @@ "InstanceType": "inf1.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "is4gen.2xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index 506eeafb9..e86823f46 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 @@ -1943,6 +1943,22 @@ "InstanceType": "hpc6id.32xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "hpc7a.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "hpc7a.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "hpc7a.48xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "hpc7a.96xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "eun1-az2" 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 9f875ae60..27e5fa4d3 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 @@ -1067,6 +1067,22 @@ "InstanceType": "inf1.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "euw1-az1" @@ -3971,6 +3987,22 @@ "InstanceType": "inf1.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "is4gen.2xlarge", "Location": "euw1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index 9440e905d..530e409dd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json @@ -759,6 +759,42 @@ "InstanceType": "m6i.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "euw3-az1" @@ -3335,6 +3371,42 @@ "InstanceType": "m6i.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "euw3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json index 7f470b56c..d8f713042 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json @@ -563,6 +563,42 @@ "InstanceType": "m6i.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "mes1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "mes1-az1" @@ -1375,6 +1411,42 @@ "InstanceType": "m6i.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "mes1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "mes1-az2" @@ -2187,6 +2259,42 @@ "InstanceType": "m6i.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "mes1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "mes1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index 08cd8c8ba..1458024e2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -1003,6 +1003,42 @@ "InstanceType": "m6i.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "sae1-az1" @@ -2439,6 +2475,42 @@ "InstanceType": "m6i.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "sae1-az2" @@ -3719,6 +3791,42 @@ "InstanceType": "m6i.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "r3.2xlarge", "Location": "sae1-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 99fd0a4a5..9efe4f6b2 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 @@ -9931,6 +9931,42 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "m7gd.12xlarge", "Location": "usw2-az4" @@ -10447,6 +10483,42 @@ "InstanceType": "r7a.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "r7gd.12xlarge", "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 2a0fc076c..6a58414ab 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 @@ -891,6 +891,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-northeast-1a" @@ -3391,6 +3407,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-northeast-1c" 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 d24d46565..49f96ee45 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 @@ -919,6 +919,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-northeast-2a" @@ -3787,6 +3827,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-northeast-2c" @@ -4871,6 +4951,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "ap-northeast-2d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json index fa2698f7f..1c2932dbc 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json @@ -2115,6 +2115,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "m6gd.12xlarge", "Location": "ap-northeast-3c" 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 37ac2336e..5d066c8df 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 @@ -671,6 +671,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-south-1a" @@ -1011,6 +1027,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-south-1a" @@ -2563,6 +2619,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "m4.10xlarge", "Location": "ap-south-1b" @@ -2879,6 +2951,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-south-1b" @@ -4679,6 +4791,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "m7g.12xlarge", "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 62da41c13..12e00d928 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 @@ -1291,6 +1291,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "m6idn.12xlarge", "Location": "ap-southeast-1a" @@ -3611,6 +3651,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "m6idn.12xlarge", "Location": "ap-southeast-1b" @@ -5347,6 +5427,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-southeast-1c" @@ -5759,6 +5855,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "m6idn.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 34f7fbbf8..ab0b70e7d 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 @@ -2871,6 +2871,10 @@ "InstanceType": "g5.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-2b" 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 022d71160..a86e8df7b 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 @@ -839,6 +839,22 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "is4gen.2xlarge", "Location": "eu-central-1a" @@ -3103,6 +3119,22 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "is4gen.2xlarge", "Location": "eu-central-1b" 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 9bdb5fb1a..620bf5347 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 @@ -1943,6 +1943,22 @@ "InstanceType": "hpc6id.32xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "hpc7a.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "hpc7a.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "hpc7a.48xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "hpc7a.96xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1b" 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 d45cdf3e1..1e19ed9bf 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 @@ -1067,6 +1067,22 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "is4gen.2xlarge", "Location": "eu-west-1a" @@ -3971,6 +3987,22 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "is4gen.2xlarge", "Location": "eu-west-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json index 0ee25a3d3..b3a9a8f42 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json @@ -759,6 +759,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-west-3a" @@ -3335,6 +3371,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-west-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json index b947fe005..3efabdc66 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json @@ -563,6 +563,42 @@ "InstanceType": "m6i.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "me-south-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1a" @@ -1375,6 +1411,42 @@ "InstanceType": "m6i.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "me-south-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1b" @@ -2187,6 +2259,42 @@ "InstanceType": "m6i.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "me-south-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index 739ff7ffd..430ac04fd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -1003,6 +1003,42 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "sa-east-1a" @@ -2439,6 +2475,42 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "sa-east-1b" @@ -3719,6 +3791,42 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "r3.2xlarge", "Location": "sa-east-1c" 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 6786f4e0b..bed140f06 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 @@ -9931,6 +9931,42 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "m7gd.12xlarge", "Location": "us-west-2d" @@ -10447,6 +10483,42 @@ "InstanceType": "r7a.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "r7gd.12xlarge", "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 cf7aa60fd..0221eea86 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 @@ -915,6 +915,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "is4gen.2xlarge", "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 bc91bbe28..9970cbf2b 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 @@ -919,6 +919,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "m7g.12xlarge", "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 376c02eeb..1911cc89d 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 @@ -695,6 +695,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-south-1" @@ -1035,6 +1051,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index 516b6625e..19c867075 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 @@ -811,6 +811,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-southeast-1" @@ -1295,6 +1311,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "m6idn.12xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index ff27350e5..f678dcdbb 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 @@ -691,6 +691,10 @@ "InstanceType": "g5.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "i2.2xlarge", "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 c69400608..f880a7b8c 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 @@ -907,6 +907,22 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "is4gen.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 3eba92127..ffe56efe6 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 @@ -511,6 +511,22 @@ "InstanceType": "hpc6id.32xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "hpc7a.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "hpc7a.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "hpc7a.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "hpc7a.96xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 7e3141f6b..854a410e1 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 @@ -1083,6 +1083,22 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json index f9d9a54fb..6d94c29b4 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json @@ -759,6 +759,42 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-west-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json index 38af8ac7a..85b55ca6e 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json @@ -607,6 +607,42 @@ "InstanceType": "m6i.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.large", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "me-south-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "me-south-1" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 7165cad0f..0a4524b79 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -1003,6 +1003,42 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "r3.2xlarge", "Location": "sa-east-1"