From d21bb8624d12c7054b51ef17b06fb6894e642b76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 10:08:21 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#8398) --- .../availability-zone-id/ap-northeast-1.json | 96 +++++++++ .../availability-zone-id/ap-northeast-2.json | 4 + .../availability-zone-id/ap-southeast-3.json | 192 ++++++++++++++++++ .../availability-zone-id/eu-south-2.json | 144 +++++++++++++ .../availability-zone-id/eu-west-2.json | 16 ++ .../availability-zone-id/us-east-1.json | 56 +++++ .../availability-zone-id/us-west-2.json | 56 +++++ .../availability-zone/ap-northeast-1.json | 96 +++++++++ .../availability-zone/ap-northeast-2.json | 4 + .../availability-zone/ap-southeast-3.json | 192 ++++++++++++++++++ .../availability-zone/eu-south-2.json | 144 +++++++++++++ .../availability-zone/eu-west-2.json | 16 ++ .../availability-zone/us-east-1.json | 56 +++++ .../availability-zone/us-west-2.json | 56 +++++ .../region/ap-northeast-1.json | 48 +++++ .../region/ap-northeast-2.json | 4 + .../region/ap-southeast-3.json | 64 ++++++ .../region/eu-south-2.json | 48 +++++ .../region/eu-west-2.json | 8 + .../region/us-east-1.json | 16 ++ .../region/us-west-2.json | 4 + 21 files changed, 1320 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 95fcda986740..e50518cc65c9 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 @@ -5231,6 +5231,54 @@ "InstanceType": "r7iz.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apne1-az2" @@ -8115,6 +8163,54 @@ "InstanceType": "r7iz.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "t1.micro", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index aa09d5167d77..d50dfe5dd577 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json @@ -1807,6 +1807,10 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "apne2-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json index 64e8cfb967dc..214af421619a 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json @@ -579,6 +579,70 @@ "InstanceType": "m6i.xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse3-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "apse3-az1" @@ -1463,6 +1527,70 @@ "InstanceType": "m6i.xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse3-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse3-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "apse3-az2" @@ -2315,6 +2443,70 @@ "InstanceType": "m6i.xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse3-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "apse3-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 eeca1b775a16..20ea37906eab 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 @@ -895,6 +895,54 @@ "InstanceType": "m7i.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eus2-az1" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "eus2-az1" @@ -2219,6 +2267,54 @@ "InstanceType": "m7i.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eus2-az2" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "eus2-az2" @@ -3507,6 +3603,54 @@ "InstanceType": "m7i.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.medium", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eus2-az3" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "r5.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 aefbeba36be3..af4a7de70c73 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 @@ -559,6 +559,14 @@ "InstanceType": "f1.4xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "f2.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "g4ad.16xlarge", "Location": "euw2-az1" @@ -2423,6 +2431,14 @@ "InstanceType": "f1.4xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "f2.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "g4ad.16xlarge", "Location": "euw2-az2" 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 95f6f704f3a9..f8e4fef13e79 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 @@ -787,6 +787,14 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az1" }, + { + "InstanceType": "f2.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "use1-az1" + }, { "InstanceType": "g4ad.16xlarge", "Location": "use1-az1" @@ -2975,6 +2983,14 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "use1-az1" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "use1-az1" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "use1-az1" @@ -4035,6 +4051,14 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az2" }, + { + "InstanceType": "f2.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "use1-az2" + }, { "InstanceType": "g4ad.16xlarge", "Location": "use1-az2" @@ -6323,6 +6347,10 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "use1-az2" }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "use1-az2" + }, { "InstanceType": "vt1.24xlarge", "Location": "use1-az2" @@ -6571,6 +6599,14 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az3" }, + { + "InstanceType": "f2.12xlarge", + "Location": "use1-az3" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "use1-az3" + }, { "InstanceType": "i2.2xlarge", "Location": "use1-az3" @@ -7583,6 +7619,14 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az4" }, + { + "InstanceType": "f2.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "use1-az4" + }, { "InstanceType": "g4ad.16xlarge", "Location": "use1-az4" @@ -9875,6 +9919,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "use1-az4" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "use1-az4" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "use1-az4" @@ -13579,6 +13627,14 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az6" }, + { + "InstanceType": "f2.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "use1-az6" + }, { "InstanceType": "g4ad.16xlarge", "Location": "use1-az6" 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 7005e351069c..0a3bb10f0607 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 @@ -3107,6 +3107,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "usw2-az1" @@ -6203,6 +6207,54 @@ "InstanceType": "r7iz.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "Location": "usw2-az2" @@ -9647,6 +9699,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "usw2-az3" 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 b85d4200eca9..f911cd8033e6 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 @@ -2679,6 +2679,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1a" @@ -8191,6 +8239,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 3340379350ee..72ce0bab93c1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json @@ -1807,6 +1807,10 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "ap-northeast-2a" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json index 6a61dcdde71a..aa2b7bd8b3c1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json @@ -579,6 +579,70 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3a" @@ -1463,6 +1527,70 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-3b" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3b" @@ -2315,6 +2443,70 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3c" 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 e6b0600ec1e3..40674a949a51 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 @@ -895,6 +895,54 @@ "InstanceType": "m7i.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2a" @@ -2219,6 +2267,54 @@ "InstanceType": "m7i.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2b" @@ -3507,6 +3603,54 @@ "InstanceType": "m7i.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.medium", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "r5.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 5d94e645ea8d..899ca410ef16 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 @@ -559,6 +559,14 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "f2.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-2a" @@ -4407,6 +4415,14 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "f2.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-2c" 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 b5080f575b78..8930d4e8896a 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 @@ -843,6 +843,14 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "f2.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "g4ad.16xlarge", "Location": "us-east-1a" @@ -3131,6 +3139,10 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "vt1.24xlarge", "Location": "us-east-1a" @@ -4151,6 +4163,14 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "f2.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "g4ad.16xlarge", "Location": "us-east-1b" @@ -6443,6 +6463,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "us-east-1b" @@ -7511,6 +7535,14 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "f2.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "g4ad.16xlarge", "Location": "us-east-1c" @@ -10851,6 +10883,14 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "f2.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "g4ad.16xlarge", "Location": "us-east-1d" @@ -13039,6 +13079,14 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "us-east-1d" @@ -13323,6 +13371,14 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1e" }, + { + "InstanceType": "f2.12xlarge", + "Location": "us-east-1e" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "us-east-1e" + }, { "InstanceType": "i2.2xlarge", "Location": "us-east-1e" 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 fb2473d26d07..05c84265bf06 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 @@ -2855,6 +2855,54 @@ "InstanceType": "r7iz.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -6323,6 +6371,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "us-west-2b" @@ -9647,6 +9699,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "us-west-2c" 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 4c322180c6a6..c55c583f990b 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 @@ -2707,6 +2707,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r8g.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.metal-24xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8g.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 33e8c9133882..8a9ca1b62f9a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -1831,6 +1831,10 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json index 83b4ebca6f0b..54d624a49dbe 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json @@ -579,6 +579,70 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3" 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 5a711ca869cd..5d6d14133328 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 @@ -927,6 +927,54 @@ "InstanceType": "m7i.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "m8g.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.48xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.metal-24xl", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.metal-48xl", + "Location": "eu-south-2" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 06e77050841e..415759ff1490 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -559,6 +559,14 @@ "InstanceType": "f1.4xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "f2.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "g4ad.16xlarge", "Location": "eu-west-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index abfc7366cf7c..e331be1bf358 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json @@ -843,6 +843,14 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1" }, + { + "InstanceType": "f2.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "us-east-1" + }, { "InstanceType": "g4ad.16xlarge", "Location": "us-east-1" @@ -3183,6 +3191,14 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "us-east-1" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "us-east-1" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index 67935d11c810..2daa9ec69913 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json @@ -3143,6 +3143,10 @@ "InstanceType": "u7i-12tb.224xlarge", "Location": "us-west-2" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "us-west-2" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "us-west-2"