From efe0014b8625bc1af2b3c50c0789b677435ae557 Mon Sep 17 00:00:00 2001 From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com> Date: Sun, 12 Jul 2026 07:08:30 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings --- .../availability-zone-id/ap-northeast-1.json | 576 ++++++++++++++++ .../availability-zone-id/ap-northeast-2.json | 48 ++ .../availability-zone-id/ap-northeast-3.json | 96 +++ .../availability-zone-id/ap-south-1.json | 436 ++++++++++++ .../availability-zone-id/ap-southeast-1.json | 96 +++ .../availability-zone-id/eu-central-1.json | 624 ++++++++++++++++++ .../availability-zone-id/eu-north-1.json | 356 ++++++++++ .../availability-zone-id/eu-west-1.json | 492 ++++++++++++++ .../availability-zone-id/eu-west-2.json | 208 ++++++ .../availability-zone-id/eu-west-3.json | 380 +++++++++++ .../availability-zone-id/us-east-1.json | 204 +++++- .../availability-zone-id/us-east-2.json | 44 ++ .../availability-zone-id/us-west-2.json | 28 +- .../availability-zone/ap-northeast-1.json | 576 ++++++++++++++++ .../availability-zone/ap-northeast-2.json | 48 ++ .../availability-zone/ap-northeast-3.json | 96 +++ .../availability-zone/ap-south-1.json | 436 ++++++++++++ .../availability-zone/ap-southeast-1.json | 96 +++ .../availability-zone/eu-central-1.json | 624 ++++++++++++++++++ .../availability-zone/eu-north-1.json | 356 ++++++++++ .../availability-zone/eu-west-1.json | 492 ++++++++++++++ .../availability-zone/eu-west-2.json | 208 ++++++ .../availability-zone/eu-west-3.json | 380 +++++++++++ .../availability-zone/us-east-1.json | 204 +++++- .../availability-zone/us-east-2.json | 44 ++ .../availability-zone/us-west-2.json | 28 +- .../region/ap-northeast-1.json | 176 +++++ .../region/ap-northeast-3.json | 48 ++ .../region/ap-south-1.json | 148 +++++ .../region/ap-southeast-1.json | 48 ++ .../region/eu-central-1.json | 176 +++++ .../region/eu-north-1.json | 152 +++++ .../region/eu-west-1.json | 176 +++++ .../region/eu-west-2.json | 104 +++ .../region/eu-west-3.json | 144 ++++ .../region/us-east-1.json | 28 +- .../region/us-west-2.json | 4 - 37 files changed, 8356 insertions(+), 24 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 c7d1b62b003c..9010b5c6b661 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 @@ -3547,6 +3547,54 @@ "InstanceType": "r7iz.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "r8g.12xlarge", "Location": "apne1-az1" @@ -3723,6 +3771,50 @@ "InstanceType": "r8i.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "r8id.12xlarge", "Location": "apne1-az1" @@ -3775,6 +3867,138 @@ "InstanceType": "r8id.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "t1.micro", "Location": "apne1-az1" @@ -7595,6 +7819,50 @@ "InstanceType": "r8i.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r8id.12xlarge", "Location": "apne1-az2" @@ -7647,6 +7915,138 @@ "InstanceType": "r8id.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apne1-az2" @@ -11763,6 +12163,50 @@ "InstanceType": "r8i.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "r8id.12xlarge", "Location": "apne1-az4" @@ -11815,6 +12259,138 @@ "InstanceType": "r8id.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "t1.micro", "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 c7e76e3c1773..6b8d731bc77c 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 @@ -6239,6 +6239,50 @@ "InstanceType": "i7i.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "i7ie.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.18xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.3xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.48xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.6xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.metal-24xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.metal-48xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "i7ie.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "i8g.12xlarge", "Location": "apne2-az3" @@ -7739,6 +7783,10 @@ "InstanceType": "u7i-6tb.112xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "u7in-24tb.224xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "x1.16xlarge", "Location": "apne2-az3" 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 be109730a1e4..4165d356677c 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 @@ -1379,6 +1379,54 @@ "InstanceType": "r8g.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "apne3-az1" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "apne3-az1" @@ -4259,6 +4307,54 @@ "InstanceType": "r8g.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "apne3-az3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "apne3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json index 1d3ab61017d6..83a44a9e6aa2 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 @@ -691,6 +691,58 @@ "InstanceType": "c8i.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az1" @@ -1919,6 +1971,54 @@ "InstanceType": "m8g.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "aps1-az1" @@ -2595,6 +2695,54 @@ "InstanceType": "r8g.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "aps1-az1" @@ -3903,6 +4051,50 @@ "InstanceType": "i7i.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "i7ie.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.18xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.3xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.6xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.metal-24xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.metal-48xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "i7ie.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "i8g.12xlarge", "Location": "aps1-az2" @@ -4707,6 +4899,54 @@ "InstanceType": "m8g.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "aps1-az2" @@ -5339,6 +5579,54 @@ "InstanceType": "r8g.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "aps1-az2" @@ -6259,6 +6547,58 @@ "InstanceType": "c8i.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az3" @@ -7463,6 +7803,54 @@ "InstanceType": "m8g.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "aps1-az3" @@ -8135,6 +8523,54 @@ "InstanceType": "r8g.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "r8i-flex.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 bc056ee42745..1e32f7d085bb 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 @@ -6339,6 +6339,54 @@ "InstanceType": "r8g.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.medium", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "apse1-az2" @@ -9463,6 +9511,54 @@ "InstanceType": "r8g.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "apse1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index d004e0e7ae26..12500f509ac0 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 @@ -643,6 +643,54 @@ "InstanceType": "c7i.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "c8g.12xlarge", "Location": "euc1-az1" @@ -3451,6 +3499,54 @@ "InstanceType": "r7iz.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "r8g.12xlarge", "Location": "euc1-az1" @@ -3627,6 +3723,50 @@ "InstanceType": "r8i.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "r8id.12xlarge", "Location": "euc1-az1" @@ -3679,6 +3819,138 @@ "InstanceType": "r8id.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -7915,6 +8187,50 @@ "InstanceType": "r8i.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "r8id.12xlarge", "Location": "euc1-az2" @@ -7967,6 +8283,138 @@ "InstanceType": "r8id.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" @@ -12223,6 +12671,50 @@ "InstanceType": "r8i.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "r8id.12xlarge", "Location": "euc1-az3" @@ -12275,6 +12767,138 @@ "InstanceType": "r8id.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.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 c9c656709bf1..0ffe154ea9a8 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 @@ -647,6 +647,58 @@ "InstanceType": "c8i.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az1" @@ -1591,6 +1643,58 @@ "InstanceType": "m8g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eun1-az1" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "mac1.metal", "Location": "eun1-az1" @@ -4531,6 +4635,54 @@ "InstanceType": "r8g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az2" @@ -5355,6 +5507,110 @@ "InstanceType": "c8gn.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "c8i.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.96xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.metal-48xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.metal-96xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8i.xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az3" @@ -6223,6 +6479,58 @@ "InstanceType": "m8g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "p4d.24xlarge", "Location": "eun1-az3" @@ -6783,6 +7091,54 @@ "InstanceType": "r8g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-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 b5b101912cba..526f8672e0d0 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 @@ -3711,6 +3711,94 @@ "InstanceType": "r8i.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "t1.micro", "Location": "euw1-az1" @@ -7795,6 +7883,182 @@ "InstanceType": "r8i.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "t1.micro", "Location": "euw1-az2" @@ -10539,6 +10803,54 @@ "InstanceType": "m7i.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "m8a.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.metal-24xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.metal-48xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8a.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "m8azn.12xlarge", "Location": "euw1-az3" @@ -11779,6 +12091,182 @@ "InstanceType": "r8i.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "t1.micro", "Location": "euw1-az3" @@ -11907,6 +12395,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "u7i-12tb.224xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "u7i-8tb.112xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index f08915bcf530..6b9dcf8bb689 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json @@ -1991,6 +1991,58 @@ "InstanceType": "m8i.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw2-az1" @@ -2723,6 +2775,58 @@ "InstanceType": "r8i.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "r8id.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.96xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.metal-48xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.metal-96xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "r8id.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az1" @@ -4963,6 +5067,58 @@ "InstanceType": "m8i.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "euw2-az2" @@ -8575,6 +8731,58 @@ "InstanceType": "r8i.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "r8id.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.96xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.metal-48xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.metal-96xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "r8id.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az3" 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 507f43768138..c9df9de9a6c1 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 @@ -447,6 +447,54 @@ "InstanceType": "c7i.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.medium", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "euw3-az1" @@ -1383,6 +1431,54 @@ "InstanceType": "m8g.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.medium", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "euw3-az1" @@ -2759,6 +2855,54 @@ "InstanceType": "c7i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "euw3-az2" @@ -3079,6 +3223,50 @@ "InstanceType": "i7i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "i7ie.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.18xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.3xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.48xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.6xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.metal-24xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.metal-48xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "i7ie.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "i8ge.12xlarge", "Location": "euw3-az2" @@ -3671,6 +3859,54 @@ "InstanceType": "m8g.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "euw3-az2" @@ -4259,6 +4495,54 @@ "InstanceType": "r8g.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "euw3-az2" @@ -5023,6 +5307,54 @@ "InstanceType": "c7i.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "euw3-az3" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "euw3-az3" @@ -6547,6 +6879,54 @@ "InstanceType": "r8g.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "euw3-az3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "euw3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 97063a724b10..6f22384fb225 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 @@ -1063,6 +1063,30 @@ "InstanceType": "c8in.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8ine.large", + "Location": "use1-az1" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "c9g.12xlarge", "Location": "use1-az1" @@ -1403,6 +1427,30 @@ "InstanceType": "g6f.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "g7.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "use1-az1" + }, { "InstanceType": "gr6.4xlarge", "Location": "use1-az1" @@ -2871,6 +2919,134 @@ "InstanceType": "m8id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m8idn.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.96xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.metal-96xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m8idn.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.metal-96xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8ine.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "m9g.12xlarge", "Location": "use1-az1" @@ -5899,10 +6075,6 @@ "InstanceType": "d3en.xlarge", "Location": "use1-az2" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "use1-az2" - }, { "InstanceType": "f2.12xlarge", "Location": "use1-az2" @@ -6099,6 +6271,30 @@ "InstanceType": "g6f.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "g7.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "use1-az2" + }, { "InstanceType": "g7e.12xlarge", "Location": "use1-az2" 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 459e34c1b4b8..02394d404aed 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 @@ -1019,6 +1019,50 @@ "InstanceType": "c8id.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "c8in.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.96xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.large", + "Location": "use2-az1" + }, + { + "InstanceType": "c8in.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "c9g.12xlarge", "Location": "use2-az1" 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 8e539593a7c0..59d8fcfc7849 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 @@ -1327,10 +1327,6 @@ "InstanceType": "d3en.xlarge", "Location": "usw2-az1" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "usw2-az1" - }, { "InstanceType": "f2.12xlarge", "Location": "usw2-az1" @@ -16779,6 +16775,30 @@ "InstanceType": "c8in.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8ine.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "c9g.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 5df73365aa80..d53eaf7099a2 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 @@ -3827,6 +3827,50 @@ "InstanceType": "r8i.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r8id.12xlarge", "Location": "ap-northeast-1a" @@ -3879,6 +3923,138 @@ "InstanceType": "r8id.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1a" @@ -7703,6 +7879,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r8g.12xlarge", "Location": "ap-northeast-1c" @@ -7879,6 +8103,50 @@ "InstanceType": "r8i.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r8id.12xlarge", "Location": "ap-northeast-1c" @@ -7931,6 +8199,138 @@ "InstanceType": "r8id.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1c" @@ -11751,6 +12151,50 @@ "InstanceType": "r8i.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r8id.12xlarge", "Location": "ap-northeast-1d" @@ -11803,6 +12247,138 @@ "InstanceType": "r8id.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 7ffb60467534..377108e48908 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 @@ -6239,6 +6239,50 @@ "InstanceType": "i7i.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "i7ie.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.18xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.3xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.48xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.6xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.metal-24xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.metal-48xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i7ie.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "i8g.12xlarge", "Location": "ap-northeast-2c" @@ -7739,6 +7783,10 @@ "InstanceType": "u7i-6tb.112xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "u7in-24tb.224xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "x1.16xlarge", "Location": "ap-northeast-2c" 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 58250278542c..cd7b4acf5a03 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 @@ -1319,6 +1319,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-3a" @@ -2863,6 +2911,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-northeast-3b" 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 06a72195d65f..16d8d31a9891 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 @@ -691,6 +691,58 @@ "InstanceType": "c8i.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1a" @@ -1919,6 +1971,54 @@ "InstanceType": "m8g.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "ap-south-1a" @@ -2595,6 +2695,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "ap-south-1a" @@ -3723,6 +3871,58 @@ "InstanceType": "c8i.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1b" @@ -4927,6 +5127,54 @@ "InstanceType": "m8g.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "ap-south-1b" @@ -5599,6 +5847,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "ap-south-1b" @@ -6875,6 +7171,50 @@ "InstanceType": "i7i.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "i7ie.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.18xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.3xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.6xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.metal-24xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.metal-48xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "i7ie.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "i8g.12xlarge", "Location": "ap-south-1c" @@ -7679,6 +8019,54 @@ "InstanceType": "m8g.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "ap-south-1c" @@ -8311,6 +8699,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "r8i-flex.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 f5daffc10d74..2fb2f50926d7 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 @@ -2999,6 +2999,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "ap-southeast-1a" @@ -9463,6 +9511,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "ap-southeast-1c" 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 a011df02a03c..23427cae4ba0 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 @@ -3879,6 +3879,50 @@ "InstanceType": "r8i.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "r8id.12xlarge", "Location": "eu-central-1a" @@ -3931,6 +3975,138 @@ "InstanceType": "r8id.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" @@ -8187,6 +8363,50 @@ "InstanceType": "r8i.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "r8id.12xlarge", "Location": "eu-central-1b" @@ -8239,6 +8459,138 @@ "InstanceType": "r8id.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -9239,6 +9591,54 @@ "InstanceType": "c7i.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "c8g.12xlarge", "Location": "eu-central-1c" @@ -12047,6 +12447,54 @@ "InstanceType": "r7iz.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "r8g.12xlarge", "Location": "eu-central-1c" @@ -12223,6 +12671,50 @@ "InstanceType": "r8i.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "r8id.12xlarge", "Location": "eu-central-1c" @@ -12275,6 +12767,138 @@ "InstanceType": "r8id.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index f326e917c1e5..cda446328056 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 @@ -647,6 +647,58 @@ "InstanceType": "c8i.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1a" @@ -1591,6 +1643,58 @@ "InstanceType": "m8g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1a" @@ -4531,6 +4635,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1b" @@ -5355,6 +5507,110 @@ "InstanceType": "c8gn.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "c8i.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.96xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.metal-48xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.metal-96xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8i.xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1c" @@ -6223,6 +6479,58 @@ "InstanceType": "m8g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "p4d.24xlarge", "Location": "eu-north-1c" @@ -6783,6 +7091,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1c" 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 77b0a39a415d..02ddcbda9290 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 @@ -3655,6 +3655,182 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1a" @@ -6399,6 +6575,54 @@ "InstanceType": "m7i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "m8a.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.metal-24xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.metal-48xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8a.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "m8azn.12xlarge", "Location": "eu-west-1b" @@ -7639,6 +7863,182 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1b" @@ -7767,6 +8167,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "u7i-12tb.224xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "u7i-8tb.112xlarge", "Location": "eu-west-1b" @@ -11687,6 +12091,94 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index eb297ceaf031..1de9fa63f3b0 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json @@ -2027,6 +2027,58 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2a" @@ -5639,6 +5691,58 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "r8id.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.96xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.metal-48xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.metal-96xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r8id.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2b" @@ -7835,6 +7939,58 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2c" @@ -8567,6 +8723,58 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "r8id.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.96xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.metal-48xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.metal-96xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r8id.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json index 0d3e2125616b..04a8a5e6c3f2 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 @@ -447,6 +447,54 @@ "InstanceType": "c7i.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.medium", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "eu-west-3a" @@ -1383,6 +1431,54 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.medium", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "eu-west-3a" @@ -2759,6 +2855,54 @@ "InstanceType": "c7i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "eu-west-3b" @@ -3079,6 +3223,50 @@ "InstanceType": "i7i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "i7ie.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.18xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.3xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.48xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.6xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.metal-24xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.metal-48xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i7ie.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "i8ge.12xlarge", "Location": "eu-west-3b" @@ -3671,6 +3859,54 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "eu-west-3b" @@ -4259,6 +4495,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "eu-west-3b" @@ -5023,6 +5307,54 @@ "InstanceType": "c7i.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "eu-west-3c" @@ -6547,6 +6879,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "eu-west-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 3f4330758bfa..1d601af4da60 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 @@ -6347,6 +6347,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "c9g.12xlarge", "Location": "us-east-1b" @@ -6687,6 +6711,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "gr6.4xlarge", "Location": "us-east-1b" @@ -8155,6 +8203,134 @@ "InstanceType": "m8id.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "m8idn.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.96xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.metal-48xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.metal-96xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8idn.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.96xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.metal-48xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.metal-96xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8in.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8ine.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8ine.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8ine.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8ine.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8ine.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m8ine.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "m9g.12xlarge", "Location": "us-east-1b" @@ -11183,10 +11359,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1c" @@ -11383,6 +11555,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-east-1c" 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 5a4299997e7b..b524879ab543 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 @@ -1019,6 +1019,50 @@ "InstanceType": "c8id.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "c8in.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.96xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "c8in.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "c9g.12xlarge", "Location": "us-east-2a" 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 9f073db090f2..ad3e757d2b56 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 @@ -6575,10 +6575,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-west-2b" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "us-west-2b" - }, { "InstanceType": "f2.12xlarge", "Location": "us-west-2b" @@ -16779,6 +16775,30 @@ "InstanceType": "c8in.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "c8ine.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8ine.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8ine.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8ine.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8ine.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8ine.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "c9g.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 ec2ee3f1e237..c37a99565c3c 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 @@ -3867,6 +3867,50 @@ "InstanceType": "r8i.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "r8id.12xlarge", "Location": "ap-northeast-1" @@ -3919,6 +3963,138 @@ "InstanceType": "r8id.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json index 27536477ebe9..2ec8adc5ef69 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json @@ -1459,6 +1459,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-3" 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 ed1a9d745fcc..19bd33b01b42 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 @@ -715,6 +715,58 @@ "InstanceType": "c8i.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1" @@ -1943,6 +1995,54 @@ "InstanceType": "m8g.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "ap-south-1" @@ -2623,6 +2723,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "r8i-flex.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 157951c129fd..5f836cfa1973 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 @@ -3003,6 +3003,54 @@ "InstanceType": "r8g.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.medium", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "r8i-flex.12xlarge", "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 2de19c9941e4..fff2143466ad 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 @@ -3947,6 +3947,50 @@ "InstanceType": "r8i.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "r8id.12xlarge", "Location": "eu-central-1" @@ -3999,6 +4043,138 @@ "InstanceType": "r8id.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.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 554f0caa95aa..db0f99615fcd 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 @@ -647,6 +647,58 @@ "InstanceType": "c8i.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "c8id.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.96xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.metal-48xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.metal-96xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "c8id.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1" @@ -1651,6 +1703,58 @@ "InstanceType": "m8g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1" @@ -2255,6 +2359,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "t3.2xlarge", "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 8419bfb75a2d..1442d2f1ff1e 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 @@ -3731,6 +3731,182 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.96xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idb.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.96xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8idn.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 21bb7f717949..cea1cb1aef4a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -2107,6 +2107,58 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "m8id.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.96xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.metal-48xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.metal-96xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8id.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2" @@ -2847,6 +2899,58 @@ "InstanceType": "r8i.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "r8id.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.96xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.metal-48xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.metal-96xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "r8id.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2" 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 8e3252bddeb3..5986d6e4f87b 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 @@ -487,6 +487,54 @@ "InstanceType": "c7i.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "eu-west-3" @@ -1479,6 +1527,54 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "m8i-flex.12xlarge", "Location": "eu-west-3" @@ -2067,6 +2163,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "eu-west-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index 5b2c47f1d25d..6d64838bedf0 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json @@ -1375,10 +1375,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "us-east-1" - }, { "InstanceType": "f2.12xlarge", "Location": "us-east-1" @@ -1575,6 +1571,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-1" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index ab95690b1588..177e8e8512bb 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json @@ -1351,10 +1351,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-west-2" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "us-west-2" - }, { "InstanceType": "dl2q.24xlarge", "Location": "us-west-2"