From dd240d7c5bdaa69303f50a092ff8544a51d1a89a Mon Sep 17 00:00:00 2001 From: Bert Blommers Date: Sun, 19 Feb 2023 17:25:54 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#5946) --- .../availability-zone-id/af-south-1.json | 192 +++ .../availability-zone-id/ap-northeast-1.json | 412 +++++ .../availability-zone-id/ap-northeast-2.json | 168 ++ .../availability-zone-id/ap-northeast-3.json | 556 +++++++ .../availability-zone-id/ap-south-2.json | 1418 +++++++++++++++++ .../availability-zone-id/ap-southeast-1.json | 220 +++ .../availability-zone-id/ap-southeast-2.json | 304 ++++ .../availability-zone-id/ap-southeast-3.json | 120 ++ .../availability-zone-id/eu-central-1.json | 440 +++++ .../availability-zone-id/eu-central-2.json | 68 + .../availability-zone-id/eu-north-1.json | 72 + .../availability-zone-id/eu-west-1.json | 348 ++++ .../availability-zone-id/eu-west-2.json | 248 +++ .../availability-zone-id/eu-west-3.json | 96 ++ .../availability-zone-id/me-south-1.json | 120 ++ .../availability-zone-id/sa-east-1.json | 104 ++ .../availability-zone-id/us-east-1.json | 564 +++++++ .../availability-zone-id/us-east-2.json | 304 ++++ .../availability-zone-id/us-west-1.json | 272 ++++ .../availability-zone-id/us-west-2.json | 532 +++++++ .../availability-zone/af-south-1.json | 192 +++ .../availability-zone/ap-northeast-1.json | 412 +++++ .../availability-zone/ap-northeast-2.json | 168 ++ .../availability-zone/ap-northeast-3.json | 556 +++++++ .../availability-zone/ap-south-2.json | 1418 +++++++++++++++++ .../availability-zone/ap-southeast-1.json | 220 +++ .../availability-zone/ap-southeast-2.json | 304 ++++ .../availability-zone/ap-southeast-3.json | 120 ++ .../availability-zone/eu-central-1.json | 440 +++++ .../availability-zone/eu-central-2.json | 68 + .../availability-zone/eu-north-1.json | 72 + .../availability-zone/eu-west-1.json | 348 ++++ .../availability-zone/eu-west-2.json | 248 +++ .../availability-zone/eu-west-3.json | 96 ++ .../availability-zone/me-south-1.json | 120 ++ .../availability-zone/sa-east-1.json | 104 ++ .../availability-zone/us-east-1.json | 564 +++++++ .../availability-zone/us-east-2.json | 304 ++++ .../availability-zone/us-west-1.json | 272 ++++ .../availability-zone/us-west-2.json | 532 +++++++ .../region/af-south-1.json | 76 + .../region/ap-northeast-1.json | 88 + .../region/ap-northeast-2.json | 68 + .../region/ap-northeast-3.json | 208 +++ .../region/ap-south-2.json | 474 ++++++ .../region/ap-southeast-1.json | 88 + .../region/ap-southeast-2.json | 88 + .../region/ap-southeast-3.json | 40 + .../region/eu-central-1.json | 144 ++ .../region/eu-central-2.json | 28 + .../region/eu-north-1.json | 36 + .../region/eu-west-1.json | 76 + .../region/eu-west-2.json | 124 ++ .../region/eu-west-3.json | 48 + .../region/me-south-1.json | 40 + .../region/sa-east-1.json | 36 + .../region/us-east-1.json | 76 + .../region/us-east-2.json | 76 + .../region/us-west-1.json | 136 ++ .../region/us-west-2.json | 148 ++ .../test_ec2/test_instance_type_offerings.py | 3 +- 61 files changed, 15216 insertions(+), 1 deletion(-) create mode 100644 moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json create mode 100644 moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json create mode 100644 moto/ec2/resources/instance_type_offerings/region/ap-south-2.json diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json index 0780a8542..e058058b4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json @@ -355,6 +355,42 @@ "InstanceType": "m5d.xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "afs1-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "m6i.12xlarge", "Location": "afs1-az1" @@ -539,6 +575,46 @@ "InstanceType": "r5n.xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "afs1-az1" @@ -983,6 +1059,42 @@ "InstanceType": "m5d.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "m6i.12xlarge", "Location": "afs1-az2" @@ -1167,6 +1279,46 @@ "InstanceType": "r5n.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "afs1-az2" @@ -1795,6 +1947,46 @@ "InstanceType": "r5n.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "afs1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json index 83d8a349f..ab4d0139e 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 @@ -179,6 +179,50 @@ "InstanceType": "c5n.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "apne1-az1" @@ -323,6 +367,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "cc2.8xlarge", "Location": "apne1-az1" @@ -959,6 +1043,50 @@ "InstanceType": "m5zn.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "apne1-az1" @@ -1071,6 +1199,46 @@ "InstanceType": "m6i.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -1467,6 +1635,46 @@ "InstanceType": "r6i.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "t1.micro", "Location": "apne1-az1" @@ -1827,6 +2035,50 @@ "InstanceType": "c5n.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "apne1-az2" @@ -2487,6 +2739,78 @@ "InstanceType": "m5n.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "m5zn.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m5zn.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m5zn.3xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m5zn.6xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m5zn.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m5zn.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "m5zn.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "apne1-az2" @@ -3467,6 +3791,50 @@ "InstanceType": "c5n.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.metal", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "c6g.12xlarge", "Location": "apne1-az4" @@ -4291,6 +4659,50 @@ "InstanceType": "m5zn.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.metal", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "m6g.12xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index 501f86c6a..197af9e37 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 @@ -455,6 +455,38 @@ "InstanceType": "i3en.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "apne2-az1" @@ -1087,6 +1119,42 @@ "InstanceType": "r6g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "r6i.12xlarge", "Location": "apne2-az1" @@ -1735,6 +1803,38 @@ "InstanceType": "i3en.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "m5.12xlarge", "Location": "apne2-az2" @@ -2063,6 +2163,42 @@ "InstanceType": "r6g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "apne2-az2" @@ -2671,6 +2807,38 @@ "InstanceType": "i3en.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "apne2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json index 8c5bfab20..83bfe0d1b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json @@ -71,6 +71,34 @@ "InstanceType": "c5d.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c5n.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "c5n.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "apne3-az1" @@ -375,6 +403,42 @@ "InstanceType": "m5d.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "m6i.12xlarge", "Location": "apne3-az1" @@ -487,6 +551,118 @@ "InstanceType": "r5d.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "apne3-az1" @@ -531,6 +707,38 @@ "InstanceType": "x2idn.metal", "Location": "apne3-az1" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "apne3-az2" @@ -603,6 +811,34 @@ "InstanceType": "c5d.xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c5n.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "c5n.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "apne3-az2" @@ -907,6 +1143,42 @@ "InstanceType": "m5d.xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "m6i.12xlarge", "Location": "apne3-az2" @@ -1019,6 +1291,118 @@ "InstanceType": "r5d.xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.medium", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "apne3-az2" @@ -1063,6 +1447,38 @@ "InstanceType": "x2idn.metal", "Location": "apne3-az2" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "c4.2xlarge", "Location": "apne3-az3" @@ -1143,6 +1559,34 @@ "InstanceType": "c5d.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c5n.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "c5n.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "apne3-az3" @@ -1423,6 +1867,42 @@ "InstanceType": "m5d.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "m6i.12xlarge", "Location": "apne3-az3" @@ -1559,6 +2039,82 @@ "InstanceType": "r5d.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.medium", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "apne3-az3" 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 new file mode 100644 index 000000000..8945c6e90 --- /dev/null +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json @@ -0,0 +1,1418 @@ +[ + { + "InstanceType": "c5.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.medium", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.medium", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.medium", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.medium", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.micro", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.nano", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.small", + "Location": "aps2-az1" + }, + { + "InstanceType": "t3.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.medium", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.micro", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.nano", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.small", + "Location": "aps2-az1" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "c5.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.medium", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.medium", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.medium", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.medium", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.micro", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.nano", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.small", + "Location": "aps2-az2" + }, + { + "InstanceType": "t3.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.medium", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.micro", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.nano", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.small", + "Location": "aps2-az2" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "c5.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.medium", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.medium", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.medium", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.metal", + "Location": "aps2-az3" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.medium", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.micro", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.nano", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.small", + "Location": "aps2-az3" + }, + { + "InstanceType": "t3.xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.large", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.medium", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.micro", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.nano", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.small", + "Location": "aps2-az3" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "aps2-az3" + } +] \ No newline at end of file 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 987deb291..21e31b1af 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 @@ -203,6 +203,50 @@ "InstanceType": "c5n.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "apse1-az1" @@ -927,6 +971,50 @@ "InstanceType": "m5zn.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "apse1-az1" @@ -1951,6 +2039,50 @@ "InstanceType": "c5n.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "apse1-az2" @@ -2675,6 +2807,50 @@ "InstanceType": "m5zn.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "apse1-az2" @@ -3639,6 +3815,50 @@ "InstanceType": "c5n.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "c6g.12xlarge", "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 868bdef63..22f2c8dac 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 @@ -235,6 +235,50 @@ "InstanceType": "c5n.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "apse2-az1" @@ -915,6 +959,50 @@ "InstanceType": "m5zn.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "apse2-az1" @@ -1999,6 +2087,50 @@ "InstanceType": "c5n.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "apse2-az2" @@ -2615,6 +2747,50 @@ "InstanceType": "m5zn.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "apse2-az2" @@ -3659,6 +3835,50 @@ "InstanceType": "c5n.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "apse2-az3" @@ -4299,6 +4519,50 @@ "InstanceType": "m5d.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "m6g.12xlarge", "Location": "apse2-az3" @@ -4855,6 +5119,46 @@ "InstanceType": "r6i.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "t1.micro", "Location": "apse2-az3" 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 ad0fc0305..5c3ca97b2 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 @@ -335,6 +335,46 @@ "InstanceType": "m6gd.xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "apse3-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "apse3-az1" @@ -855,6 +895,46 @@ "InstanceType": "m6gd.xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "apse3-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "apse3-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "apse3-az2" @@ -1327,6 +1407,46 @@ "InstanceType": "m6gd.xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "apse3-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "apse3-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 e2c1ebfcf..bcecfb8d4 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 @@ -371,6 +371,46 @@ "InstanceType": "c6i.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az1" @@ -471,6 +511,30 @@ "InstanceType": "g5.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5g.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "euc1-az1" @@ -979,6 +1043,46 @@ "InstanceType": "m6i.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az1" @@ -1407,6 +1511,46 @@ "InstanceType": "r6i.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -2063,6 +2207,46 @@ "InstanceType": "c6i.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az2" @@ -2167,6 +2351,30 @@ "InstanceType": "g4dn.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5g.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "i2.2xlarge", "Location": "euc1-az2" @@ -2771,6 +2979,46 @@ "InstanceType": "m6i.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az2" @@ -3199,6 +3447,46 @@ "InstanceType": "r6i.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" @@ -3319,6 +3607,14 @@ "InstanceType": "u-3tb1.56xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "u-9tb1.112xlarge", "Location": "euc1-az2" @@ -3847,6 +4143,46 @@ "InstanceType": "c6i.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az3" @@ -3991,6 +4327,30 @@ "InstanceType": "g5.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5g.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "i2.2xlarge", "Location": "euc1-az3" @@ -4595,6 +4955,46 @@ "InstanceType": "m6i.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euc1-az3" @@ -5067,6 +5467,46 @@ "InstanceType": "r6i.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json index 056982733..f40fc71b3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json @@ -71,6 +71,10 @@ "InstanceType": "c5d.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az1" @@ -199,6 +203,10 @@ "InstanceType": "m5d.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "m6gd.12xlarge", "Location": "euc2-az1" @@ -307,6 +315,10 @@ "InstanceType": "r5d.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az1" @@ -335,6 +347,22 @@ "InstanceType": "t3.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euc2-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "euc2-az2" @@ -407,6 +435,10 @@ "InstanceType": "c5d.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az2" @@ -535,6 +567,10 @@ "InstanceType": "m5d.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "m6gd.12xlarge", "Location": "euc2-az2" @@ -643,6 +679,10 @@ "InstanceType": "r5d.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az2" @@ -671,6 +711,22 @@ "InstanceType": "t3.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euc2-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "euc2-az3" @@ -743,6 +799,10 @@ "InstanceType": "c5d.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az3" @@ -871,6 +931,10 @@ "InstanceType": "m5d.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "m6gd.12xlarge", "Location": "euc2-az3" @@ -979,6 +1043,10 @@ "InstanceType": "r5d.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az3" 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 7513bdd65..c42505c33 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 @@ -727,6 +727,42 @@ "InstanceType": "r6g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "r6i.12xlarge", "Location": "eun1-az1" @@ -1663,6 +1699,42 @@ "InstanceType": "r6g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "eun1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index ee9c7d983..35babbfab 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -527,6 +527,10 @@ "InstanceType": "c7g.medium", "Location": "euw1-az1" }, + { + "InstanceType": "c7g.metal", + "Location": "euw1-az1" + }, { "InstanceType": "c7g.xlarge", "Location": "euw1-az1" @@ -1375,6 +1379,114 @@ "InstanceType": "m6id.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az1" @@ -1955,6 +2067,42 @@ "InstanceType": "r6in.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "t1.micro", "Location": "euw1-az1" @@ -2803,6 +2951,10 @@ "InstanceType": "c7g.medium", "Location": "euw1-az2" }, + { + "InstanceType": "c7g.metal", + "Location": "euw1-az2" + }, { "InstanceType": "c7g.xlarge", "Location": "euw1-az2" @@ -4335,6 +4487,42 @@ "InstanceType": "r6in.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "t1.micro", "Location": "euw1-az2" @@ -5111,6 +5299,10 @@ "InstanceType": "c7g.medium", "Location": "euw1-az3" }, + { + "InstanceType": "c7g.metal", + "Location": "euw1-az3" + }, { "InstanceType": "c7g.xlarge", "Location": "euw1-az3" @@ -6047,6 +6239,42 @@ "InstanceType": "m6in.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euw1-az3" @@ -6555,6 +6783,114 @@ "InstanceType": "r6id.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "t1.micro", "Location": "euw1-az3" @@ -6671,10 +7007,22 @@ "InstanceType": "t4g.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "x1.16xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 646752a03..e89cf0e61 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 @@ -151,6 +151,50 @@ "InstanceType": "c5n.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "euw2-az1" @@ -699,6 +743,50 @@ "InstanceType": "m5d.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "euw2-az1" @@ -1083,6 +1171,42 @@ "InstanceType": "r6g.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "r6i.12xlarge", "Location": "euw2-az1" @@ -1471,6 +1595,50 @@ "InstanceType": "c5n.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "euw2-az2" @@ -2067,6 +2235,50 @@ "InstanceType": "m5d.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "euw2-az2" @@ -2463,6 +2675,42 @@ "InstanceType": "r6g.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "euw2-az2" 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 b6d429913..5832df100 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 @@ -1447,6 +1447,54 @@ "InstanceType": "i4i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "im4gn.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "is4gen.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "m5.12xlarge", "Location": "euw3-az2" @@ -2563,6 +2611,30 @@ "InstanceType": "i4i.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "im4gn.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "euw3-az3" @@ -2579,6 +2651,30 @@ "InstanceType": "inf1.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "is4gen.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "m5.12xlarge", "Location": "euw3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json index fbb234b0c..7d5ee255f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json @@ -551,6 +551,46 @@ "InstanceType": "r5d.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "mes1-az1" @@ -1175,6 +1215,46 @@ "InstanceType": "r5d.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "mes1-az2" @@ -1799,6 +1879,46 @@ "InstanceType": "r5d.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "mes1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index f9c8e86fd..80ebfe23d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -443,6 +443,38 @@ "InstanceType": "i3en.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "sae1-az1" @@ -1247,6 +1279,10 @@ "InstanceType": "t4g.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "sae1-az1" @@ -1739,6 +1775,38 @@ "InstanceType": "i3en.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "sae1-az2" @@ -2303,6 +2371,10 @@ "InstanceType": "t4g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "sae1-az2" @@ -2767,6 +2839,38 @@ "InstanceType": "i3en.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "sae1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index c19304237..b0e51fc8b 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 @@ -411,6 +411,42 @@ "InstanceType": "c6id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "use1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "use1-az1" @@ -439,6 +475,10 @@ "InstanceType": "c7g.medium", "Location": "use1-az1" }, + { + "InstanceType": "c7g.metal", + "Location": "use1-az1" + }, { "InstanceType": "c7g.xlarge", "Location": "use1-az1" @@ -1243,6 +1283,42 @@ "InstanceType": "m6id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "mac2.metal", "Location": "use1-az1" @@ -1867,6 +1943,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "use1-az1" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "use1-az1" + }, { "InstanceType": "u-6tb1.112xlarge", "Location": "use1-az1" @@ -2499,6 +2579,42 @@ "InstanceType": "c6id.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "c7g.12xlarge", "Location": "use1-az2" @@ -2527,6 +2643,10 @@ "InstanceType": "c7g.medium", "Location": "use1-az2" }, + { + "InstanceType": "c7g.metal", + "Location": "use1-az2" + }, { "InstanceType": "c7g.xlarge", "Location": "use1-az2" @@ -3423,6 +3543,114 @@ "InstanceType": "m6id.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "use1-az2" @@ -3935,6 +4163,114 @@ "InstanceType": "r6id.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "t1.micro", "Location": "use1-az2" @@ -5043,6 +5379,10 @@ "InstanceType": "c7g.medium", "Location": "use1-az4" }, + { + "InstanceType": "c7g.metal", + "Location": "use1-az4" + }, { "InstanceType": "c7g.xlarge", "Location": "use1-az4" @@ -6007,6 +6347,42 @@ "InstanceType": "m6in.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.large", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "mac1.metal", "Location": "use1-az4" @@ -6583,6 +6959,42 @@ "InstanceType": "r6in.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "t1.micro", "Location": "use1-az4" @@ -7183,6 +7595,38 @@ "InstanceType": "c6gd.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.large", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "c6i.12xlarge", "Location": "use1-az5" @@ -7327,6 +7771,10 @@ "InstanceType": "c7g.medium", "Location": "use1-az5" }, + { + "InstanceType": "c7g.metal", + "Location": "use1-az5" + }, { "InstanceType": "c7g.xlarge", "Location": "use1-az5" @@ -8059,6 +8507,42 @@ "InstanceType": "m6in.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.large", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "p3.16xlarge", "Location": "use1-az5" @@ -9343,6 +9827,10 @@ "InstanceType": "c7g.medium", "Location": "use1-az6" }, + { + "InstanceType": "c7g.metal", + "Location": "use1-az6" + }, { "InstanceType": "c7g.xlarge", "Location": "use1-az6" @@ -10307,6 +10795,42 @@ "InstanceType": "m6in.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.large", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "mac1.metal", "Location": "use1-az6" @@ -10903,6 +11427,42 @@ "InstanceType": "r6in.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "t1.micro", "Location": "use1-az6" @@ -11023,6 +11583,10 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "use1-az6" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "use1-az6" + }, { "InstanceType": "u-24tb1.112xlarge", "Location": "use1-az6" 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 dce98edfe..087fbc14c 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 @@ -499,6 +499,10 @@ "InstanceType": "c7g.medium", "Location": "use2-az1" }, + { + "InstanceType": "c7g.metal", + "Location": "use2-az1" + }, { "InstanceType": "c7g.xlarge", "Location": "use2-az1" @@ -1315,6 +1319,42 @@ "InstanceType": "m6in.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "use2-az1" @@ -1895,6 +1935,42 @@ "InstanceType": "r6in.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az1" @@ -2667,6 +2743,10 @@ "InstanceType": "c7g.medium", "Location": "use2-az2" }, + { + "InstanceType": "c7g.metal", + "Location": "use2-az2" + }, { "InstanceType": "c7g.xlarge", "Location": "use2-az2" @@ -3491,10 +3571,50 @@ "InstanceType": "m6in.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "mac1.metal", "Location": "use2-az2" }, + { + "InstanceType": "mac2.metal", + "Location": "use2-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "use2-az2" @@ -4079,6 +4199,42 @@ "InstanceType": "r6in.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az2" @@ -4795,6 +4951,10 @@ "InstanceType": "c7g.medium", "Location": "use2-az3" }, + { + "InstanceType": "c7g.metal", + "Location": "use2-az3" + }, { "InstanceType": "c7g.xlarge", "Location": "use2-az3" @@ -5539,6 +5699,114 @@ "InstanceType": "m6id.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "mac1.metal", "Location": "use2-az3" @@ -6115,6 +6383,42 @@ "InstanceType": "r6in.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json index 0bd3288c2..c91538716 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json @@ -179,6 +179,50 @@ "InstanceType": "c5n.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "usw1-az1" @@ -743,6 +787,50 @@ "InstanceType": "m5zn.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "usw1-az1" @@ -1299,6 +1387,54 @@ "InstanceType": "t4g.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "z1d.12xlarge", "Location": "usw1-az1" @@ -1507,6 +1643,50 @@ "InstanceType": "c5n.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "usw1-az3" @@ -2071,6 +2251,50 @@ "InstanceType": "m5zn.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "m6g.12xlarge", "Location": "usw1-az3" @@ -2627,6 +2851,54 @@ "InstanceType": "t4g.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "z1d.12xlarge", "Location": "usw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index d1f9db2ea..fe8ead627 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 @@ -439,6 +439,42 @@ "InstanceType": "c6id.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "usw2-az1" @@ -467,6 +503,10 @@ "InstanceType": "c7g.medium", "Location": "usw2-az1" }, + { + "InstanceType": "c7g.metal", + "Location": "usw2-az1" + }, { "InstanceType": "c7g.xlarge", "Location": "usw2-az1" @@ -1363,6 +1403,114 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az1" @@ -1887,6 +2035,114 @@ "InstanceType": "r6id.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "t1.micro", "Location": "usw2-az1" @@ -2731,6 +2987,10 @@ "InstanceType": "c7g.medium", "Location": "usw2-az2" }, + { + "InstanceType": "c7g.metal", + "Location": "usw2-az2" + }, { "InstanceType": "c7g.xlarge", "Location": "usw2-az2" @@ -3607,6 +3867,78 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az2" @@ -5003,6 +5335,10 @@ "InstanceType": "c7g.medium", "Location": "usw2-az3" }, + { + "InstanceType": "c7g.metal", + "Location": "usw2-az3" + }, { "InstanceType": "c7g.xlarge", "Location": "usw2-az3" @@ -5895,6 +6231,114 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az3" @@ -6491,6 +6935,42 @@ "InstanceType": "r6in.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "t1.micro", "Location": "usw2-az3" @@ -6611,6 +7091,10 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "usw2-az3" @@ -7215,6 +7699,10 @@ "InstanceType": "c7g.medium", "Location": "usw2-az4" }, + { + "InstanceType": "c7g.metal", + "Location": "usw2-az4" + }, { "InstanceType": "c7g.xlarge", "Location": "usw2-az4" @@ -7515,10 +8003,50 @@ "InstanceType": "m5d.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6a.large", + "Location": "usw2-az4" + }, { "InstanceType": "m6a.metal", "Location": "usw2-az4" }, + { + "InstanceType": "m6a.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "m6g.12xlarge", "Location": "usw2-az4" @@ -8135,6 +8663,10 @@ "InstanceType": "trn1.32xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "x2gd.12xlarge", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json index 8c427983f..71b945639 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json @@ -355,6 +355,42 @@ "InstanceType": "m5d.xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.large", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "af-south-1a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "m6i.12xlarge", "Location": "af-south-1a" @@ -539,6 +575,46 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1a" @@ -983,6 +1059,42 @@ "InstanceType": "m5d.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "m6i.12xlarge", "Location": "af-south-1b" @@ -1167,6 +1279,46 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1b" @@ -1795,6 +1947,46 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json index 06343110c..70daf3ea1 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 @@ -203,6 +203,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-1a" @@ -1027,6 +1071,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-northeast-1a" @@ -2115,6 +2203,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-1c" @@ -2259,6 +2391,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "cc2.8xlarge", "Location": "ap-northeast-1c" @@ -2895,6 +3067,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-northeast-1c" @@ -3007,6 +3223,46 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -3403,6 +3659,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1c" @@ -3763,6 +4059,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-1d" @@ -4423,6 +4763,78 @@ "InstanceType": "m5n.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m5zn.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m5zn.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m5zn.3xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m5zn.6xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m5zn.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m5zn.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m5zn.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "m6g.12xlarge", "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 5da21b1a7..bb75aab1a 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 @@ -455,6 +455,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-2a" @@ -1087,6 +1119,42 @@ "InstanceType": "r6g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "r6i.12xlarge", "Location": "ap-northeast-2a" @@ -1735,6 +1803,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "m5.12xlarge", "Location": "ap-northeast-2b" @@ -2063,6 +2163,42 @@ "InstanceType": "r6g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "r6i.12xlarge", "Location": "ap-northeast-2b" @@ -2671,6 +2807,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json index 5a1d42303..fc00208b4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json @@ -79,6 +79,34 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c5n.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c5n.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-3a" @@ -359,6 +387,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-3a" @@ -495,6 +559,82 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-3a" @@ -655,6 +795,34 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c5n.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c5n.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-3b" @@ -959,6 +1127,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-3b" @@ -1071,6 +1275,118 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-northeast-3b" @@ -1115,6 +1431,38 @@ "InstanceType": "x2idn.metal", "Location": "ap-northeast-3b" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "c5.12xlarge", "Location": "ap-northeast-3c" @@ -1187,6 +1535,34 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c5n.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c5n.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-3c" @@ -1491,6 +1867,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-3c" @@ -1603,6 +2015,118 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-northeast-3c" @@ -1646,5 +2170,37 @@ { "InstanceType": "x2idn.metal", "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-3c" } ] \ No newline at end of file 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 new file mode 100644 index 000000000..ec1d50a00 --- /dev/null +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json @@ -0,0 +1,1418 @@ +[ + { + "InstanceType": "c5.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.medium", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.micro", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.nano", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.small", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t3.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.medium", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.micro", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.nano", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.small", + "Location": "ap-south-2a" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "c5.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.medium", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.micro", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.nano", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.small", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t3.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.medium", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.micro", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.nano", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.small", + "Location": "ap-south-2b" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "c5.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-south-2c" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.medium", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.micro", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.nano", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.small", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t3.xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.large", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.medium", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.micro", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.nano", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.small", + "Location": "ap-south-2c" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "ap-south-2c" + } +] \ No newline at end of file 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 85c3b6e4b..83af2a7df 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 @@ -235,6 +235,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-1a" @@ -959,6 +1003,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-1a" @@ -1943,6 +2031,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-1b" @@ -2667,6 +2799,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-1b" @@ -3639,6 +3815,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "c6g.12xlarge", "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 21209a500..5ebb7ffaa 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 @@ -211,6 +211,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-2a" @@ -851,6 +895,50 @@ "InstanceType": "m5d.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-2a" @@ -1407,6 +1495,46 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2a" @@ -1847,6 +1975,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-2b" @@ -2527,6 +2699,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-2b" @@ -3611,6 +3827,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-2c" @@ -4227,6 +4487,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-2c" 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 fb7504f7c..bc9f78f9f 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 @@ -335,6 +335,46 @@ "InstanceType": "m6gd.xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3a" @@ -855,6 +895,46 @@ "InstanceType": "m6gd.xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-southeast-3b" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3b" @@ -1327,6 +1407,46 @@ "InstanceType": "m6gd.xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3c" 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 38179d65f..cc608dcd2 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 @@ -415,6 +415,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1a" @@ -519,6 +559,30 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5g.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-central-1a" @@ -1123,6 +1187,46 @@ "InstanceType": "m6i.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1a" @@ -1551,6 +1655,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" @@ -1671,6 +1815,14 @@ "InstanceType": "u-3tb1.56xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "u-9tb1.112xlarge", "Location": "eu-central-1a" @@ -2199,6 +2351,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1b" @@ -2343,6 +2535,30 @@ "InstanceType": "g5.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5g.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-central-1b" @@ -2947,6 +3163,46 @@ "InstanceType": "m6i.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1b" @@ -3419,6 +3675,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -4031,6 +4327,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1c" @@ -4131,6 +4467,30 @@ "InstanceType": "g5.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5g.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-1c" @@ -4639,6 +4999,46 @@ "InstanceType": "m6i.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1c" @@ -5067,6 +5467,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json index 52d9be7d7..176b6cffa 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json @@ -71,6 +71,10 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2a" @@ -199,6 +203,10 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2a" @@ -307,6 +315,10 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2a" @@ -335,6 +347,22 @@ "InstanceType": "t3.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-2a" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-central-2b" @@ -407,6 +435,10 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2b" @@ -535,6 +567,10 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2b" @@ -643,6 +679,10 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2b" @@ -671,6 +711,22 @@ "InstanceType": "t3.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-2b" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-central-2c" @@ -743,6 +799,10 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2c" @@ -871,6 +931,10 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2c" @@ -979,6 +1043,10 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2c" 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 63a882b6e..3efac81a4 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 @@ -727,6 +727,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "r6i.12xlarge", "Location": "eu-north-1a" @@ -1663,6 +1699,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "r6i.12xlarge", "Location": "eu-north-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index 2ba1895e8..f45cd95c2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -527,6 +527,10 @@ "InstanceType": "c7g.medium", "Location": "eu-west-1a" }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "c7g.xlarge", "Location": "eu-west-1a" @@ -1375,6 +1379,114 @@ "InstanceType": "m6id.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1a" @@ -1955,6 +2067,42 @@ "InstanceType": "r6in.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1a" @@ -2803,6 +2951,10 @@ "InstanceType": "c7g.medium", "Location": "eu-west-1b" }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "c7g.xlarge", "Location": "eu-west-1b" @@ -4335,6 +4487,42 @@ "InstanceType": "r6in.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1b" @@ -5111,6 +5299,10 @@ "InstanceType": "c7g.medium", "Location": "eu-west-1c" }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "c7g.xlarge", "Location": "eu-west-1c" @@ -6047,6 +6239,42 @@ "InstanceType": "m6in.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-west-1c" @@ -6555,6 +6783,114 @@ "InstanceType": "r6id.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1c" @@ -6671,10 +7007,22 @@ "InstanceType": "t4g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index d791ee957..befe88823 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 @@ -151,6 +151,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-west-2a" @@ -747,6 +791,50 @@ "InstanceType": "m5d.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-west-2a" @@ -1143,6 +1231,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "r6i.12xlarge", "Location": "eu-west-2a" @@ -2863,6 +2987,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-west-2c" @@ -3411,6 +3579,50 @@ "InstanceType": "m5d.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-west-2c" @@ -3795,6 +4007,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "r6i.12xlarge", "Location": "eu-west-2c" 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 eb1d5a47d..9e15db319 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 @@ -1447,6 +1447,54 @@ "InstanceType": "i4i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "m5.12xlarge", "Location": "eu-west-3b" @@ -2563,6 +2611,30 @@ "InstanceType": "i4i.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-3c" @@ -2579,6 +2651,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "m5.12xlarge", "Location": "eu-west-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json index 0b25654b7..6d9f87f2b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json @@ -551,6 +551,46 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "me-south-1a" @@ -1175,6 +1215,46 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "me-south-1b" @@ -1799,6 +1879,46 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "me-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index 0306f5627..804a230c3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -443,6 +443,38 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "sa-east-1a" @@ -1247,6 +1279,10 @@ "InstanceType": "t4g.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "sa-east-1a" @@ -1739,6 +1775,38 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "sa-east-1b" @@ -2303,6 +2371,10 @@ "InstanceType": "t4g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "sa-east-1b" @@ -2767,6 +2839,38 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "sa-east-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index fbc3f9aef..5a94debd3 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 @@ -411,6 +411,42 @@ "InstanceType": "c6id.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1a" @@ -439,6 +475,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-1a" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-1a" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-1a" @@ -1243,6 +1283,42 @@ "InstanceType": "m6id.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1a" @@ -1867,6 +1943,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "u-6tb1.112xlarge", "Location": "us-east-1a" @@ -2499,6 +2579,42 @@ "InstanceType": "c6id.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1b" @@ -2527,6 +2643,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-1b" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-1b" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-1b" @@ -3423,6 +3543,114 @@ "InstanceType": "m6id.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1b" @@ -3935,6 +4163,114 @@ "InstanceType": "r6id.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "t1.micro", "Location": "us-east-1b" @@ -4779,6 +5115,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-1c" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-1c" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-1c" @@ -5743,6 +6083,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1c" @@ -6319,6 +6695,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "t1.micro", "Location": "us-east-1c" @@ -7159,6 +7571,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-1d" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-1d" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-1d" @@ -8123,6 +8539,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1d" @@ -8719,6 +9171,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "t1.micro", "Location": "us-east-1d" @@ -8839,6 +9327,10 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "u-24tb1.112xlarge", "Location": "us-east-1d" @@ -9579,6 +10071,38 @@ "InstanceType": "c6gd.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "c6i.12xlarge", "Location": "us-east-1f" @@ -9723,6 +10247,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-1f" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-1f" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-1f" @@ -10455,6 +10983,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "p3.16xlarge", "Location": "us-east-1f" 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 21641efa8..d7b113033 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 @@ -499,6 +499,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-2a" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-2a" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-2a" @@ -1315,6 +1319,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-2a" @@ -1895,6 +1935,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2a" @@ -2667,6 +2743,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-2b" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-2b" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-2b" @@ -3491,10 +3571,50 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2b" }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-2b" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-2b" @@ -4079,6 +4199,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2b" @@ -4795,6 +4951,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-2c" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-2c" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-2c" @@ -5539,6 +5699,114 @@ "InstanceType": "m6id.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2c" @@ -6115,6 +6383,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json index e94078893..1ea2d85f2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json @@ -179,6 +179,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-west-1a" @@ -743,6 +787,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-west-1a" @@ -1299,6 +1387,54 @@ "InstanceType": "t4g.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "z1d.12xlarge", "Location": "us-west-1a" @@ -1507,6 +1643,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-west-1b" @@ -2071,6 +2251,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-west-1b" @@ -2627,6 +2851,54 @@ "InstanceType": "t4g.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "z1d.12xlarge", "Location": "us-west-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index eae33f6ff..98aad6346 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 @@ -439,6 +439,42 @@ "InstanceType": "c6id.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-2a" @@ -467,6 +503,10 @@ "InstanceType": "c7g.medium", "Location": "us-west-2a" }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-2a" + }, { "InstanceType": "c7g.xlarge", "Location": "us-west-2a" @@ -1363,6 +1403,114 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2a" @@ -1887,6 +2035,114 @@ "InstanceType": "r6id.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -2731,6 +2987,10 @@ "InstanceType": "c7g.medium", "Location": "us-west-2b" }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-2b" + }, { "InstanceType": "c7g.xlarge", "Location": "us-west-2b" @@ -3607,6 +3867,78 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2b" @@ -5003,6 +5335,10 @@ "InstanceType": "c7g.medium", "Location": "us-west-2c" }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-2c" + }, { "InstanceType": "c7g.xlarge", "Location": "us-west-2c" @@ -5895,6 +6231,114 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2c" @@ -6491,6 +6935,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "t1.micro", "Location": "us-west-2c" @@ -6611,6 +7091,10 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-west-2c" @@ -7215,6 +7699,10 @@ "InstanceType": "c7g.medium", "Location": "us-west-2d" }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-2d" + }, { "InstanceType": "c7g.xlarge", "Location": "us-west-2d" @@ -7515,10 +8003,50 @@ "InstanceType": "m5d.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6a.large", + "Location": "us-west-2d" + }, { "InstanceType": "m6a.metal", "Location": "us-west-2d" }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-west-2d" @@ -8135,6 +8663,10 @@ "InstanceType": "trn1.32xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "u-18tb1.112xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "x2gd.12xlarge", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json index 32c0ee5bd..4d1033730 100644 --- a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json @@ -383,6 +383,42 @@ "InstanceType": "m5d.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.large", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "m6i.12xlarge", "Location": "af-south-1" @@ -567,6 +603,46 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.large", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index 64f44359c..5c8efe4d2 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 @@ -203,6 +203,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-1" @@ -1027,6 +1071,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 75247105b..c5f89b162 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 @@ -455,6 +455,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-2" @@ -1091,6 +1123,42 @@ "InstanceType": "r6g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "r6i.12xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json index 503ea487e..836f4e748 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json @@ -91,6 +91,34 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "c5n.18xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c5n.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c5n.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c5n.9xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c5n.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c5n.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c5n.xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-northeast-3" @@ -431,6 +459,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-3" @@ -567,6 +631,118 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-3" @@ -670,5 +846,37 @@ { "InstanceType": "x2idn.metal", "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-3" } ] \ No newline at end of file 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 new file mode 100644 index 000000000..7522b260f --- /dev/null +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json @@ -0,0 +1,474 @@ +[ + { + "InstanceType": "c5.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.18xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.9xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.18xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.9xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "c5d.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.3xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.6xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "i3en.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "m5d.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "r5d.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.medium", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.micro", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.nano", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.small", + "Location": "ap-south-2" + }, + { + "InstanceType": "t3.xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.medium", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.micro", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.nano", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.small", + "Location": "ap-south-2" + }, + { + "InstanceType": "t4g.xlarge", + "Location": "ap-south-2" + } +] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index 2c822ef80..6013f869a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json @@ -235,6 +235,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-1" @@ -959,6 +1003,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index e00830dca..de7eecaa5 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 @@ -235,6 +235,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-southeast-2" @@ -915,6 +959,50 @@ "InstanceType": "m5zn.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-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 cb097dadc..dfebb3bc2 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 @@ -335,6 +335,46 @@ "InstanceType": "m6gd.xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-southeast-3" 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 f160d5b71..7b50e869b 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 @@ -415,6 +415,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1" @@ -559,6 +599,30 @@ "InstanceType": "g5.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5g.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-central-1" @@ -1163,6 +1227,46 @@ "InstanceType": "m6i.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1" @@ -1639,6 +1743,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json index 95f45a172..d173e8902 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json @@ -71,6 +71,10 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "c6g.16xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2" @@ -199,6 +203,10 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "m6g.16xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2" @@ -307,6 +315,10 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "r6g.16xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2" @@ -334,5 +346,21 @@ { "InstanceType": "t3.xlarge", "Location": "eu-central-2" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-2" } ] \ No newline at end of file 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 b3e2282ac..b097a0043 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 @@ -799,6 +799,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "r6i.12xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index efaa9ca44..4045131bf 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -527,6 +527,10 @@ "InstanceType": "c7g.medium", "Location": "eu-west-1" }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-1" + }, { "InstanceType": "c7g.xlarge", "Location": "eu-west-1" @@ -1463,6 +1467,42 @@ "InstanceType": "m6in.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1" @@ -2059,6 +2099,42 @@ "InstanceType": "r6in.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 0e1b24461..7ca6c57a3 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 @@ -151,6 +151,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-west-2" @@ -747,6 +791,50 @@ "InstanceType": "m5d.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-west-2" @@ -1143,6 +1231,42 @@ "InstanceType": "r6g.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "r6i.12xlarge", "Location": "eu-west-2" 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 5dcd77f46..121ee3228 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 @@ -399,6 +399,30 @@ "InstanceType": "i4i.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-3" @@ -415,6 +439,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "m5.12xlarge", "Location": "eu-west-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json index 9f88eb718..cd7973e59 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json @@ -595,6 +595,46 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.large", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "me-south-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "me-south-1" + }, { "InstanceType": "t3.2xlarge", "Location": "me-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 1b253c7ba..b73db1c6c 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -443,6 +443,38 @@ "InstanceType": "i3en.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "sa-east-1" @@ -1247,6 +1279,10 @@ "InstanceType": "t4g.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "sa-east-1" 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 106c89278..896d6daca 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 @@ -527,6 +527,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-1" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-1" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-1" @@ -1495,6 +1499,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1" @@ -2091,6 +2131,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "t1.micro", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index d7272a3ee..c106375cc 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json @@ -499,6 +499,10 @@ "InstanceType": "c7g.medium", "Location": "us-east-2" }, + { + "InstanceType": "c7g.metal", + "Location": "us-east-2" + }, { "InstanceType": "c7g.xlarge", "Location": "us-east-2" @@ -1323,6 +1327,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.large", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2" @@ -1915,6 +1955,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index 13b9b5638..cc8e6a5cb 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json @@ -179,6 +179,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.large", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-west-1" @@ -743,6 +787,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-west-1" @@ -1299,6 +1387,54 @@ "InstanceType": "t4g.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "z1d.12xlarge", "Location": "us-west-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 0bec26e5c..26e97e0a5 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 @@ -527,6 +527,10 @@ "InstanceType": "c7g.medium", "Location": "us-west-2" }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-2" + }, { "InstanceType": "c7g.xlarge", "Location": "us-west-2" @@ -1423,6 +1427,114 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2" @@ -2019,6 +2131,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "t1.micro", "Location": "us-west-2" diff --git a/tests/test_ec2/test_instance_type_offerings.py b/tests/test_ec2/test_instance_type_offerings.py index 16471624f..0446505ab 100644 --- a/tests/test_ec2/test_instance_type_offerings.py +++ b/tests/test_ec2/test_instance_type_offerings.py @@ -55,7 +55,8 @@ def test_describe_instance_type_offering_filter_by_zone(): offerings.should.have.key("InstanceTypeOfferings") offerings = offerings["InstanceTypeOfferings"] - offerings.should.have.length_of(595) + # Exact number of offerings changes quite often, but it's a lot + len(offerings).should.be.greater_than(500) assert all([o["LocationType"] == "availability-zone" for o in offerings]) assert all([o["Location"] == "us-east-1c" for o in offerings]) assert any([o["InstanceType"] == "a1.2xlarge" for o in offerings])