From 3be1cf331e5d0847311c8c810ce5410e4d85035e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 18 Feb 2024 14:30:58 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#7353) --- .../availability-zone-id/eu-north-1.json | 240 ++++++++++++++++++ .../availability-zone-id/sa-east-1.json | 192 ++++++++++++++ .../availability-zone-id/us-east-1.json | 96 +++++++ .../availability-zone-id/us-west-2.json | 4 + .../availability-zone/eu-north-1.json | 240 ++++++++++++++++++ .../availability-zone/sa-east-1.json | 192 ++++++++++++++ .../availability-zone/us-east-1.json | 96 +++++++ .../availability-zone/us-west-2.json | 4 + .../region/eu-north-1.json | 80 ++++++ .../region/sa-east-1.json | 64 +++++ 10 files changed, 1208 insertions(+) diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index 198ce241a..0c75b7ea1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json @@ -1207,6 +1207,86 @@ "InstanceType": "r6i.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "r7g.12xlarge", "Location": "eun1-az1" @@ -2755,6 +2835,86 @@ "InstanceType": "r6i.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "r7g.12xlarge", "Location": "eun1-az2" @@ -4255,6 +4415,86 @@ "InstanceType": "r6i.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "r7g.12xlarge", "Location": "eun1-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 4dd6a9370..60b1c56e6 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 @@ -1123,6 +1123,70 @@ "InstanceType": "m7g.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "sae1-az1" @@ -2683,6 +2747,70 @@ "InstanceType": "m7g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "sae1-az2" @@ -4103,6 +4231,70 @@ "InstanceType": "m7g.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "r3.2xlarge", "Location": "sae1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 0cd5ea6f4..534b40d09 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 @@ -1411,6 +1411,54 @@ "InstanceType": "m6in.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "use1-az1" @@ -2123,6 +2171,54 @@ "InstanceType": "r6in.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "r7g.12xlarge", "Location": "use1-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index cbda318c0..e2ac85c10 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 @@ -1907,6 +1907,10 @@ "InstanceType": "p4d.24xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "p5.48xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "usw2-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index 613f5c864..2ad6ea293 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json @@ -1207,6 +1207,86 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "r7g.12xlarge", "Location": "eu-north-1a" @@ -2755,6 +2835,86 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "r7g.12xlarge", "Location": "eu-north-1b" @@ -4255,6 +4415,86 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "r7g.12xlarge", "Location": "eu-north-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 fbfe37091..d577b34ba 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 @@ -1123,6 +1123,70 @@ "InstanceType": "m7g.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "sa-east-1a" @@ -2683,6 +2747,70 @@ "InstanceType": "m7g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "sa-east-1b" @@ -4103,6 +4231,70 @@ "InstanceType": "m7g.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "r3.2xlarge", "Location": "sa-east-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 30e8c5b37..b660431be 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 @@ -1411,6 +1411,54 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "us-east-1a" @@ -2123,6 +2171,54 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "r7g.12xlarge", "Location": "us-east-1a" 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 21772f1bb..ae234ee63 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 @@ -1907,6 +1907,10 @@ "InstanceType": "p4d.24xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-2a" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index b3ea9a4c3..c17647daf 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -1339,6 +1339,86 @@ "InstanceType": "r6i.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "r7g.12xlarge", "Location": "eu-north-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 e42c2c6e7..4ccfe1256 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 @@ -1123,6 +1123,70 @@ "InstanceType": "m7g.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "r3.2xlarge", "Location": "sa-east-1"