From 147049e97a54166a60bdc57de0dfe61227415779 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:34:19 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#8345) --- .../availability-zone-id/ap-northeast-1.json | 64 +++++++ .../availability-zone-id/ap-south-2.json | 176 ++++++++++++++++++ .../availability-zone-id/ap-southeast-5.json | 120 ++++++++++++ .../availability-zone-id/eu-central-1.json | 64 +++++++ .../availability-zone-id/eu-north-1.json | 96 ++++++++++ .../availability-zone-id/eu-south-2.json | 64 +++++++ .../availability-zone-id/me-central-1.json | 48 +++++ .../availability-zone-id/us-east-1.json | 48 +++++ .../availability-zone-id/us-east-2.json | 20 ++ .../availability-zone/ap-northeast-1.json | 64 +++++++ .../availability-zone/ap-south-2.json | 176 ++++++++++++++++++ .../availability-zone/ap-southeast-5.json | 120 ++++++++++++ .../availability-zone/eu-central-1.json | 64 +++++++ .../availability-zone/eu-north-1.json | 96 ++++++++++ .../availability-zone/eu-south-2.json | 64 +++++++ .../availability-zone/me-central-1.json | 48 +++++ .../availability-zone/us-east-1.json | 48 +++++ .../availability-zone/us-east-2.json | 20 ++ .../region/ap-northeast-1.json | 32 ++++ .../region/ap-south-2.json | 88 +++++++++ .../region/ap-southeast-5.json | 40 ++++ .../region/eu-central-1.json | 32 ++++ .../region/eu-north-1.json | 48 +++++ .../region/eu-south-2.json | 32 ++++ .../region/me-central-1.json | 24 +++ 25 files changed, 1696 insertions(+) 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 4214c3ec58b2..77bf920cd909 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 @@ -859,6 +859,38 @@ "InstanceType": "g6.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "gr6.4xlarge", "Location": "apne1-az1" @@ -6263,6 +6295,38 @@ "InstanceType": "g6.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "gr6.4xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json index aa9552b7272b..74a83701ea0d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json @@ -71,6 +71,50 @@ "InstanceType": "c5d.xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "aps2-az1" @@ -655,6 +699,50 @@ "InstanceType": "r5d.xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "aps2-az1" @@ -947,6 +1035,50 @@ "InstanceType": "c5d.xlarge", "Location": "aps2-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "aps2-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "aps2-az2" @@ -1531,6 +1663,50 @@ "InstanceType": "r5d.xlarge", "Location": "aps2-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "aps2-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "aps2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json index 7cf81d7eb022..004c68458209 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json @@ -219,6 +219,26 @@ "InstanceType": "c7gd.xlarge", "Location": "apse5-az1" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "apse5-az1" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "apse5-az1" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "apse5-az1" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "apse5-az1" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "apse5-az1" + }, { "InstanceType": "c7i.12xlarge", "Location": "apse5-az1" @@ -599,6 +619,26 @@ "InstanceType": "m7gd.xlarge", "Location": "apse5-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse5-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse5-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse5-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse5-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse5-az1" + }, { "InstanceType": "m7i.12xlarge", "Location": "apse5-az1" @@ -1199,6 +1239,26 @@ "InstanceType": "c7gd.xlarge", "Location": "apse5-az2" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "apse5-az2" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "apse5-az2" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "apse5-az2" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "apse5-az2" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "apse5-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "apse5-az2" @@ -1579,6 +1639,26 @@ "InstanceType": "m7gd.xlarge", "Location": "apse5-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse5-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse5-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse5-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse5-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse5-az2" + }, { "InstanceType": "m7i.12xlarge", "Location": "apse5-az2" @@ -2179,6 +2259,26 @@ "InstanceType": "c7gd.xlarge", "Location": "apse5-az3" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "apse5-az3" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "apse5-az3" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "apse5-az3" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "apse5-az3" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "apse5-az3" + }, { "InstanceType": "c7i.12xlarge", "Location": "apse5-az3" @@ -2519,6 +2619,26 @@ "InstanceType": "m7gd.xlarge", "Location": "apse5-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse5-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse5-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse5-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse5-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse5-az3" + }, { "InstanceType": "m7i.12xlarge", "Location": "apse5-az3" 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 db5a2879f447..4fbf87659dc5 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 @@ -835,6 +835,38 @@ "InstanceType": "g5g.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "euc1-az1" @@ -3591,6 +3623,38 @@ "InstanceType": "g6.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "gr6.4xlarge", "Location": "euc1-az2" 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 e470dbc9fc0a..8ed091443c5b 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 @@ -3491,6 +3491,54 @@ "InstanceType": "r7i.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "eun1-az2" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az2" @@ -5247,6 +5295,54 @@ "InstanceType": "r7i.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-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 02bc1596e34d..eeca1b775a16 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 @@ -1715,6 +1715,38 @@ "InstanceType": "g6.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "gr6.4xlarge", "Location": "eus2-az2" @@ -2971,6 +3003,38 @@ "InstanceType": "g6.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "gr6.4xlarge", "Location": "eus2-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 09a28a396179..7c1ef6a7c5e7 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 @@ -1431,6 +1431,30 @@ "InstanceType": "x2idn.metal", "Location": "mec1-az2" }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "x2iezn.metal", + "Location": "mec1-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "mec1-az3" @@ -2114,5 +2138,29 @@ { "InstanceType": "x2idn.metal", "Location": "mec1-az3" + }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "mec1-az3" + }, + { + "InstanceType": "x2iezn.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 fbfbf0e023b3..8d63beed0e0c 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 @@ -3879,6 +3879,54 @@ "InstanceType": "c7i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "use1-az2" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az2" 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 5505fd1f67f0..c0186215db41 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 @@ -3691,6 +3691,26 @@ "InstanceType": "c7gn.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "use2-az2" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "use2-az2" 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 8b94541c8765..70a4c00f9d96 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 @@ -859,6 +859,38 @@ "InstanceType": "g6.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "gr6.4xlarge", "Location": "ap-northeast-1a" @@ -3783,6 +3815,38 @@ "InstanceType": "g6.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "gr6.4xlarge", "Location": "ap-northeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json index e3a5642341ac..7b5dd2acf190 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json @@ -71,6 +71,50 @@ "InstanceType": "c5d.xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-2a" @@ -655,6 +699,50 @@ "InstanceType": "r5d.xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-2a" @@ -947,6 +1035,50 @@ "InstanceType": "c5d.xlarge", "Location": "ap-south-2b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-2b" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-2b" @@ -1531,6 +1663,50 @@ "InstanceType": "r5d.xlarge", "Location": "ap-south-2b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-2b" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-2b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json index 1b11e26f3fa7..19a50be37b08 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json @@ -219,6 +219,26 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-5a" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-southeast-5a" + }, { "InstanceType": "c7i.12xlarge", "Location": "ap-southeast-5a" @@ -599,6 +619,26 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-5a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-5a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-5a" + }, { "InstanceType": "m7i.12xlarge", "Location": "ap-southeast-5a" @@ -1199,6 +1239,26 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-5b" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-southeast-5b" + }, { "InstanceType": "c7i.12xlarge", "Location": "ap-southeast-5b" @@ -1579,6 +1639,26 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-5b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-5b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-5b" + }, { "InstanceType": "m7i.12xlarge", "Location": "ap-southeast-5b" @@ -2179,6 +2259,26 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-5c" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-southeast-5c" + }, { "InstanceType": "c7i.12xlarge", "Location": "ap-southeast-5c" @@ -2519,6 +2619,26 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-5c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-5c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-5c" + }, { "InstanceType": "m7i.12xlarge", "Location": "ap-southeast-5c" 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 6b445f80c296..34ab6bc40f35 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 @@ -791,6 +791,38 @@ "InstanceType": "g6.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "gr6.4xlarge", "Location": "eu-central-1a" @@ -6527,6 +6559,38 @@ "InstanceType": "g5g.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-1c" 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 27ae154a55b9..d80ccb344126 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 @@ -3491,6 +3491,54 @@ "InstanceType": "r7i.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1b" @@ -5247,6 +5295,54 @@ "InstanceType": "r7i.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-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 80f96a949069..e6b0600ec1e3 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 @@ -1715,6 +1715,38 @@ "InstanceType": "g6.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "gr6.4xlarge", "Location": "eu-south-2b" @@ -2971,6 +3003,38 @@ "InstanceType": "g6.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "gr6.4xlarge", "Location": "eu-south-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json index d6cd20dd0c19..5856987bf051 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 @@ -1431,6 +1431,30 @@ "InstanceType": "x2idn.metal", "Location": "me-central-1b" }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "x2iezn.metal", + "Location": "me-central-1b" + }, { "InstanceType": "c5.12xlarge", "Location": "me-central-1c" @@ -2114,5 +2138,29 @@ { "InstanceType": "x2idn.metal", "Location": "me-central-1c" + }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "me-central-1c" + }, + { + "InstanceType": "x2iezn.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 7753f47fb864..a10dd6ef205a 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 @@ -723,6 +723,54 @@ "InstanceType": "c7i.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "c8g.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.metal-24xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "c8g.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "d2.2xlarge", "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 bf9c629f1885..b9aec22076ce 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 @@ -3691,6 +3691,26 @@ "InstanceType": "c7gn.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "c7i.12xlarge", "Location": "us-east-2b" 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 e7090e656eca..d3ad9321788c 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 @@ -883,6 +883,38 @@ "InstanceType": "g6.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "gr6.4xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json index bbb0e4195ddf..1337e5795a4d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json @@ -71,6 +71,50 @@ "InstanceType": "c5d.xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-2" @@ -655,6 +699,50 @@ "InstanceType": "r5d.xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json index 1fa2dbfbf24c..4d64a1a7e289 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json @@ -219,6 +219,26 @@ "InstanceType": "c7gd.xlarge", "Location": "ap-southeast-5" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-southeast-5" + }, { "InstanceType": "c7i.12xlarge", "Location": "ap-southeast-5" @@ -599,6 +619,26 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-5" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-5" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-5" + }, { "InstanceType": "m7i.12xlarge", "Location": "ap-southeast-5" 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 afaf63e6fa1d..63dbe638865b 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 @@ -931,6 +931,38 @@ "InstanceType": "g6.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "gr6.4xlarge", "Location": "eu-central-1" 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 0f7c08bcc242..abf8d7e44bd4 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 @@ -1763,6 +1763,54 @@ "InstanceType": "r7i.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "eu-north-1" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-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 5aba8f971ea9..5a711ca869cd 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 @@ -423,6 +423,38 @@ "InstanceType": "g6.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "g6e.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.48xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g6e.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "gr6.4xlarge", "Location": "eu-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json index 974bed129195..145b50a3e7bd 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 @@ -714,5 +714,29 @@ { "InstanceType": "x2idn.metal", "Location": "me-central-1" + }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "x2iezn.metal", + "Location": "me-central-1" } ] \ No newline at end of file