From f703decd42a39c891cc00c12040ff7fb480d894a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:02:28 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings (#6554) --- .../availability-zone-id/ap-southeast-1.json | 120 +++++++++++++ .../availability-zone-id/ap-southeast-2.json | 12 ++ .../availability-zone-id/eu-south-1.json | 40 +++++ .../availability-zone-id/eu-south-2.json | 32 ++++ .../availability-zone-id/eu-west-2.json | 40 +++++ .../availability-zone-id/eu-west-3.json | 80 +++++++++ .../availability-zone-id/me-central-1.json | 168 ++++++++++++++++++ .../availability-zone-id/us-east-1.json | 24 +++ .../availability-zone/ap-southeast-1.json | 120 +++++++++++++ .../availability-zone/ap-southeast-2.json | 12 ++ .../availability-zone/eu-south-1.json | 40 +++++ .../availability-zone/eu-south-2.json | 32 ++++ .../availability-zone/eu-west-2.json | 40 +++++ .../availability-zone/eu-west-3.json | 80 +++++++++ .../availability-zone/me-central-1.json | 168 ++++++++++++++++++ .../availability-zone/us-east-1.json | 24 +++ .../region/ap-southeast-2.json | 4 + .../region/eu-south-2.json | 16 ++ .../region/eu-west-3.json | 40 +++++ .../region/me-central-1.json | 56 ++++++ 20 files changed, 1148 insertions(+) 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 eb76a423d..ebf074cae 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 @@ -4567,6 +4567,46 @@ "InstanceType": "c6i.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "apse1-az3" @@ -5627,6 +5667,86 @@ "InstanceType": "r6id.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "r6in.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 77e7c2078..8641a7fe7 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 @@ -703,6 +703,10 @@ "InstanceType": "i3.large", "Location": "apse2-az1" }, + { + "InstanceType": "i3.metal", + "Location": "apse2-az1" + }, { "InstanceType": "i3.xlarge", "Location": "apse2-az1" @@ -2699,6 +2703,10 @@ "InstanceType": "i3.large", "Location": "apse2-az2" }, + { + "InstanceType": "i3.metal", + "Location": "apse2-az2" + }, { "InstanceType": "i3.xlarge", "Location": "apse2-az2" @@ -4619,6 +4627,10 @@ "InstanceType": "i3.large", "Location": "apse2-az3" }, + { + "InstanceType": "i3.metal", + "Location": "apse2-az3" + }, { "InstanceType": "i3.xlarge", "Location": "apse2-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 600b150e0..56f094565 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 @@ -271,6 +271,46 @@ "InstanceType": "c6i.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "eus1-az1" 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 b0d6e5e44..ee30185dd 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 @@ -471,6 +471,22 @@ "InstanceType": "t4g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eus2-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "eus2-az2" @@ -943,6 +959,22 @@ "InstanceType": "t4g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eus2-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "eus2-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 8c438fa81..5b1e62be9 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 @@ -3403,6 +3403,46 @@ "InstanceType": "c6i.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index 100e700c4..85f77420e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json @@ -263,6 +263,46 @@ "InstanceType": "c6i.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euw3-az1" @@ -2679,6 +2719,46 @@ "InstanceType": "c6i.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euw3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json index 66febb80c..d1350800c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json @@ -107,6 +107,46 @@ "InstanceType": "c6g.xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "mec1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "mec1-az1" + }, { "InstanceType": "g5.12xlarge", "Location": "mec1-az1" @@ -583,6 +623,22 @@ "InstanceType": "t4g.xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "mec1-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "mec1-az2" @@ -691,6 +747,46 @@ "InstanceType": "c6g.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "mec1-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "g5.12xlarge", "Location": "mec1-az2" @@ -1167,6 +1263,22 @@ "InstanceType": "t4g.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "mec1-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "mec1-az3" @@ -1275,6 +1387,46 @@ "InstanceType": "c6g.xlarge", "Location": "mec1-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "mec1-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "mec1-az3" + }, { "InstanceType": "i3.16xlarge", "Location": "mec1-az3" @@ -1718,5 +1870,21 @@ { "InstanceType": "t4g.xlarge", "Location": "mec1-az3" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "mec1-az3" } ] \ No newline at end of file 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 a2ec1a088..409ea6845 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 @@ -2987,6 +2987,30 @@ "InstanceType": "i3en.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "i4g.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4g.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4g.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4g.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4g.large", + "Location": "use1-az2" + }, + { + "InstanceType": "i4g.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "i4i.16xlarge", "Location": "use1-az2" 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 97b3a062e..44e7e143f 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 @@ -4567,6 +4567,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "c7g.12xlarge", "Location": "ap-southeast-1c" @@ -5627,6 +5667,86 @@ "InstanceType": "r6id.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "r6in.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 240faf917..0dcd94932 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 @@ -635,6 +635,10 @@ "InstanceType": "i3.large", "Location": "ap-southeast-2a" }, + { + "InstanceType": "i3.metal", + "Location": "ap-southeast-2a" + }, { "InstanceType": "i3.xlarge", "Location": "ap-southeast-2a" @@ -2591,6 +2595,10 @@ "InstanceType": "i3.large", "Location": "ap-southeast-2b" }, + { + "InstanceType": "i3.metal", + "Location": "ap-southeast-2b" + }, { "InstanceType": "i3.xlarge", "Location": "ap-southeast-2b" @@ -4587,6 +4595,10 @@ "InstanceType": "i3.large", "Location": "ap-southeast-2c" }, + { + "InstanceType": "i3.metal", + "Location": "ap-southeast-2c" + }, { "InstanceType": "i3.xlarge", "Location": "ap-southeast-2c" 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 1b4af1c55..f552d8ed3 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 @@ -271,6 +271,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-south-1a" 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 d8014da3d..9c950095e 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 @@ -471,6 +471,22 @@ "InstanceType": "t4g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-2a" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-south-2b" @@ -943,6 +959,22 @@ "InstanceType": "t4g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-2b" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-south-2c" 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 8c7a28404..9f32e0d78 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 @@ -1879,6 +1879,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json index 8cc667d5c..f386aeabd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json @@ -263,6 +263,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-3a" @@ -2679,6 +2719,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json index 4f6d10a17..1876c3891 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json @@ -107,6 +107,46 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.metal", + "Location": "me-central-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "me-central-1a" + }, { "InstanceType": "g5.12xlarge", "Location": "me-central-1a" @@ -583,6 +623,22 @@ "InstanceType": "t4g.xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "me-central-1a" + }, { "InstanceType": "c5.12xlarge", "Location": "me-central-1b" @@ -691,6 +747,46 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.large", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.metal", + "Location": "me-central-1b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "g5.12xlarge", "Location": "me-central-1b" @@ -1167,6 +1263,22 @@ "InstanceType": "t4g.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "me-central-1b" + }, { "InstanceType": "c5.12xlarge", "Location": "me-central-1c" @@ -1275,6 +1387,46 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.large", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.metal", + "Location": "me-central-1c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "me-central-1c" + }, { "InstanceType": "i3.16xlarge", "Location": "me-central-1c" @@ -1718,5 +1870,21 @@ { "InstanceType": "t4g.xlarge", "Location": "me-central-1c" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "me-central-1c" } ] \ No newline at end of file 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 d38889dfb..fbc272144 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 @@ -2987,6 +2987,30 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "i4g.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4g.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4g.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4g.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4g.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4g.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "i4i.16xlarge", "Location": "us-east-1b" 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 1afd4beb0..16315a7d7 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 @@ -703,6 +703,10 @@ "InstanceType": "i3.large", "Location": "ap-southeast-2" }, + { + "InstanceType": "i3.metal", + "Location": "ap-southeast-2" + }, { "InstanceType": "i3.xlarge", "Location": "ap-southeast-2" 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 fad67f859..49fd1fdbc 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 @@ -470,5 +470,21 @@ { "InstanceType": "t4g.xlarge", "Location": "eu-south-2" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-2" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json index ea6719733..2279361c3 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json @@ -263,6 +263,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json index 0832b434b..3222f3b3e 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json @@ -107,6 +107,46 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.large", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.metal", + "Location": "me-central-1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "me-central-1" + }, { "InstanceType": "g5.12xlarge", "Location": "me-central-1" @@ -582,5 +622,21 @@ { "InstanceType": "t4g.xlarge", "Location": "me-central-1" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "me-central-1" } ] \ No newline at end of file