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 9c1390bb6bc0..15993990db44 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 @@ -8923,6 +8923,10 @@ "InstanceType": "u7in-16tb.224xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "u7in-24tb.224xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "x1.16xlarge", "Location": "euc1-az2" 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 b870474988b4..54395129ace8 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 @@ -9331,42 +9331,6 @@ "InstanceType": "c7g.xlarge", "Location": "euw2-az4" }, - { - "InstanceType": "c7gn.12xlarge", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.16xlarge", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.2xlarge", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.4xlarge", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.8xlarge", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.large", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.medium", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.metal", - "Location": "euw2-az4" - }, - { - "InstanceType": "c7gn.xlarge", - "Location": "euw2-az4" - }, { "InstanceType": "c7i-flex.12xlarge", "Location": "euw2-az4" 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 2a3b1cbc4ac4..e283f14445ad 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 @@ -2563,6 +2563,94 @@ "InstanceType": "r8i.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "t1.micro", "Location": "usw1-az1" @@ -5339,6 +5427,94 @@ "InstanceType": "r8i.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "t1.micro", "Location": "usw1-az3" 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 30529c0e0e18..a2e4acf2d567 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 @@ -4447,6 +4447,10 @@ "InstanceType": "u7in-16tb.224xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "u7in-24tb.224xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-central-1a" 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 231afee10fff..1023df737a6b 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 @@ -9331,42 +9331,6 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-2d" }, - { - "InstanceType": "c7gn.12xlarge", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.16xlarge", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.2xlarge", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.4xlarge", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.8xlarge", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.large", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.medium", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.metal", - "Location": "eu-west-2d" - }, - { - "InstanceType": "c7gn.xlarge", - "Location": "eu-west-2d" - }, { "InstanceType": "c7i-flex.12xlarge", "Location": "eu-west-2d" 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 fcfacf1a1c78..f863c4226fb8 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 @@ -2563,6 +2563,94 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "t1.micro", "Location": "us-west-1a" @@ -5339,6 +5427,94 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "t1.micro", "Location": "us-west-1b" 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 3b2d53513ccf..a9222d464a6f 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 @@ -539,42 +539,6 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-west-2" }, - { - "InstanceType": "c7gn.12xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.16xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.2xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.4xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.8xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.large", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.medium", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.metal", - "Location": "eu-west-2" - }, - { - "InstanceType": "c7gn.xlarge", - "Location": "eu-west-2" - }, { "InstanceType": "c7i-flex.12xlarge", "Location": "eu-west-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 807a2ebe94a5..8a89313fe213 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 @@ -2567,6 +2567,94 @@ "InstanceType": "r8i.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "r8ib.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.96xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.large", + "Location": "us-west-1" + }, + { + "InstanceType": "r8ib.xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.96xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.large", + "Location": "us-west-1" + }, + { + "InstanceType": "r8in.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "t1.micro", "Location": "us-west-1"