From 93b2f876d4540ac0a11c44e6cf705dd32018eb53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 8 Oct 2023 09:29:12 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings (#6890) --- .../availability-zone-id/ap-south-1.json | 40 +++ .../availability-zone-id/ap-southeast-2.json | 28 +- .../availability-zone-id/eu-central-1.json | 40 +++ .../availability-zone-id/eu-west-1.json | 156 ++++++++++++ .../availability-zone-id/eu-west-3.json | 40 +++ .../availability-zone-id/us-east-1.json | 240 +++++++++++++++--- .../availability-zone-id/us-east-2.json | 108 ++++++++ .../availability-zone-id/us-west-1.json | 216 ++++++++++++++++ .../availability-zone-id/us-west-2.json | 180 +++++++++++-- .../availability-zone/ap-south-1.json | 40 +++ .../availability-zone/ap-southeast-2.json | 28 +- .../availability-zone/eu-central-1.json | 40 +++ .../availability-zone/eu-west-1.json | 156 ++++++++++++ .../availability-zone/eu-west-3.json | 40 +++ .../availability-zone/us-east-1.json | 240 +++++++++++++++--- .../availability-zone/us-east-2.json | 108 ++++++++ .../availability-zone/us-west-1.json | 216 ++++++++++++++++ .../availability-zone/us-west-2.json | 180 +++++++++++-- .../region/ap-southeast-2.json | 12 +- .../region/eu-west-1.json | 52 ++++ .../region/us-east-1.json | 60 ++++- .../region/us-east-2.json | 52 ++++ .../region/us-west-1.json | 108 ++++++++ .../region/us-west-2.json | 60 ++++- 24 files changed, 2272 insertions(+), 168 deletions(-) diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json index d0a1327b8..cb5d75fc6 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json @@ -331,6 +331,46 @@ "InstanceType": "c6i.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "aps1-az1" 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 8641a7fe7..cb3538b3c 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 @@ -583,14 +583,6 @@ "InstanceType": "f1.4xlarge", "Location": "apse2-az1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "apse2-az1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "apse2-az1" - }, { "InstanceType": "g3.16xlarge", "Location": "apse2-az1" @@ -1923,6 +1915,10 @@ "InstanceType": "t4g.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "apse2-az1" @@ -3875,6 +3871,10 @@ "InstanceType": "t4g.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "u-6tb1.112xlarge", "Location": "apse2-az2" @@ -4539,14 +4539,6 @@ "InstanceType": "d3.xlarge", "Location": "apse2-az3" }, - { - "InstanceType": "g2.2xlarge", - "Location": "apse2-az3" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "apse2-az3" - }, { "InstanceType": "g3.16xlarge", "Location": "apse2-az3" @@ -5795,6 +5787,10 @@ "InstanceType": "t4g.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "apse2-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 45b06a4f7..29d7bc598 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 @@ -2675,6 +2675,46 @@ "InstanceType": "c6id.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "c7g.12xlarge", "Location": "euc1-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 a30c68df6..8476a5d4b 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 @@ -503,6 +503,54 @@ "InstanceType": "c6in.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "euw1-az1" @@ -2403,6 +2451,10 @@ "InstanceType": "r7a.medium", "Location": "euw1-az1" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "euw1-az1" + }, { "InstanceType": "r7a.xlarge", "Location": "euw1-az1" @@ -3299,6 +3351,54 @@ "InstanceType": "c6in.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "c7g.12xlarge", "Location": "euw1-az2" @@ -5203,6 +5303,10 @@ "InstanceType": "r7a.medium", "Location": "euw1-az2" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "euw1-az2" + }, { "InstanceType": "r7a.xlarge", "Location": "euw1-az2" @@ -6075,6 +6179,54 @@ "InstanceType": "c6in.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "euw1-az3" @@ -7963,6 +8115,10 @@ "InstanceType": "r7a.medium", "Location": "euw1-az3" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "euw1-az3" + }, { "InstanceType": "r7a.xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index 85f77420e..dcf55839f 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 @@ -1503,6 +1503,46 @@ "InstanceType": "c6i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "euw3-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 83c03d2e9..ba75765e8 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 @@ -2659,6 +2659,54 @@ "InstanceType": "c6in.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "use1-az2" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "c7g.12xlarge", "Location": "use1-az2" @@ -2835,14 +2883,6 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "use1-az2" - }, { "InstanceType": "g3.16xlarge", "Location": "use1-az2" @@ -4579,6 +4619,10 @@ "InstanceType": "r7a.medium", "Location": "use1-az2" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use1-az2" + }, { "InstanceType": "r7a.xlarge", "Location": "use1-az2" @@ -5071,14 +5115,6 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az3" }, - { - "InstanceType": "g2.2xlarge", - "Location": "use1-az3" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "use1-az3" - }, { "InstanceType": "g3.16xlarge", "Location": "use1-az3" @@ -5771,6 +5807,54 @@ "InstanceType": "c6in.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.large", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "use1-az4" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "c7g.12xlarge", "Location": "use1-az4" @@ -5975,14 +6059,6 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az4" }, - { - "InstanceType": "g2.2xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "use1-az4" - }, { "InstanceType": "g3.16xlarge", "Location": "use1-az4" @@ -7707,6 +7783,10 @@ "InstanceType": "r7a.medium", "Location": "use1-az4" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use1-az4" + }, { "InstanceType": "r7a.xlarge", "Location": "use1-az4" @@ -8567,6 +8647,54 @@ "InstanceType": "c6in.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.large", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "use1-az5" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "c7g.12xlarge", "Location": "use1-az5" @@ -10215,6 +10343,10 @@ "InstanceType": "r7a.medium", "Location": "use1-az5" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use1-az5" + }, { "InstanceType": "r7a.xlarge", "Location": "use1-az5" @@ -11067,6 +11199,54 @@ "InstanceType": "c6in.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.large", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "use1-az6" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "c7g.12xlarge", "Location": "use1-az6" @@ -11271,14 +11451,6 @@ "InstanceType": "f1.4xlarge", "Location": "use1-az6" }, - { - "InstanceType": "g2.2xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "use1-az6" - }, { "InstanceType": "g3.16xlarge", "Location": "use1-az6" @@ -13035,6 +13207,10 @@ "InstanceType": "r7a.medium", "Location": "use1-az6" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use1-az6" + }, { "InstanceType": "r7a.xlarge", "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 80e9fa5ba..294c7e541 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 @@ -475,6 +475,54 @@ "InstanceType": "c6in.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.large", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "use2-az1" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "use2-az1" @@ -2307,6 +2355,10 @@ "InstanceType": "r7a.medium", "Location": "use2-az1" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use2-az1" + }, { "InstanceType": "r7a.xlarge", "Location": "use2-az1" @@ -4999,6 +5051,10 @@ "InstanceType": "r7a.medium", "Location": "use2-az2" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use2-az2" + }, { "InstanceType": "r7a.xlarge", "Location": "use2-az2" @@ -5763,6 +5819,54 @@ "InstanceType": "c6in.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.large", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "use2-az3" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "use2-az3" @@ -7591,6 +7695,10 @@ "InstanceType": "r7a.medium", "Location": "use2-az3" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "use2-az3" + }, { "InstanceType": "r7a.xlarge", "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 85dbe33df..bd4ef3201 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 @@ -367,6 +367,42 @@ "InstanceType": "c6i.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "usw1-az1" @@ -935,6 +971,42 @@ "InstanceType": "m6i.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "usw1-az1" @@ -1263,6 +1335,42 @@ "InstanceType": "r6i.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "t1.micro", "Location": "usw1-az1" @@ -1823,6 +1931,42 @@ "InstanceType": "c6i.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "usw1-az3" @@ -2391,6 +2535,42 @@ "InstanceType": "m6i.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "r3.2xlarge", "Location": "usw1-az3" @@ -2719,6 +2899,42 @@ "InstanceType": "r6i.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "t1.micro", "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 e86e62234..ea926adc0 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 @@ -479,6 +479,54 @@ "InstanceType": "c6in.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "c7g.12xlarge", "Location": "usw2-az1" @@ -687,14 +735,6 @@ "InstanceType": "f1.4xlarge", "Location": "usw2-az1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "usw2-az1" - }, { "InstanceType": "g3.16xlarge", "Location": "usw2-az1" @@ -2443,6 +2483,10 @@ "InstanceType": "r7a.medium", "Location": "usw2-az1" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "usw2-az1" + }, { "InstanceType": "r7a.xlarge", "Location": "usw2-az1" @@ -3587,14 +3631,6 @@ "InstanceType": "f1.4xlarge", "Location": "usw2-az2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "usw2-az2" - }, { "InstanceType": "g3.16xlarge", "Location": "usw2-az2" @@ -6167,6 +6203,54 @@ "InstanceType": "c6in.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "c7g.12xlarge", "Location": "usw2-az3" @@ -6371,14 +6455,6 @@ "InstanceType": "f1.4xlarge", "Location": "usw2-az3" }, - { - "InstanceType": "g2.2xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "usw2-az3" - }, { "InstanceType": "g3.16xlarge", "Location": "usw2-az3" @@ -8127,6 +8203,10 @@ "InstanceType": "r7a.medium", "Location": "usw2-az3" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "usw2-az3" + }, { "InstanceType": "r7a.xlarge", "Location": "usw2-az3" @@ -8931,6 +9011,54 @@ "InstanceType": "c6id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "c7g.12xlarge", "Location": "usw2-az4" @@ -9943,6 +10071,10 @@ "InstanceType": "r7a.medium", "Location": "usw2-az4" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "usw2-az4" + }, { "InstanceType": "r7a.xlarge", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json index d1d5d89ab..f554979d8 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json @@ -331,6 +331,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "c7g.12xlarge", "Location": "ap-south-1a" 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 0dcd94932..40464a66f 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 @@ -547,14 +547,6 @@ "InstanceType": "d3.xlarge", "Location": "ap-southeast-2a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-southeast-2a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-southeast-2a" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-southeast-2a" @@ -1803,6 +1795,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "ap-southeast-2a" @@ -2475,14 +2471,6 @@ "InstanceType": "f1.4xlarge", "Location": "ap-southeast-2b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-southeast-2b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-southeast-2b" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-southeast-2b" @@ -3815,6 +3803,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "ap-southeast-2b" @@ -5767,6 +5759,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "u-6tb1.112xlarge", "Location": "ap-southeast-2c" 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 d33573bf0..0f5fc6fa8 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 @@ -455,6 +455,46 @@ "InstanceType": "c6id.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-central-1a" 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 ab9fddf75..8cf06573f 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 @@ -503,6 +503,54 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-west-1a" @@ -2403,6 +2451,10 @@ "InstanceType": "r7a.medium", "Location": "eu-west-1a" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "eu-west-1a" + }, { "InstanceType": "r7a.xlarge", "Location": "eu-west-1a" @@ -3299,6 +3351,54 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-west-1b" @@ -5203,6 +5303,10 @@ "InstanceType": "r7a.medium", "Location": "eu-west-1b" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "eu-west-1b" + }, { "InstanceType": "r7a.xlarge", "Location": "eu-west-1b" @@ -6075,6 +6179,54 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-west-1c" @@ -7963,6 +8115,10 @@ "InstanceType": "r7a.medium", "Location": "eu-west-1c" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "eu-west-1c" + }, { "InstanceType": "r7a.xlarge", "Location": "eu-west-1c" 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 f386aeabd..2ee189f67 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 @@ -1503,6 +1503,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-3b" 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 9232b52a0..afb792a72 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 @@ -2659,6 +2659,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1b" @@ -2835,14 +2883,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "g3.16xlarge", "Location": "us-east-1b" @@ -4579,6 +4619,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-1b" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-1b" + }, { "InstanceType": "r7a.xlarge", "Location": "us-east-1b" @@ -5507,6 +5551,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1c" @@ -5711,14 +5803,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "g3.16xlarge", "Location": "us-east-1c" @@ -7443,6 +7527,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-1c" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-1c" + }, { "InstanceType": "r7a.xlarge", "Location": "us-east-1c" @@ -8367,6 +8455,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1d" @@ -8571,14 +8707,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1d" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-east-1d" - }, { "InstanceType": "g3.16xlarge", "Location": "us-east-1d" @@ -10335,6 +10463,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-1d" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-1d" + }, { "InstanceType": "r7a.xlarge", "Location": "us-east-1d" @@ -10831,14 +10963,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1e" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-east-1e" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-east-1e" - }, { "InstanceType": "g3.16xlarge", "Location": "us-east-1e" @@ -11467,6 +11591,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1f" @@ -13115,6 +13287,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-1f" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-1f" + }, { "InstanceType": "r7a.xlarge", "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 354a4c752..cd8beee8f 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 @@ -475,6 +475,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-2a" @@ -2307,6 +2355,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-2a" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-2a" + }, { "InstanceType": "r7a.xlarge", "Location": "us-east-2a" @@ -4999,6 +5051,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-2b" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-2b" + }, { "InstanceType": "r7a.xlarge", "Location": "us-east-2b" @@ -5763,6 +5819,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-2c" @@ -7591,6 +7695,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-2c" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-2c" + }, { "InstanceType": "r7a.xlarge", "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 67eeb0f14..3f77714a5 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 @@ -367,6 +367,42 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1a" @@ -935,6 +971,42 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1a" @@ -1263,6 +1335,42 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "t1.micro", "Location": "us-west-1a" @@ -1823,6 +1931,42 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1b" @@ -2391,6 +2535,42 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1b" @@ -2719,6 +2899,42 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "t1.micro", "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 a756b5ddd..e4e1d1fce 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 @@ -479,6 +479,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-2a" @@ -687,14 +735,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-west-2a" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-2a" - }, { "InstanceType": "g3.16xlarge", "Location": "us-west-2a" @@ -2443,6 +2483,10 @@ "InstanceType": "r7a.medium", "Location": "us-west-2a" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-west-2a" + }, { "InstanceType": "r7a.xlarge", "Location": "us-west-2a" @@ -3587,14 +3631,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-west-2b" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-2b" - }, { "InstanceType": "g3.16xlarge", "Location": "us-west-2b" @@ -6167,6 +6203,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-2c" @@ -6371,14 +6455,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-west-2c" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-2c" - }, { "InstanceType": "g3.16xlarge", "Location": "us-west-2c" @@ -8127,6 +8203,10 @@ "InstanceType": "r7a.medium", "Location": "us-west-2c" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-west-2c" + }, { "InstanceType": "r7a.xlarge", "Location": "us-west-2c" @@ -8931,6 +9011,54 @@ "InstanceType": "c6id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-2d" @@ -9943,6 +10071,10 @@ "InstanceType": "r7a.medium", "Location": "us-west-2d" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-west-2d" + }, { "InstanceType": "r7a.xlarge", "Location": "us-west-2d" 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 16315a7d7..2a8d6df2c 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 @@ -583,14 +583,6 @@ "InstanceType": "f1.4xlarge", "Location": "ap-southeast-2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "ap-southeast-2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "ap-southeast-2" - }, { "InstanceType": "g3.16xlarge", "Location": "ap-southeast-2" @@ -1923,6 +1915,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "ap-southeast-2" 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 a654f2909..595bba45d 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 @@ -503,6 +503,54 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "c7g.12xlarge", "Location": "eu-west-1" @@ -2435,6 +2483,10 @@ "InstanceType": "r7a.medium", "Location": "eu-west-1" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "eu-west-1" + }, { "InstanceType": "r7a.xlarge", "Location": "eu-west-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 933fdc238..c281ed0c9 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 @@ -503,6 +503,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-1" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-1" @@ -711,14 +759,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-east-1" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-east-1" - }, { "InstanceType": "g3.16xlarge", "Location": "us-east-1" @@ -2479,6 +2519,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-1" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-1" + }, { "InstanceType": "r7a.xlarge", "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 e8ac697a6..cebec84c6 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 @@ -475,6 +475,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.large", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-east-2" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-east-2" @@ -2347,6 +2395,10 @@ "InstanceType": "r7a.medium", "Location": "us-east-2" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-east-2" + }, { "InstanceType": "r7a.xlarge", "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 aa4f6bc2d..fea11e000 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 @@ -367,6 +367,42 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-1" @@ -935,6 +971,42 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1" @@ -1263,6 +1335,42 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "t1.micro", "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 7e9f62423..ae108518d 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 @@ -503,6 +503,54 @@ "InstanceType": "c6in.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "c7a.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.large", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.metal-48xl", + "Location": "us-west-2" + }, + { + "InstanceType": "c7a.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "c7g.12xlarge", "Location": "us-west-2" @@ -711,14 +759,6 @@ "InstanceType": "f1.4xlarge", "Location": "us-west-2" }, - { - "InstanceType": "g2.2xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "g2.8xlarge", - "Location": "us-west-2" - }, { "InstanceType": "g3.16xlarge", "Location": "us-west-2" @@ -2471,6 +2511,10 @@ "InstanceType": "r7a.medium", "Location": "us-west-2" }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "us-west-2" + }, { "InstanceType": "r7a.xlarge", "Location": "us-west-2"