From 32e45be8f360f253583994dae7faea8a9ac83e79 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 08:14:38 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#6963) --- .../availability-zone-id/af-south-1.json | 24 +++ .../availability-zone-id/ap-east-1.json | 24 +++ .../availability-zone-id/ap-northeast-1.json | 56 +++++++ .../availability-zone-id/ap-northeast-2.json | 144 ++++++++++++++++++ .../availability-zone-id/ap-northeast-3.json | 24 +++ .../availability-zone-id/ap-south-1.json | 24 +++ .../availability-zone-id/ap-south-2.json | 24 +++ .../availability-zone-id/ap-southeast-1.json | 24 +++ .../availability-zone-id/ap-southeast-2.json | 104 +++++++++++++ .../availability-zone-id/ap-southeast-3.json | 24 +++ .../availability-zone-id/ca-central-1.json | 24 +++ .../availability-zone-id/eu-central-1.json | 24 +++ .../availability-zone-id/eu-central-2.json | 24 +++ .../availability-zone-id/eu-north-1.json | 24 +++ .../availability-zone-id/eu-south-1.json | 24 +++ .../availability-zone-id/eu-west-1.json | 24 +++ .../availability-zone-id/eu-west-2.json | 16 ++ .../availability-zone-id/eu-west-3.json | 24 +++ .../availability-zone-id/me-central-1.json | 24 +++ .../availability-zone-id/me-south-1.json | 24 +++ .../availability-zone-id/sa-east-1.json | 24 +++ .../availability-zone-id/us-east-1.json | 40 +++++ .../availability-zone-id/us-east-2.json | 32 ++++ .../availability-zone-id/us-west-1.json | 16 ++ .../availability-zone-id/us-west-2.json | 32 ++++ .../availability-zone/af-south-1.json | 24 +++ .../availability-zone/ap-east-1.json | 24 +++ .../availability-zone/ap-northeast-1.json | 56 +++++++ .../availability-zone/ap-northeast-2.json | 144 ++++++++++++++++++ .../availability-zone/ap-northeast-3.json | 24 +++ .../availability-zone/ap-south-1.json | 24 +++ .../availability-zone/ap-south-2.json | 24 +++ .../availability-zone/ap-southeast-1.json | 24 +++ .../availability-zone/ap-southeast-2.json | 104 +++++++++++++ .../availability-zone/ap-southeast-3.json | 24 +++ .../availability-zone/ca-central-1.json | 24 +++ .../availability-zone/eu-central-1.json | 24 +++ .../availability-zone/eu-central-2.json | 24 +++ .../availability-zone/eu-north-1.json | 24 +++ .../availability-zone/eu-south-1.json | 24 +++ .../availability-zone/eu-west-1.json | 24 +++ .../availability-zone/eu-west-2.json | 16 ++ .../availability-zone/eu-west-3.json | 24 +++ .../availability-zone/me-central-1.json | 24 +++ .../availability-zone/me-south-1.json | 24 +++ .../availability-zone/sa-east-1.json | 24 +++ .../availability-zone/us-east-1.json | 40 +++++ .../availability-zone/us-east-2.json | 32 ++++ .../availability-zone/us-west-1.json | 16 ++ .../availability-zone/us-west-2.json | 32 ++++ .../region/af-south-1.json | 8 + .../region/ap-east-1.json | 8 + .../region/ap-northeast-1.json | 8 + .../region/ap-northeast-2.json | 48 ++++++ .../region/ap-northeast-3.json | 8 + .../region/ap-south-1.json | 8 + .../region/ap-south-2.json | 8 + .../region/ap-southeast-1.json | 8 + .../region/ap-southeast-2.json | 8 + .../region/ap-southeast-3.json | 8 + .../region/ca-central-1.json | 8 + .../region/eu-central-1.json | 8 + .../region/eu-central-2.json | 8 + .../region/eu-north-1.json | 8 + .../region/eu-south-1.json | 8 + .../region/eu-west-1.json | 8 + .../region/eu-west-2.json | 8 + .../region/eu-west-3.json | 8 + .../region/me-central-1.json | 8 + .../region/me-south-1.json | 8 + .../region/sa-east-1.json | 8 + .../region/us-east-1.json | 12 ++ .../region/us-east-2.json | 12 ++ .../region/us-west-1.json | 8 + .../region/us-west-2.json | 8 + 75 files changed, 1944 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 6d29808c7..0752a78b1 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,10 +319,18 @@ "InstanceType": "i3en.xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "afs1-az1" @@ -1243,10 +1251,18 @@ "InstanceType": "i3en.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "afs1-az2" @@ -2167,10 +2183,18 @@ "InstanceType": "i3en.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "afs1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json index 93918971f..48606f946 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json @@ -331,10 +331,18 @@ "InstanceType": "i3en.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "ape1-az1" @@ -1091,10 +1099,18 @@ "InstanceType": "i3en.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "ape1-az2" @@ -1867,10 +1883,18 @@ "InstanceType": "i3en.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "ape1-az3" 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 983428c97..00cce5553 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 @@ -767,10 +767,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne1-az1" @@ -1475,6 +1483,38 @@ "InstanceType": "m7g.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -2903,10 +2943,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne1-az2" @@ -5155,10 +5203,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index df649bf5e..b0010211b 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 @@ -295,6 +295,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az1" @@ -487,10 +527,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne2-az1" @@ -1811,6 +1859,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az2" @@ -1915,10 +2003,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne2-az2" @@ -2827,6 +2923,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az3" @@ -2987,10 +3123,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "i4i.2xlarge", "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 9a623898d..d90ee859b 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 @@ -331,10 +331,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne3-az1" @@ -1167,10 +1175,18 @@ "InstanceType": "i3en.xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "apne3-az2" @@ -1931,10 +1947,18 @@ "InstanceType": "i3.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "i4i.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 484cdab19..408e01623 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 @@ -575,10 +575,18 @@ "InstanceType": "i3en.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "aps1-az1" @@ -2231,10 +2239,18 @@ "InstanceType": "i3en.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "aps1-az2" @@ -3767,10 +3783,18 @@ "InstanceType": "i3en.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "i4i.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 bc4195ba1..a7fcf328f 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 @@ -203,10 +203,18 @@ "InstanceType": "i3en.xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "aps2-az1" @@ -923,10 +931,18 @@ "InstanceType": "i3en.xlarge", "Location": "aps2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "aps2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "aps2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "aps2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "aps2-az2" @@ -1639,10 +1655,18 @@ "InstanceType": "i3en.xlarge", "Location": "aps2-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "aps2-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "aps2-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "aps2-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "aps2-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 0c0011375..3344f0748 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 @@ -699,10 +699,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse1-az1" @@ -3039,10 +3047,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse1-az2" @@ -5251,10 +5267,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index 09e375be5..2cdff9b7d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json @@ -767,10 +767,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse2-az1" @@ -1291,6 +1299,86 @@ "InstanceType": "m6id.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "apse2-az1" @@ -2803,10 +2891,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse2-az2" @@ -4835,10 +4931,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json index 4fc830c02..ef133cc94 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json @@ -299,10 +299,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse3-az1" @@ -1031,10 +1039,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse3-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse3-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse3-az2" @@ -1747,10 +1763,18 @@ "InstanceType": "i3en.xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "apse3-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 d062fb0b1..71e5d0990 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 @@ -583,10 +583,18 @@ "InstanceType": "i4g.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "cac1-az1" @@ -2123,10 +2131,18 @@ "InstanceType": "i4g.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "cac1-az2" @@ -3555,10 +3571,18 @@ "InstanceType": "i4g.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "i4i.16xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "i4i.2xlarge", "Location": "cac1-az4" 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 93c350dd9..ed208c7dd 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 @@ -727,10 +727,18 @@ "InstanceType": "i3en.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "euc1-az1" @@ -2979,10 +2987,18 @@ "InstanceType": "i3en.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "euc1-az2" @@ -5171,10 +5187,18 @@ "InstanceType": "i3en.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json index 23282c50f..fe30a9e04 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json @@ -239,10 +239,18 @@ "InstanceType": "i3en.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "euc2-az1" @@ -963,10 +971,18 @@ "InstanceType": "i3en.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "euc2-az2" @@ -1651,10 +1667,18 @@ "InstanceType": "i3en.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "euc2-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 58c2196ef..ef3cb4557 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 @@ -455,10 +455,18 @@ "InstanceType": "i3en.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "eun1-az1" @@ -1763,10 +1771,18 @@ "InstanceType": "i3en.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "eun1-az2" @@ -3083,10 +3099,18 @@ "InstanceType": "i3en.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "eun1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json index 1269a2aa7..9bdf2ca3f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json @@ -387,10 +387,18 @@ "InstanceType": "i3en.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "eus1-az1" @@ -1507,10 +1515,18 @@ "InstanceType": "i3en.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "eus1-az2" @@ -2583,10 +2599,18 @@ "InstanceType": "i3en.xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "eus1-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 cdc0c748d..796294cc6 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 @@ -979,10 +979,18 @@ "InstanceType": "i4g.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw1-az1" @@ -3851,10 +3859,18 @@ "InstanceType": "i4g.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw1-az2" @@ -6715,10 +6731,18 @@ "InstanceType": "i4g.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "i4i.2xlarge", "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 bb4a823ba..f60376835 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 @@ -567,10 +567,18 @@ "InstanceType": "i3en.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw2-az1" @@ -2179,10 +2187,18 @@ "InstanceType": "i3en.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index dcf55839f..2e7c74c8e 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 @@ -407,10 +407,18 @@ "InstanceType": "i3en.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw3-az1" @@ -1647,10 +1655,18 @@ "InstanceType": "i3en.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw3-az2" @@ -2903,10 +2919,18 @@ "InstanceType": "i3en.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "euw3-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 dcba82c31..ed70ce266 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json @@ -235,10 +235,18 @@ "InstanceType": "i3en.xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "mec1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "mec1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "mec1-az1" @@ -907,10 +915,18 @@ "InstanceType": "i3en.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "mec1-az2" @@ -1547,10 +1563,18 @@ "InstanceType": "i3en.xlarge", "Location": "mec1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "mec1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "mec1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "mec1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "mec1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json index 12d34d0fa..7f470b56c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json @@ -375,10 +375,18 @@ "InstanceType": "i3en.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "mes1-az1" @@ -1163,10 +1171,18 @@ "InstanceType": "i3en.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "mes1-az2" @@ -1967,10 +1983,18 @@ "InstanceType": "i3en.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "mes1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index 3ecd06ba0..d88b9f252 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -559,10 +559,18 @@ "InstanceType": "i3en.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "sae1-az1" @@ -2087,10 +2095,18 @@ "InstanceType": "i3en.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "sae1-az2" @@ -3315,10 +3331,18 @@ "InstanceType": "i3en.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "sae1-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 686621d19..2471c2bb9 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 @@ -3119,10 +3119,18 @@ "InstanceType": "i4g.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "use1-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use1-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "use1-az2" @@ -6331,10 +6339,18 @@ "InstanceType": "i4g.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use1-az4" + }, { "InstanceType": "i4i.16xlarge", "Location": "use1-az4" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use1-az4" + }, { "InstanceType": "i4i.2xlarge", "Location": "use1-az4" @@ -7199,6 +7215,10 @@ "InstanceType": "mac1.metal", "Location": "use1-az4" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "use1-az4" + }, { "InstanceType": "mac2.metal", "Location": "use1-az4" @@ -9079,10 +9099,18 @@ "InstanceType": "i4g.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use1-az5" + }, { "InstanceType": "i4i.16xlarge", "Location": "use1-az5" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use1-az5" + }, { "InstanceType": "i4i.2xlarge", "Location": "use1-az5" @@ -11807,10 +11835,18 @@ "InstanceType": "i4g.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use1-az6" + }, { "InstanceType": "i4i.16xlarge", "Location": "use1-az6" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use1-az6" + }, { "InstanceType": "i4i.2xlarge", "Location": "use1-az6" @@ -12675,6 +12711,10 @@ "InstanceType": "mac1.metal", "Location": "use1-az6" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "use1-az6" + }, { "InstanceType": "mac2.metal", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index c69934872..f4c64ef0e 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 @@ -903,10 +903,18 @@ "InstanceType": "i4g.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "use2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "use2-az1" @@ -3619,10 +3627,18 @@ "InstanceType": "i4g.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "use2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "use2-az2" @@ -4443,6 +4459,10 @@ "InstanceType": "mac1.metal", "Location": "use2-az2" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "use2-az2" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "use2-az2" @@ -6319,10 +6339,18 @@ "InstanceType": "i4g.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "use2-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "use2-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "use2-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "use2-az3" @@ -7143,6 +7171,10 @@ "InstanceType": "mac1.metal", "Location": "use2-az3" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "use2-az3" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json index e710f2fc3..2ec5a39d0 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json @@ -535,10 +535,18 @@ "InstanceType": "i3en.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "usw1-az1" @@ -2143,10 +2151,18 @@ "InstanceType": "i3en.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "usw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index 772236eec..f348063cb 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 @@ -971,10 +971,18 @@ "InstanceType": "i4g.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "i4i.16xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "i4i.2xlarge", "Location": "usw2-az1" @@ -3887,10 +3895,18 @@ "InstanceType": "i4g.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "i4i.2xlarge", "Location": "usw2-az2" @@ -6775,10 +6791,18 @@ "InstanceType": "i4g.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "i4i.16xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "i4i.2xlarge", "Location": "usw2-az3" @@ -9395,10 +9419,18 @@ "InstanceType": "i3en.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "i4i.16xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "i4i.2xlarge", "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 be9db0cd6..8a3d379b5 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,10 +319,18 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "af-south-1a" @@ -1243,10 +1251,18 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "af-south-1b" @@ -2167,10 +2183,18 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "af-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json index 9b8bbaf45..d17d1733b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json @@ -331,10 +331,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-east-1a" @@ -1091,10 +1099,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-east-1b" @@ -1867,10 +1883,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-east-1c" 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 88bcee5ab..b5c81a49c 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 @@ -779,10 +779,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-1a" @@ -3195,10 +3203,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-1c" @@ -3903,6 +3919,38 @@ "InstanceType": "m7g.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -5331,10 +5379,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "i4i.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 5f3948912..9174966cd 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 @@ -295,6 +295,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2a" @@ -487,10 +527,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-2a" @@ -1811,6 +1859,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2b" @@ -1915,10 +2003,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-2b" @@ -2827,6 +2923,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2c" @@ -2987,10 +3123,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "i4i.2xlarge", "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 6bcb8a1c1..fa2698f7f 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 @@ -295,10 +295,18 @@ "InstanceType": "i3.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-3a" @@ -1151,10 +1159,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-3b" @@ -1987,10 +2003,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json index 6f092c522..a5ef41a21 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 @@ -575,10 +575,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-south-1a" @@ -2299,10 +2307,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-south-1b" @@ -3931,10 +3947,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "i4i.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 a9e2ef89d..c84473d4a 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 @@ -203,10 +203,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-south-2a" @@ -923,10 +931,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-2b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-2b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-2b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-2b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-south-2b" @@ -1639,10 +1655,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-2c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-south-2c" 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 355dd04ff..ce344dc77 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 @@ -727,10 +727,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-1a" @@ -3039,10 +3047,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-1b" @@ -5251,10 +5267,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index a3d80e62a..e286dfe45 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json @@ -699,10 +699,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-2a" @@ -2767,10 +2775,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-2b" @@ -3291,6 +3307,86 @@ "InstanceType": "m6id.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-southeast-2b" @@ -4803,10 +4899,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json index 12dac7a74..397ecf349 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json @@ -299,10 +299,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-3a" @@ -1031,10 +1039,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-3b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-3b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-3b" @@ -1747,10 +1763,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-3c" 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 316394cb6..4a63d5b2c 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 @@ -583,10 +583,18 @@ "InstanceType": "i4g.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "ca-central-1a" @@ -2123,10 +2131,18 @@ "InstanceType": "i4g.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "ca-central-1b" @@ -3555,10 +3571,18 @@ "InstanceType": "i4g.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "i4i.16xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "i4i.2xlarge", "Location": "ca-central-1d" 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 f63b514ad..2727e4d9f 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 @@ -759,10 +759,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-1a" @@ -2951,10 +2959,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-1b" @@ -5295,10 +5311,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json index b45ecbc40..6586f7484 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json @@ -239,10 +239,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-2a" @@ -963,10 +971,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-2b" @@ -1651,10 +1667,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-2c" 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 64f1bf887..effa72feb 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 @@ -455,10 +455,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-north-1a" @@ -1763,10 +1771,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-north-1b" @@ -3083,10 +3099,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-north-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json index 780f55cda..9e0a22983 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json @@ -387,10 +387,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-south-1a" @@ -1507,10 +1515,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-south-1b" @@ -2583,10 +2599,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-south-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 c4370910a..21ddda2be 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 @@ -979,10 +979,18 @@ "InstanceType": "i4g.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-1a" @@ -3851,10 +3859,18 @@ "InstanceType": "i4g.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-1b" @@ -6715,10 +6731,18 @@ "InstanceType": "i4g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "i4i.2xlarge", "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 c84f55844..177e19290 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 @@ -615,10 +615,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-2a" @@ -3647,10 +3655,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "i4i.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 2ee189f67..ca086598e 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 @@ -407,10 +407,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-3a" @@ -1647,10 +1655,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-3b" @@ -2903,10 +2919,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-3c" 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 0c0c499c5..348207dc1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json @@ -235,10 +235,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-central-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-central-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-central-1a" @@ -907,10 +915,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-central-1b" @@ -1547,10 +1563,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-central-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-central-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-central-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-central-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json index c83b2834b..b947fe005 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json @@ -375,10 +375,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-south-1a" @@ -1163,10 +1171,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-south-1b" @@ -1967,10 +1983,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index 2316684c2..e326e8968 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -559,10 +559,18 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "sa-east-1a" @@ -2087,10 +2095,18 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "sa-east-1b" @@ -3315,10 +3331,18 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "sa-east-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 6620a2949..72335c044 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 @@ -3119,10 +3119,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-1b" @@ -6075,10 +6083,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-1c" @@ -6943,6 +6959,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-1c" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-1c" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1c" @@ -9027,10 +9047,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-1d" @@ -9895,6 +9923,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-1d" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-1d" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1d" @@ -12059,10 +12091,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-1f" 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 9b5f3d1fe..d8a067c83 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 @@ -903,10 +903,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-2a" @@ -3619,10 +3627,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-2b" @@ -4443,6 +4459,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-2b" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-2b" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-east-2b" @@ -6319,10 +6339,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-2c" @@ -7143,6 +7171,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-2c" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-2c" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json index 2eb6fd51f..82068049d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json @@ -535,10 +535,18 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-1a" @@ -2143,10 +2151,18 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index 3decec766..64b7049d7 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 @@ -971,10 +971,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-2a" @@ -3887,10 +3895,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-2b" @@ -6775,10 +6791,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-2c" @@ -9395,10 +9419,18 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "i4i.2xlarge", "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 d9155230e..fcfc7e5f5 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,10 +347,18 @@ "InstanceType": "i3en.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "af-south-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "af-south-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "af-south-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "af-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json index 63a8e1024..0a981e6a2 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json @@ -331,10 +331,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-east-1" 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 175937dc4..12c9a724f 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 @@ -803,10 +803,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index f16ab3f10..d0a9d8de5 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 @@ -295,6 +295,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2" @@ -487,10 +527,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-northeast-2" 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 143a740cf..8ce6442c6 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 @@ -367,10 +367,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "i4i.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 6a3ff4e3b..73fe8ba56 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 @@ -607,10 +607,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "i4i.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 6c45d2a8e..081340a24 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 @@ -203,10 +203,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "i4i.2xlarge", "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 de6fff01a..516b6625e 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 @@ -731,10 +731,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index 99664bba4..8261026cf 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json @@ -767,10 +767,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json index 71d32bee0..68eaa0039 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json @@ -299,10 +299,18 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "i4i.16xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "i4i.2xlarge", "Location": "ap-southeast-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json index 3a437fbf6..a6041c789 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json @@ -587,10 +587,18 @@ "InstanceType": "i4g.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "ca-central-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 65fe42db5..da910af18 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 @@ -823,10 +823,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json index 1a3a5b6cb..042bf887f 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json @@ -239,10 +239,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-central-2" 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 4f2704534..49af3b1be 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 @@ -495,10 +495,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json index cf7d34107..f4f681a2d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json @@ -415,10 +415,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-south-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 52662c70a..388ea0e0c 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 @@ -995,10 +995,18 @@ "InstanceType": "i4g.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "i4i.2xlarge", "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 6cab6806f..65ffae7bb 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 @@ -615,10 +615,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "i4i.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 2279361c3..1d26786d9 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 @@ -407,10 +407,18 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "i4i.16xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "i4i.2xlarge", "Location": "eu-west-3" 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 a49432db4..5f9ecb962 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json @@ -235,10 +235,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-central-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-central-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-central-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-central-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json index 8e5f2be81..38af8ac7a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json @@ -403,10 +403,18 @@ "InstanceType": "i3en.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "me-south-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "me-south-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "me-south-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "me-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index c702b2de7..7165cad0f 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -559,10 +559,18 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "sa-east-1" 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 16fb27780..e88063519 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 @@ -1007,10 +1007,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-1" @@ -1875,6 +1883,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-1" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-1" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index 958e637ab..4f8764c53 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json @@ -927,10 +927,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-east-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-east-2" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-east-2" @@ -1751,6 +1759,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-2" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-2" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index 9602ac8d6..68f3dc2f3 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json @@ -535,10 +535,18 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-1" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-1" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-1" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index a40a439a8..236a2f941 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 @@ -995,10 +995,18 @@ "InstanceType": "i4g.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "i4i.12xlarge", + "Location": "us-west-2" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-west-2" }, + { + "InstanceType": "i4i.24xlarge", + "Location": "us-west-2" + }, { "InstanceType": "i4i.2xlarge", "Location": "us-west-2"