From e0997cdb5a5170799ade740348c9626778319025 Mon Sep 17 00:00:00 2001 From: bblommers Date: Sun, 18 Jun 2023 06:08:14 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings --- .../availability-zone-id/af-south-1.json | 96 +++++++ .../availability-zone-id/ap-northeast-2.json | 120 +++++++++ .../availability-zone-id/ap-south-1.json | 80 ++++++ .../availability-zone-id/ap-south-2.json | 4 + .../availability-zone-id/ap-southeast-1.json | 120 +++++++++ .../availability-zone-id/ca-central-1.json | 68 +++++ .../availability-zone-id/eu-west-2.json | 120 +++++++++ .../availability-zone-id/me-central-1.json | 240 ++++++++++++++++++ .../availability-zone-id/us-west-2.json | 12 + .../availability-zone/af-south-1.json | 96 +++++++ .../availability-zone/ap-northeast-2.json | 120 +++++++++ .../availability-zone/ap-south-1.json | 80 ++++++ .../availability-zone/ap-south-2.json | 4 + .../availability-zone/ap-southeast-1.json | 120 +++++++++ .../availability-zone/ca-central-1.json | 68 +++++ .../availability-zone/eu-west-2.json | 120 +++++++++ .../availability-zone/me-central-1.json | 240 ++++++++++++++++++ .../availability-zone/us-west-2.json | 12 + .../region/af-south-1.json | 32 +++ .../region/ap-northeast-2.json | 40 +++ .../region/ap-south-1.json | 40 +++ .../region/ap-south-2.json | 4 + .../region/ap-southeast-1.json | 40 +++ .../region/eu-west-2.json | 40 +++ .../region/me-central-1.json | 80 ++++++ .../region/us-west-2.json | 4 + 26 files changed, 2000 insertions(+) diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json index caf46a875..9936d9ba6 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json @@ -319,6 +319,38 @@ "InstanceType": "i3en.xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "afs1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "afs1-az1" @@ -1127,6 +1159,38 @@ "InstanceType": "i3en.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "afs1-az2" @@ -1971,6 +2035,38 @@ "InstanceType": "i3en.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "afs1-az3" 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 1dd1da8e6..e3d3fc13e 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 @@ -1231,6 +1231,46 @@ "InstanceType": "r6i.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "apne2-az1" @@ -2311,6 +2351,46 @@ "InstanceType": "r6i.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "apne2-az2" @@ -3571,6 +3651,46 @@ "InstanceType": "r6i.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "apne2-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 61138fd77..4107549de 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 @@ -2655,6 +2655,46 @@ "InstanceType": "r6i.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "aps1-az2" @@ -4095,6 +4135,46 @@ "InstanceType": "r6i.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json index 673696d52..87c5ac6d7 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json @@ -551,6 +551,10 @@ "InstanceType": "t4g.xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "x2idn.16xlarge", "Location": "aps2-az1" 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 1a25e15c0..b11c63ce7 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 @@ -1683,6 +1683,46 @@ "InstanceType": "r6i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "r6idn.12xlarge", "Location": "apse1-az1" @@ -3755,6 +3795,46 @@ "InstanceType": "r6i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "r6idn.12xlarge", "Location": "apse1-az2" @@ -5463,6 +5543,46 @@ "InstanceType": "r6i.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "apse1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json index 38b8956ed..549bec941 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json @@ -2543,6 +2543,42 @@ "InstanceType": "r6g.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "cac1-az2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "cac1-az2" @@ -3319,6 +3355,38 @@ "InstanceType": "m5.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "m5a.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "m5a.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "m5d.12xlarge", "Location": "cac1-az4" 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 a5ae0f0b7..aa65ae79f 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 @@ -1287,6 +1287,46 @@ "InstanceType": "r6i.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az1" @@ -2831,6 +2871,46 @@ "InstanceType": "r6i.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az2" @@ -4163,6 +4243,46 @@ "InstanceType": "r6i.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json index d76fbb6bc..2744c5e6e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json @@ -307,6 +307,46 @@ "InstanceType": "m6gd.xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "mec1-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "mec1-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "mec1-az1" @@ -415,6 +455,46 @@ "InstanceType": "r6g.xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "mec1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "mec1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "mec1-az1" @@ -779,6 +859,46 @@ "InstanceType": "m6gd.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "mec1-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "mec1-az2" @@ -887,6 +1007,46 @@ "InstanceType": "r6g.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "mec1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "mec1-az2" @@ -1251,6 +1411,46 @@ "InstanceType": "m6gd.xlarge", "Location": "mec1-az3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "mec1-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "mec1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "mec1-az3" @@ -1359,6 +1559,46 @@ "InstanceType": "r6g.xlarge", "Location": "mec1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "mec1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "mec1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "mec1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index c6f3a11f2..0c0fd7c95 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 @@ -2303,6 +2303,14 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "usw2-az1" @@ -8863,6 +8871,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "x2gd.12xlarge", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json index 9f89f523e..1ee36c6b0 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json @@ -319,6 +319,38 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "af-south-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "af-south-1a" @@ -1127,6 +1159,38 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "af-south-1b" @@ -1971,6 +2035,38 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "af-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 2b8923bf8..ab2fc9e18 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 @@ -1231,6 +1231,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2a" @@ -2311,6 +2351,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-northeast-2b" @@ -3571,6 +3651,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2c" 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 d9ba4108d..075b61fbf 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 @@ -2799,6 +2799,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1b" @@ -4207,6 +4247,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json index 24d1fec24..c38d36825 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json @@ -551,6 +551,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "x2idn.16xlarge", "Location": "ap-south-2a" 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 df82c752c..1f59fd1e7 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 @@ -1747,6 +1747,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "r6idn.12xlarge", "Location": "ap-southeast-1a" @@ -3747,6 +3787,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "r6idn.12xlarge", "Location": "ap-southeast-1b" @@ -5463,6 +5543,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-southeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json index 0841ac703..787ba9f5d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json @@ -2543,6 +2543,42 @@ "InstanceType": "r6g.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "r6i.12xlarge", "Location": "ca-central-1b" @@ -3319,6 +3355,38 @@ "InstanceType": "m5.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "m5a.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m5a.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "m5d.12xlarge", "Location": "ca-central-1d" 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 6c1102417..ca5224b02 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 @@ -1347,6 +1347,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2a" @@ -2679,6 +2719,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2b" @@ -4163,6 +4243,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json index 6871959ef..af5601f7d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json @@ -307,6 +307,46 @@ "InstanceType": "m6gd.xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.large", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-central-1a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-central-1a" + }, { "InstanceType": "r5.12xlarge", "Location": "me-central-1a" @@ -415,6 +455,46 @@ "InstanceType": "r6g.xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-central-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-central-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "me-central-1a" @@ -779,6 +859,46 @@ "InstanceType": "m6gd.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.large", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-central-1b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "me-central-1b" @@ -887,6 +1007,46 @@ "InstanceType": "r6g.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-central-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "me-central-1b" @@ -1251,6 +1411,46 @@ "InstanceType": "m6gd.xlarge", "Location": "me-central-1c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.large", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-central-1c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-central-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "me-central-1c" @@ -1359,6 +1559,46 @@ "InstanceType": "r6g.xlarge", "Location": "me-central-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-central-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-central-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "me-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index 3755b40eb..90c7c9795 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 @@ -2303,6 +2303,14 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-west-2a" @@ -8863,6 +8871,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "x2gd.12xlarge", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json index df0db673f..57655627c 100644 --- a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json @@ -347,6 +347,38 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.large", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "af-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 6157f2831..596f7a012 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -1235,6 +1235,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index 9022227e1..fcf968a1f 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 @@ -1323,6 +1323,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json index 69f4aaf3c..1cd39f86a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json @@ -551,6 +551,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "x2idn.16xlarge", "Location": "ap-south-2" 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 250f01f75..c9ee52bbb 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 @@ -1751,6 +1751,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "r6idn.12xlarge", "Location": "ap-southeast-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 748a7da73..38195f09b 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 @@ -1347,6 +1347,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json index 43f03cabe..cb0424b04 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json @@ -307,6 +307,46 @@ "InstanceType": "m6gd.xlarge", "Location": "me-central-1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.large", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-central-1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-central-1" + }, { "InstanceType": "r5.12xlarge", "Location": "me-central-1" @@ -415,6 +455,46 @@ "InstanceType": "r6g.xlarge", "Location": "me-central-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.large", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-central-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-central-1" + }, { "InstanceType": "t3.2xlarge", "Location": "me-central-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 f5c2bd900..0e3b8236b 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 @@ -2343,6 +2343,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "us-west-2" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "us-west-2" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-west-2"