From 7f1ab51fd05fe6b11e01816e19d630ad3d57c9b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:19:38 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#7213) --- .../availability-zone-id/ap-east-1.json | 108 +++++ .../availability-zone-id/ap-northeast-1.json | 372 ++++++++++++++ .../availability-zone-id/ap-northeast-2.json | 328 +++++++++++++ .../availability-zone-id/ap-south-1.json | 264 ++++++++++ .../availability-zone-id/ap-southeast-1.json | 456 ++++++++++++++++++ .../availability-zone-id/ap-southeast-2.json | 264 ++++++++++ .../availability-zone-id/ca-central-1.json | 340 +++++++++++++ .../availability-zone-id/eu-central-1.json | 132 +++++ .../availability-zone-id/eu-south-1.json | 108 +++++ .../availability-zone-id/eu-south-2.json | 120 +++++ .../availability-zone-id/eu-west-1.json | 120 +++++ .../availability-zone-id/eu-west-2.json | 176 +++++++ .../availability-zone-id/me-south-1.json | 108 +++++ .../availability-zone-id/sa-east-1.json | 80 +++ .../availability-zone-id/us-east-1.json | 184 +++++++ .../availability-zone-id/us-east-2.json | 120 +++++ .../availability-zone-id/us-west-1.json | 176 +++++++ .../availability-zone-id/us-west-2.json | 24 + .../availability-zone/ap-east-1.json | 108 +++++ .../availability-zone/ap-northeast-1.json | 372 ++++++++++++++ .../availability-zone/ap-northeast-2.json | 328 +++++++++++++ .../availability-zone/ap-south-1.json | 264 ++++++++++ .../availability-zone/ap-southeast-1.json | 456 ++++++++++++++++++ .../availability-zone/ap-southeast-2.json | 264 ++++++++++ .../availability-zone/ca-central-1.json | 340 +++++++++++++ .../availability-zone/eu-central-1.json | 132 +++++ .../availability-zone/eu-south-1.json | 108 +++++ .../availability-zone/eu-south-2.json | 120 +++++ .../availability-zone/eu-west-1.json | 120 +++++ .../availability-zone/eu-west-2.json | 176 +++++++ .../availability-zone/me-south-1.json | 108 +++++ .../availability-zone/sa-east-1.json | 80 +++ .../availability-zone/us-east-1.json | 184 +++++++ .../availability-zone/us-east-2.json | 120 +++++ .../availability-zone/us-west-1.json | 176 +++++++ .../availability-zone/us-west-2.json | 24 + .../region/ap-east-1.json | 36 ++ .../region/ap-northeast-1.json | 152 ++++++ .../region/ap-northeast-2.json | 88 ++++ .../region/ap-south-1.json | 88 ++++ .../region/ap-southeast-1.json | 152 ++++++ .../region/ap-southeast-2.json | 88 ++++ .../region/ca-central-1.json | 128 +++++ .../region/eu-central-1.json | 44 ++ .../region/eu-south-1.json | 36 ++ .../region/eu-south-2.json | 40 ++ .../region/eu-west-1.json | 40 ++ .../region/eu-west-2.json | 88 ++++ .../region/me-south-1.json | 36 ++ .../region/sa-east-1.json | 40 ++ .../region/us-east-2.json | 40 ++ .../region/us-west-1.json | 88 ++++ 52 files changed, 8144 insertions(+) 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 c3e292ff2..14e1bb545 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 @@ -519,6 +519,42 @@ "InstanceType": "m6g.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "m6i.12xlarge", "Location": "ape1-az1" @@ -1343,6 +1379,42 @@ "InstanceType": "m6g.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "m6i.12xlarge", "Location": "ape1-az2" @@ -2167,6 +2239,42 @@ "InstanceType": "m6g.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "m6i.12xlarge", "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 d87248695..db3be8416 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 @@ -547,6 +547,50 @@ "InstanceType": "c7gn.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az1" @@ -1563,6 +1607,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -2191,6 +2299,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "r7iz.12xlarge", "Location": "apne1-az1" @@ -2419,6 +2571,30 @@ "InstanceType": "x2iedn.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2iezn.metal", + "Location": "apne1-az1" + }, { "InstanceType": "z1d.12xlarge", "Location": "apne1-az1" @@ -2959,6 +3135,50 @@ "InstanceType": "c7gn.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az2" @@ -5203,6 +5423,50 @@ "InstanceType": "c7gn.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az4" @@ -6211,6 +6475,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az4" @@ -6879,6 +7207,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "r7iz.12xlarge", "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 ebac10712..e6093bb26 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 @@ -371,6 +371,50 @@ "InstanceType": "c7g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az1" @@ -1563,6 +1607,50 @@ "InstanceType": "r7g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "apne2-az1" @@ -2147,6 +2235,50 @@ "InstanceType": "c7g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az2" @@ -2907,6 +3039,50 @@ "InstanceType": "r7g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apne2-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "apne2-az2" @@ -3383,6 +3559,50 @@ "InstanceType": "c7g.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az3" @@ -3939,6 +4159,26 @@ "InstanceType": "m7g.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "m7i.12xlarge", "Location": "apne2-az3" @@ -4447,6 +4687,50 @@ "InstanceType": "r7g.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "apne2-az3" @@ -4831,6 +5115,50 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "g5.12xlarge", "Location": "apne2-az4" 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 e519cbd3c..39bc94b30 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 @@ -447,6 +447,50 @@ "InstanceType": "c7gd.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az1" @@ -1695,6 +1739,50 @@ "InstanceType": "r7gd.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-az1" @@ -2375,6 +2463,50 @@ "InstanceType": "c7gd.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az2" @@ -3479,6 +3611,50 @@ "InstanceType": "r7gd.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "aps1-az2" @@ -4071,6 +4247,50 @@ "InstanceType": "c7gd.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az3" @@ -5291,6 +5511,50 @@ "InstanceType": "r7gd.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index 54b9c2a5c..bc54eae51 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 @@ -499,6 +499,50 @@ "InstanceType": "c7gd.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apse1-az1" @@ -1451,6 +1495,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apse1-az1" @@ -2115,6 +2223,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "t1.micro", "Location": "apse1-az1" @@ -2891,6 +3043,50 @@ "InstanceType": "c7gd.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apse1-az2" @@ -3839,6 +4035,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "mac1.metal", "Location": "apse1-az2" @@ -4503,6 +4763,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "t1.micro", "Location": "apse1-az2" @@ -5227,6 +5531,50 @@ "InstanceType": "c7gd.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apse1-az3" @@ -6043,6 +6391,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "r4.16xlarge", "Location": "apse1-az3" @@ -6611,6 +7023,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "t2.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 3ed6b1a66..2d18d4c85 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 @@ -571,6 +571,50 @@ "InstanceType": "c7gd.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apse2-az1" @@ -2095,6 +2139,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "t1.micro", "Location": "apse2-az1" @@ -2899,6 +2987,50 @@ "InstanceType": "c7gd.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apse2-az2" @@ -4347,6 +4479,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apse2-az2" @@ -5127,6 +5303,50 @@ "InstanceType": "c7gd.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apse2-az3" @@ -6551,6 +6771,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "t1.micro", "Location": "apse2-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 498350e83..c41224a80 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 @@ -1039,6 +1039,46 @@ "InstanceType": "m6i.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "cac1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "cac1-az1" @@ -1519,6 +1559,50 @@ "InstanceType": "r7g.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "cac1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "cac1-az1" @@ -2135,6 +2219,50 @@ "InstanceType": "c7g.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "cac1-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "cac1-az2" @@ -2759,6 +2887,46 @@ "InstanceType": "m6i.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "cac1-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "m7g.12xlarge", "Location": "cac1-az2" @@ -3187,6 +3355,50 @@ "InstanceType": "r7g.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "cac1-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "cac1-az2" @@ -3787,6 +3999,50 @@ "InstanceType": "c7g.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "cac1-az4" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "d3.2xlarge", "Location": "cac1-az4" @@ -4191,6 +4447,46 @@ "InstanceType": "m6i.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.metal", + "Location": "cac1-az4" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "m7g.12xlarge", "Location": "cac1-az4" @@ -4583,6 +4879,50 @@ "InstanceType": "r7g.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "cac1-az4" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "t3.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 58776201e..aa28dd79c 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 @@ -2055,6 +2055,50 @@ "InstanceType": "r7gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "r7iz.12xlarge", "Location": "euc1-az1" @@ -4335,6 +4379,50 @@ "InstanceType": "r7g.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" @@ -6839,6 +6927,50 @@ "InstanceType": "r7gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "r7iz.12xlarge", "Location": "euc1-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 fe7f6f4a6..3ccc2d818 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 @@ -627,6 +627,42 @@ "InstanceType": "m6g.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "m6i.12xlarge", "Location": "eus1-az1" @@ -1759,6 +1795,42 @@ "InstanceType": "m6g.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "m6i.12xlarge", "Location": "eus1-az2" @@ -2875,6 +2947,42 @@ "InstanceType": "m6g.xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "m6i.12xlarge", "Location": "eus1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json index 958a3ae82..5d64840c3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json @@ -107,6 +107,46 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "eus2-az1" @@ -983,6 +1023,46 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "c7g.12xlarge", "Location": "eus2-az2" @@ -1803,6 +1883,46 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "eus2-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "eus2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index 27e5fa4d3..6a11c7ff2 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 @@ -2611,6 +2611,46 @@ "InstanceType": "r7i.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "t1.micro", "Location": "euw1-az1" @@ -5547,6 +5587,46 @@ "InstanceType": "r7i.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "t1.micro", "Location": "euw1-az2" @@ -8427,6 +8507,46 @@ "InstanceType": "r7i.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "t1.micro", "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 939462ba0..c88c855a7 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 @@ -2207,6 +2207,50 @@ "InstanceType": "c7g.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "euw2-az2" @@ -3359,6 +3403,50 @@ "InstanceType": "r7g.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az2" @@ -3891,6 +3979,50 @@ "InstanceType": "c6in.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euw2-az3" @@ -4915,6 +5047,50 @@ "InstanceType": "r6id.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-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 d8f713042..af2327907 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 @@ -523,6 +523,42 @@ "InstanceType": "m6g.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "m6i.12xlarge", "Location": "mes1-az1" @@ -1371,6 +1407,42 @@ "InstanceType": "m6g.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "m6i.12xlarge", "Location": "mes1-az2" @@ -2219,6 +2291,42 @@ "InstanceType": "m6g.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "m6i.12xlarge", "Location": "mes1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index c1ae7f1c9..3022b1492 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -1003,6 +1003,46 @@ "InstanceType": "m6i.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "sae1-az1" @@ -3767,6 +3807,46 @@ "InstanceType": "m6i.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "m7g.12xlarge", "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 e22670c2a..9078869ef 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 @@ -1355,6 +1355,26 @@ "InstanceType": "m7gd.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "m7i.12xlarge", "Location": "use1-az1" @@ -1899,6 +1919,86 @@ "InstanceType": "r6id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "r7g.12xlarge", "Location": "use1-az1" @@ -1935,6 +2035,90 @@ "InstanceType": "r7g.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "t1.micro", "Location": "use1-az1" 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 7694a52e4..f8eeb40bb 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 @@ -2503,6 +2503,46 @@ "InstanceType": "r7i.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use2-az1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az1" @@ -5271,6 +5311,46 @@ "InstanceType": "r7i.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use2-az2" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az2" @@ -7987,6 +8067,46 @@ "InstanceType": "r7i.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "use2-az3" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "t2.2xlarge", "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 fffcb7629..e7cdf595d 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 @@ -475,6 +475,50 @@ "InstanceType": "c7gd.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "usw1-az1" @@ -1703,6 +1747,50 @@ "InstanceType": "r7gd.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "t1.micro", "Location": "usw1-az1" @@ -2371,6 +2459,50 @@ "InstanceType": "c7gd.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "usw1-az3" @@ -3599,6 +3731,50 @@ "InstanceType": "r7gd.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "t1.micro", "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 9efe4f6b2..23164d255 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 @@ -9527,6 +9527,30 @@ "InstanceType": "i3en.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "i4g.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4g.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4g.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4g.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4g.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4g.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "i4i.12xlarge", "Location": "usw2-az4" 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 2ea0ff718..8b543a2ad 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 @@ -519,6 +519,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-east-1a" @@ -1343,6 +1379,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-east-1b" @@ -2167,6 +2239,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "m6i.12xlarge", "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 8d5206e03..247aef8c3 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 @@ -571,6 +571,50 @@ "InstanceType": "c7gn.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1a" @@ -1579,6 +1623,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1a" @@ -2247,6 +2355,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r7iz.12xlarge", "Location": "ap-northeast-1a" @@ -3115,6 +3267,50 @@ "InstanceType": "c7gn.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1c" @@ -4131,6 +4327,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -4759,6 +5019,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r7iz.12xlarge", "Location": "ap-northeast-1c" @@ -4987,6 +5291,30 @@ "InstanceType": "x2iedn.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2iezn.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-northeast-1c" @@ -5527,6 +5855,50 @@ "InstanceType": "c7gn.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "d2.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 9e20aaf2b..777f39289 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 @@ -371,6 +371,50 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2a" @@ -1563,6 +1607,50 @@ "InstanceType": "r7g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2a" @@ -2147,6 +2235,50 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2b" @@ -2907,6 +3039,50 @@ "InstanceType": "r7g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-northeast-2b" @@ -3383,6 +3559,50 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2c" @@ -3939,6 +4159,26 @@ "InstanceType": "m7g.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "m7i.12xlarge", "Location": "ap-northeast-2c" @@ -4447,6 +4687,50 @@ "InstanceType": "r7g.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2c" @@ -4831,6 +5115,50 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "g5.12xlarge", "Location": "ap-northeast-2d" 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 5d066c8df..fce71cfb4 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 @@ -447,6 +447,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1a" @@ -1695,6 +1739,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1a" @@ -2395,6 +2483,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1b" @@ -3615,6 +3747,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1b" @@ -4299,6 +4475,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1c" @@ -5403,6 +5623,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json index 12e00d928..5c01eb5bc 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 @@ -531,6 +531,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1a" @@ -1479,6 +1523,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1a" @@ -2143,6 +2251,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-1a" @@ -2887,6 +3039,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1b" @@ -3839,6 +4035,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1b" @@ -4503,6 +4763,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-1b" @@ -5227,6 +5531,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1c" @@ -6043,6 +6391,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "r4.16xlarge", "Location": "ap-southeast-1c" @@ -6611,6 +7023,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "t2.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 ab0b70e7d..6bd9942ce 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 @@ -547,6 +547,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2a" @@ -1971,6 +2015,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2a" @@ -2751,6 +2839,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2b" @@ -4275,6 +4407,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2b" @@ -5079,6 +5255,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2c" @@ -6527,6 +6747,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-southeast-2c" 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 b8422eade..210404294 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 @@ -1039,6 +1039,46 @@ "InstanceType": "m6i.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "ca-central-1a" @@ -1519,6 +1559,50 @@ "InstanceType": "r7g.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "ca-central-1a" @@ -2135,6 +2219,50 @@ "InstanceType": "c7g.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ca-central-1b" @@ -2759,6 +2887,46 @@ "InstanceType": "m6i.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.metal", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "m7g.12xlarge", "Location": "ca-central-1b" @@ -3187,6 +3355,50 @@ "InstanceType": "r7g.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "ca-central-1b" @@ -3787,6 +3999,50 @@ "InstanceType": "c7g.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "d3.2xlarge", "Location": "ca-central-1d" @@ -4191,6 +4447,46 @@ "InstanceType": "m6i.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.metal", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "m7g.12xlarge", "Location": "ca-central-1d" @@ -4583,6 +4879,50 @@ "InstanceType": "r7g.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "t3.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 cb77e9bd2..8bd8e30ce 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 @@ -1999,6 +1999,50 @@ "InstanceType": "r7g.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" @@ -4503,6 +4547,50 @@ "InstanceType": "r7gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "r7iz.12xlarge", "Location": "eu-central-1b" @@ -6839,6 +6927,50 @@ "InstanceType": "r7gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "r7iz.12xlarge", "Location": "eu-central-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 aa6b0e6de..10c191c53 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 @@ -627,6 +627,42 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "m6i.12xlarge", "Location": "eu-south-1a" @@ -1759,6 +1795,42 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "m6i.12xlarge", "Location": "eu-south-1b" @@ -2875,6 +2947,42 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "m6i.12xlarge", "Location": "eu-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json index 9423548f0..7d53ea3c2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json @@ -107,6 +107,46 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-south-2a" @@ -983,6 +1023,46 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-south-2b" @@ -1803,6 +1883,46 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-south-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index 1e19ed9bf..347903267 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 @@ -2611,6 +2611,46 @@ "InstanceType": "r7i.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1a" @@ -5547,6 +5587,46 @@ "InstanceType": "r7i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1b" @@ -8427,6 +8507,46 @@ "InstanceType": "r7i.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index eb4a6c5ad..38dc1dc3b 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 @@ -455,6 +455,50 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2a" @@ -1607,6 +1651,50 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2a" @@ -2139,6 +2227,50 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2b" @@ -3163,6 +3295,50 @@ "InstanceType": "r6id.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2b" 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 3efabdc66..761d09247 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 @@ -523,6 +523,42 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "m6i.12xlarge", "Location": "me-south-1a" @@ -1371,6 +1407,42 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "m6i.12xlarge", "Location": "me-south-1b" @@ -2219,6 +2291,42 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.medium", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.metal", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "m6i.12xlarge", "Location": "me-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index b39c26756..f013b194f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -1003,6 +1003,46 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "sa-east-1a" @@ -3767,6 +3807,46 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "m7g.12xlarge", "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 e466c9a64..8e94fa4c6 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 @@ -1355,6 +1355,26 @@ "InstanceType": "m7gd.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "m7i.12xlarge", "Location": "us-east-1a" @@ -1899,6 +1919,86 @@ "InstanceType": "r6id.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "r7g.12xlarge", "Location": "us-east-1a" @@ -1935,6 +2035,90 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "t1.micro", "Location": "us-east-1a" 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 e0fc0a679..2b0e332c3 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 @@ -2503,6 +2503,46 @@ "InstanceType": "r7i.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2a" @@ -5271,6 +5311,46 @@ "InstanceType": "r7i.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2b" @@ -7987,6 +8067,46 @@ "InstanceType": "r7i.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "t2.2xlarge", "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 1c254269f..d799e42d4 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 @@ -475,6 +475,50 @@ "InstanceType": "c7gd.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1a" @@ -1703,6 +1747,50 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "t1.micro", "Location": "us-west-1a" @@ -2371,6 +2459,50 @@ "InstanceType": "c7gd.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1b" @@ -3599,6 +3731,50 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "t1.micro", "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 bed140f06..031ade678 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 @@ -9527,6 +9527,30 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "i4g.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4g.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4g.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4g.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4g.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4g.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "i4i.12xlarge", "Location": "us-west-2d" 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 44a6dfbec..1c2e3627d 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 @@ -535,6 +535,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "m6i.12xlarge", "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 d0163d54c..021685b64 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 @@ -571,6 +571,50 @@ "InstanceType": "c7gn.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1" @@ -1603,6 +1647,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1" @@ -2271,6 +2379,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "r7iz.12xlarge", "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 9970cbf2b..88b68bc9f 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 @@ -371,6 +371,50 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2" @@ -1567,6 +1611,50 @@ "InstanceType": "r7g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index 1911cc89d..755d31c00 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 @@ -471,6 +471,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1" @@ -1719,6 +1763,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index 19c867075..d4e6d86f3 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 @@ -531,6 +531,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1" @@ -1499,6 +1543,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1" @@ -2163,6 +2271,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "t1.micro", "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 f678dcdbb..2ca78600b 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 @@ -571,6 +571,50 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2" @@ -2095,6 +2139,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2" 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 0c82705eb..cd24aa2e1 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 @@ -415,6 +415,50 @@ "InstanceType": "c7g.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ca-central-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ca-central-1" @@ -1043,6 +1087,46 @@ "InstanceType": "m6i.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "ca-central-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "m7g.12xlarge", "Location": "ca-central-1" @@ -1535,6 +1619,50 @@ "InstanceType": "r7g.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ca-central-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "t2.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 24c5a518a..a87556367 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 @@ -2295,6 +2295,50 @@ "InstanceType": "r7gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "r7iz.12xlarge", "Location": "eu-central-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 c9d57f8bd..36d00816e 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 @@ -655,6 +655,42 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "m6i.12xlarge", "Location": "eu-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json index e53bc3a35..408ac6eb1 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json @@ -107,6 +107,46 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 854a410e1..d6af8f55f 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 @@ -2643,6 +2643,46 @@ "InstanceType": "r7i.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index dae3ddb12..0175f2c56 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 @@ -455,6 +455,50 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2" @@ -1607,6 +1651,50 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2" 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 85b55ca6e..3ee71ec4b 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 @@ -567,6 +567,42 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.large", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "me-south-1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "me-south-1" + }, { "InstanceType": "m6i.12xlarge", "Location": "me-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 0a4524b79..4f180c07f 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -1003,6 +1003,46 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "m7g.12xlarge", "Location": "sa-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 115ca1f65..c18be1999 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 @@ -2543,6 +2543,46 @@ "InstanceType": "r7i.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "us-east-2" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index 2dc750306..5cac74cf3 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 @@ -475,6 +475,50 @@ "InstanceType": "c7gd.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.large", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-west-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1" @@ -1703,6 +1747,50 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.large", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "us-west-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "t1.micro", "Location": "us-west-1"