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 db3be8416..ff1a1e89b 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 @@ -4647,6 +4647,50 @@ "InstanceType": "r7gd.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apne1-az2" 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 e6093bb26..6ef98b9a7 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 @@ -1763,6 +1763,10 @@ "InstanceType": "t4g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "u-6tb1.112xlarge", "Location": "apne2-az1" 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 c88c855a7..28313c772 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 @@ -1667,6 +1667,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "euw2-az1" @@ -3795,6 +3799,50 @@ "InstanceType": "c5n.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "euw2-az3" @@ -5211,6 +5259,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "x1.16xlarge", "Location": "euw2-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 9078869ef..3a9fc7b19 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 @@ -1287,6 +1287,86 @@ "InstanceType": "m6id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "use1-az1" @@ -3035,6 +3115,38 @@ "InstanceType": "c7gd.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "use1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index f8eeb40bb..8c9296d40 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 @@ -2671,6 +2671,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "use2-az1" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "use2-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "use2-az1" @@ -5479,6 +5483,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "use2-az2" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "use2-az2" + }, { "InstanceType": "x1.16xlarge", "Location": "use2-az2" 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 23164d255..cbda318c0 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 @@ -9955,6 +9955,86 @@ "InstanceType": "m6id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "m7g.12xlarge", "Location": "usw2-az4" 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 247aef8c3..009570a03 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 @@ -7367,6 +7367,50 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 777f39289..1cd4edecd 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 @@ -1763,6 +1763,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "u-6tb1.112xlarge", "Location": "ap-northeast-2a" 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 38dc1dc3b..18986d104 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 @@ -2043,6 +2043,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-west-2b" @@ -3459,6 +3503,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-2b" @@ -5211,6 +5259,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 8e94fa4c6..ee2e4ab36 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 @@ -1287,6 +1287,86 @@ "InstanceType": "m6id.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "us-east-1a" @@ -3035,6 +3115,38 @@ "InstanceType": "c7gd.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c7gn.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gn.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "c7i.12xlarge", "Location": "us-east-1b" 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 2b0e332c3..488c5a672 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 @@ -2671,6 +2671,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "x1.16xlarge", "Location": "us-east-2a" @@ -5479,6 +5483,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "x1.16xlarge", "Location": "us-east-2b" 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 031ade678..21772f1bb 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 @@ -9955,6 +9955,86 @@ "InstanceType": "m6id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "m7g.12xlarge", "Location": "us-west-2d" 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 88b68bc9f..a212d8624 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 @@ -1767,6 +1767,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "u-24tb1.112xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 0175f2c56..a2fd6f4a0 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 @@ -1815,6 +1815,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-2" 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 c18be1999..bcb7d751b 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 @@ -2723,6 +2723,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "us-east-2" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "us-east-2" + }, { "InstanceType": "x1.16xlarge", "Location": "us-east-2"