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 ff1a1e89b..e2979d7fd 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 @@ -1539,6 +1539,54 @@ "InstanceType": "m6in.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "apne1-az1" @@ -2231,6 +2279,54 @@ "InstanceType": "r6in.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "r7g.12xlarge", "Location": "apne1-az1" @@ -3195,6 +3291,22 @@ "InstanceType": "d2.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "d3.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "g4ad.16xlarge", "Location": "apne1-az2" @@ -3967,6 +4079,54 @@ "InstanceType": "m6in.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "m7g.12xlarge", "Location": "apne1-az2" @@ -4579,6 +4739,54 @@ "InstanceType": "r6in.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r7g.12xlarge", "Location": "apne1-az2" @@ -6451,6 +6659,54 @@ "InstanceType": "m6in.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "m7g.12xlarge", "Location": "apne1-az4" @@ -7183,6 +7439,54 @@ "InstanceType": "r6in.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "r7g.12xlarge", "Location": "apne1-az4" 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 2d18d4c85..053248f1b 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 @@ -1563,6 +1563,14 @@ "InstanceType": "mac1.metal", "Location": "apse2-az1" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "apse2-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "apse2-az1" @@ -6219,6 +6227,14 @@ "InstanceType": "mac1.metal", "Location": "apse2-az3" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "apse2-az3" + }, { "InstanceType": "r3.2xlarge", "Location": "apse2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json index 68faee139..0fbb8d850 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json @@ -1471,6 +1471,50 @@ "InstanceType": "r6gd.xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse3-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse3-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "apse3-az2" @@ -2243,6 +2287,50 @@ "InstanceType": "r6gd.xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse3-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "apse3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json index c41224a80..49ac826f3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json @@ -415,6 +415,50 @@ "InstanceType": "c7g.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "cac1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "cac1-az1" @@ -2963,6 +3007,70 @@ "InstanceType": "m7g.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "cac1-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "p3.16xlarge", "Location": "cac1-az2" 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 aa28dd79c..593910b54 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 @@ -519,6 +519,50 @@ "InstanceType": "c7gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az1" @@ -1443,6 +1487,10 @@ "InstanceType": "mac1.metal", "Location": "euc1-az1" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "euc1-az1" + }, { "InstanceType": "r4.16xlarge", "Location": "euc1-az1" @@ -3835,6 +3883,10 @@ "InstanceType": "mac1.metal", "Location": "euc1-az2" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "euc1-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "euc1-az2" @@ -5227,6 +5279,50 @@ "InstanceType": "c7gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index d865ca200..bf57c7acf 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json @@ -1383,6 +1383,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eun1-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json index 5d64840c3..c37a819ff 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json @@ -183,6 +183,38 @@ "InstanceType": "c7g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "c7i.12xlarge", "Location": "eus2-az1" @@ -1099,6 +1131,38 @@ "InstanceType": "c7g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "eus2-az2" @@ -1379,6 +1443,38 @@ "InstanceType": "m7g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eus2-az2" @@ -1959,6 +2055,38 @@ "InstanceType": "c7g.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eus2-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "c7i.12xlarge", "Location": "eus2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 28313c772..08ec7b0cf 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 @@ -4027,6 +4027,42 @@ "InstanceType": "c6in.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "c7i.12xlarge", "Location": "euw2-az3" @@ -5095,6 +5131,42 @@ "InstanceType": "r6id.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "r7i.12xlarge", "Location": "euw2-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 530e409dd..2c9fabfcf 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 @@ -2091,6 +2091,70 @@ "InstanceType": "m6i.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw3-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "r4.16xlarge", "Location": "euw3-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index 3022b1492..4dd6a9370 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -439,6 +439,50 @@ "InstanceType": "c6in.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sae1-az1" @@ -1443,6 +1487,50 @@ "InstanceType": "r6i.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "t1.micro", "Location": "sae1-az1" @@ -2055,6 +2143,50 @@ "InstanceType": "c6in.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sae1-az2" @@ -2807,6 +2939,50 @@ "InstanceType": "r6i.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "sae1-az2" @@ -3331,6 +3507,50 @@ "InstanceType": "c6in.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sae1-az3" @@ -4247,6 +4467,50 @@ "InstanceType": "r6i.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "sae1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 3a9fc7b19..0cd5ea6f4 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 @@ -487,6 +487,50 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.large", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az1" @@ -7639,6 +7683,10 @@ "InstanceType": "mac2-m2.metal", "Location": "use1-az4" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "use1-az4" + }, { "InstanceType": "mac2.metal", "Location": "use1-az4" @@ -13199,6 +13247,10 @@ "InstanceType": "mac2-m2.metal", "Location": "use1-az6" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "use1-az6" + }, { "InstanceType": "mac2.metal", "Location": "use1-az6" 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 009570a03..6abe604cf 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 @@ -1555,6 +1555,54 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-northeast-1a" @@ -2287,6 +2335,54 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r7g.12xlarge", "Location": "ap-northeast-1a" @@ -4259,6 +4355,54 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-northeast-1c" @@ -4951,6 +5095,54 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r7g.12xlarge", "Location": "ap-northeast-1c" @@ -5915,6 +6107,22 @@ "InstanceType": "d2.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "d3.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "g4ad.16xlarge", "Location": "ap-northeast-1d" @@ -6687,6 +6895,54 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-northeast-1d" @@ -7299,6 +7555,54 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r7g.12xlarge", "Location": "ap-northeast-1d" 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 6bd9942ce..95cbad592 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 @@ -1463,6 +1463,14 @@ "InstanceType": "mac1.metal", "Location": "ap-southeast-2a" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "ap-southeast-2a" + }, { "InstanceType": "r3.2xlarge", "Location": "ap-southeast-2a" @@ -3831,6 +3839,14 @@ "InstanceType": "mac1.metal", "Location": "ap-southeast-2b" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "ap-southeast-2b" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-2b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json index 32072ca3b..5e5ee3331 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json @@ -1471,6 +1471,50 @@ "InstanceType": "r6gd.xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-3b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-southeast-3b" @@ -2243,6 +2287,50 @@ "InstanceType": "r6gd.xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-southeast-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json index 210404294..8d6535e97 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json @@ -415,6 +415,50 @@ "InstanceType": "c7g.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "ca-central-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ca-central-1a" @@ -2963,6 +3007,70 @@ "InstanceType": "m7g.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ca-central-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "p3.16xlarge", "Location": "ca-central-1b" 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 8bd8e30ce..ca26f5e50 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 @@ -1455,6 +1455,10 @@ "InstanceType": "mac1.metal", "Location": "eu-central-1a" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "eu-central-1a" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1a" @@ -2847,6 +2851,50 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1b" @@ -5391,6 +5439,50 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1c" @@ -6315,6 +6407,10 @@ "InstanceType": "mac1.metal", "Location": "eu-central-1c" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "eu-central-1c" + }, { "InstanceType": "r4.16xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index 618393432..d193fc565 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json @@ -1383,6 +1383,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eu-north-1a" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json index 7d53ea3c2..507b85302 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json @@ -183,6 +183,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2a" @@ -1099,6 +1131,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2b" @@ -1379,6 +1443,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2b" @@ -1959,6 +2055,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-south-2c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index 18986d104..1d50e716f 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 @@ -2271,6 +2271,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-west-2b" @@ -3339,6 +3375,42 @@ "InstanceType": "r6id.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-west-2b" 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 b3a9a8f42..27bb17c73 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 @@ -2091,6 +2091,70 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-3b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "r4.16xlarge", "Location": "eu-west-3b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index f013b194f..fbfe37091 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -439,6 +439,50 @@ "InstanceType": "c6in.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sa-east-1a" @@ -1443,6 +1487,50 @@ "InstanceType": "r6i.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "t1.micro", "Location": "sa-east-1a" @@ -2055,6 +2143,50 @@ "InstanceType": "c6in.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sa-east-1b" @@ -2807,6 +2939,50 @@ "InstanceType": "r6i.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "sa-east-1b" @@ -3331,6 +3507,50 @@ "InstanceType": "c6in.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sa-east-1c" @@ -4247,6 +4467,50 @@ "InstanceType": "r6i.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "sa-east-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index ee2e4ab36..30e8c5b37 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 @@ -487,6 +487,50 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1a" @@ -7383,6 +7427,10 @@ "InstanceType": "mac2-m2.metal", "Location": "us-east-1c" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-1c" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1c" @@ -10379,6 +10427,10 @@ "InstanceType": "mac2-m2.metal", "Location": "us-east-1d" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-1d" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1d" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index 021685b64..8baa8cbd3 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json @@ -1579,6 +1579,54 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "m7a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "m7g.12xlarge", "Location": "ap-northeast-1" @@ -2311,6 +2359,54 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r7a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "r7g.12xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index 2ca78600b..7821ea37b 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 @@ -1563,6 +1563,14 @@ "InstanceType": "mac1.metal", "Location": "ap-southeast-2" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "ap-southeast-2" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json index 870a5107f..9546ddcf8 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json @@ -699,6 +699,50 @@ "InstanceType": "r6gd.xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-southeast-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index a87556367..0620e99ce 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json @@ -563,6 +563,50 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1" @@ -1635,6 +1679,10 @@ "InstanceType": "mac1.metal", "Location": "eu-central-1" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "eu-central-1" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index ffe56efe6..9c7311cdd 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -1511,6 +1511,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "x2idn.16xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json index 408ac6eb1..9eac84983 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json @@ -183,6 +183,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 4f180c07f..e42c2c6e7 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -439,6 +439,50 @@ "InstanceType": "c6in.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "g4dn.12xlarge", "Location": "sa-east-1" @@ -1443,6 +1487,50 @@ "InstanceType": "r6i.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "t1.micro", "Location": "sa-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index 2d71f9e10..a940ca1c0 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 @@ -1903,6 +1903,10 @@ "InstanceType": "mac2-m2.metal", "Location": "us-east-1" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-1" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1"