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 934da92897d5..cdf4f0f39230 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 @@ -6907,6 +6907,54 @@ "InstanceType": "r7iz.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r8g.12xlarge", "Location": "apne1-az2" @@ -8527,6 +8575,10 @@ "InstanceType": "hpc7g.8xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "hpc8a.96xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "i2.2xlarge", "Location": "apne1-az4" @@ -10739,6 +10791,54 @@ "InstanceType": "r7iz.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "r8g.12xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index 43dc6e401b78..1ac04f9bbe14 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 @@ -839,6 +839,30 @@ "InstanceType": "g6f.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "g7e.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g7e.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g7e.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g7e.48xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g7e.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g7e.8xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "gr6.4xlarge", "Location": "apne2-az1" @@ -1683,6 +1707,86 @@ "InstanceType": "m8g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne2-az1" @@ -3375,6 +3479,30 @@ "InstanceType": "g6e.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "g7e.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g7e.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g7e.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g7e.48xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g7e.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g7e.8xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "apne2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index 462d8cfc1bac..9dbe9e51ede2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -2299,6 +2299,134 @@ "InstanceType": "m8g.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az1" @@ -9307,6 +9435,134 @@ "InstanceType": "m8g.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "p3.16xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 6e17f28b185c..eae857ee9e98 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 @@ -1739,6 +1739,86 @@ "InstanceType": "m8gd.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw2-az1" @@ -4491,6 +4571,86 @@ "InstanceType": "m8gd.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "euw2-az2" @@ -5311,6 +5471,10 @@ "InstanceType": "t4g.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "euw2-az2" @@ -7143,6 +7307,86 @@ "InstanceType": "m8gd.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "p3.16xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index 0e1a9d4e32b6..8d48bdb56a59 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 @@ -671,6 +671,54 @@ "InstanceType": "c8g.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sae1-az1" @@ -2239,6 +2287,42 @@ "InstanceType": "r7g.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "r7i.12xlarge", "Location": "sae1-az1" @@ -3315,6 +3399,54 @@ "InstanceType": "c8g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sae1-az2" @@ -4687,6 +4819,42 @@ "InstanceType": "r7g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "r7i.12xlarge", "Location": "sae1-az2" @@ -5655,6 +5823,54 @@ "InstanceType": "c8g.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "c8i.12xlarge", "Location": "sae1-az3" @@ -6547,6 +6763,86 @@ "InstanceType": "m8gd.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "p4d.24xlarge", "Location": "sae1-az3" @@ -6963,6 +7259,42 @@ "InstanceType": "r7g.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "r7i.12xlarge", "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 32f4cefba05b..07082a8f6c54 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 @@ -2619,6 +2619,10 @@ "InstanceType": "m8id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "mac-m4.metal", + "Location": "use1-az1" + }, { "InstanceType": "mac2.metal", "Location": "use1-az1" @@ -11955,6 +11959,10 @@ "InstanceType": "m8id.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "mac-m4.metal", + "Location": "use1-az4" + }, { "InstanceType": "mac-m4max.metal", "Location": "use1-az4" @@ -15687,6 +15695,42 @@ "InstanceType": "m7i.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.large", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "use1-az5" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "m8g.12xlarge", "Location": "use1-az5" @@ -21511,6 +21555,10 @@ "InstanceType": "u7i-8tb.112xlarge", "Location": "use1-az6" }, + { + "InstanceType": "u7in-16tb.224xlarge", + "Location": "use1-az6" + }, { "InstanceType": "x1.16xlarge", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index 620192a63806..a2f484752129 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 @@ -2431,6 +2431,42 @@ "InstanceType": "m8a.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.large", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "use2-az1" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "m8g.12xlarge", "Location": "use2-az1" @@ -2659,6 +2695,10 @@ "InstanceType": "m8id.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use2-az1" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "use2-az1" @@ -6831,6 +6871,10 @@ "InstanceType": "mac-m4.metal", "Location": "use2-az2" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use2-az2" + }, { "InstanceType": "mac1.metal", "Location": "use2-az2" @@ -10671,6 +10715,42 @@ "InstanceType": "m8a.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "use2-az3" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "m8g.12xlarge", "Location": "use2-az3" @@ -10903,6 +10983,10 @@ "InstanceType": "mac-m4.metal", "Location": "use2-az3" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use2-az3" + }, { "InstanceType": "mac1.metal", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index d27ac958540e..dc7075b57a84 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 @@ -2943,6 +2943,10 @@ "InstanceType": "mac-m4.metal", "Location": "usw2-az1" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "usw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az1" @@ -7535,10 +7539,18 @@ "InstanceType": "mac-m4.metal", "Location": "usw2-az2" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "usw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az2" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "usw2-az2" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "usw2-az2" 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 1a4e791e8c5e..a66d84133766 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 @@ -1191,6 +1191,10 @@ "InstanceType": "hpc7g.8xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "hpc8a.96xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-northeast-1a" @@ -3403,6 +3407,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r8g.12xlarge", "Location": "ap-northeast-1a" @@ -10767,6 +10819,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r8g.12xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index fad42ccce7d3..a757e70bdff5 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 @@ -839,6 +839,30 @@ "InstanceType": "g6f.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "g7e.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g7e.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g7e.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g7e.48xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g7e.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g7e.8xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "gr6.4xlarge", "Location": "ap-northeast-2a" @@ -1683,6 +1707,86 @@ "InstanceType": "m8g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-2a" @@ -3375,6 +3479,30 @@ "InstanceType": "g6e.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "g7e.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g7e.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g7e.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g7e.48xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g7e.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g7e.8xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "ap-northeast-2b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index 87a1a126a9ff..49145fe805bd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -5679,6 +5679,134 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "p3.16xlarge", "Location": "eu-west-1b" @@ -9215,6 +9343,134 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index ee993e2a23cf..35929db7e916 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 @@ -1851,6 +1851,86 @@ "InstanceType": "m8gd.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2a" @@ -2671,6 +2751,10 @@ "InstanceType": "t4g.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "u7i-8tb.112xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "eu-west-2a" @@ -4503,6 +4587,86 @@ "InstanceType": "m8gd.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "p3.16xlarge", "Location": "eu-west-2b" @@ -7063,6 +7227,86 @@ "InstanceType": "m8gd.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2c" 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 0976d98651d5..4f2080b3bbc7 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 @@ -671,6 +671,54 @@ "InstanceType": "c8g.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sa-east-1a" @@ -2239,6 +2287,42 @@ "InstanceType": "r7g.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "r7i.12xlarge", "Location": "sa-east-1a" @@ -3315,6 +3399,54 @@ "InstanceType": "c8g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sa-east-1b" @@ -4687,6 +4819,42 @@ "InstanceType": "r7g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "r7i.12xlarge", "Location": "sa-east-1b" @@ -5655,6 +5823,54 @@ "InstanceType": "c8g.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "c8i.12xlarge", "Location": "sa-east-1c" @@ -6547,6 +6763,86 @@ "InstanceType": "m8gd.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "p4d.24xlarge", "Location": "sa-east-1c" @@ -6963,6 +7259,42 @@ "InstanceType": "r7g.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "r7i.12xlarge", "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 e7c47278fa4d..bc968038a8cb 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 @@ -4363,6 +4363,10 @@ "InstanceType": "u7i-8tb.112xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "u7in-16tb.224xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "x1.16xlarge", "Location": "us-east-1a" @@ -7255,6 +7259,10 @@ "InstanceType": "m8id.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-east-1b" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1b" @@ -16347,6 +16355,10 @@ "InstanceType": "m8id.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-east-1d" + }, { "InstanceType": "mac-m4max.metal", "Location": "us-east-1d" @@ -20323,6 +20335,42 @@ "InstanceType": "m7i.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "us-east-1f" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "m8g.12xlarge", "Location": "us-east-1f" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index 9fe0b3000b97..837a82f07ae5 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 @@ -2431,6 +2431,42 @@ "InstanceType": "m8a.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "m8g.12xlarge", "Location": "us-east-2a" @@ -2659,6 +2695,10 @@ "InstanceType": "m8id.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-2a" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-east-2a" @@ -6831,6 +6871,10 @@ "InstanceType": "mac-m4.metal", "Location": "us-east-2b" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2b" @@ -10671,6 +10715,42 @@ "InstanceType": "m8a.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "m8g.12xlarge", "Location": "us-east-2c" @@ -10903,6 +10983,10 @@ "InstanceType": "mac-m4.metal", "Location": "us-east-2c" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2c" 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 6fed39933448..487b123d6dad 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 @@ -2935,10 +2935,18 @@ "InstanceType": "mac-m4.metal", "Location": "us-west-2a" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2a" }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-west-2a" + }, { "InstanceType": "mac2-m2pro.metal", "Location": "us-west-2a" @@ -7507,6 +7515,10 @@ "InstanceType": "mac-m4.metal", "Location": "us-west-2b" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-west-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2b" 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 0b14ab34175c..379de20924a9 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 @@ -1227,6 +1227,10 @@ "InstanceType": "hpc7g.8xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "hpc8a.96xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-northeast-1" @@ -3443,6 +3447,54 @@ "InstanceType": "r7iz.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "r8g.12xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index ea1ba8a723b6..8d257874c37c 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 @@ -879,6 +879,30 @@ "InstanceType": "g6f.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "g7e.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g7e.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g7e.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g7e.48xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g7e.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g7e.8xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "gr6.4xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 6a76fe6b944e..42a29482946a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -2315,6 +2315,134 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 9f56756c4445..71e29ea5306b 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 @@ -1903,6 +1903,86 @@ "InstanceType": "m8gd.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i-flex.xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-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 1ce8b9b12615..f6dad0b97ec3 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 @@ -671,6 +671,54 @@ "InstanceType": "c8g.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "c8gd.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.medium", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.metal-24xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.metal-48xl", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gd.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sa-east-1" @@ -2319,6 +2367,42 @@ "InstanceType": "r7g.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "r7i.12xlarge", "Location": "sa-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index 37f684dc45c3..32ac2db281d0 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 @@ -2459,6 +2459,42 @@ "InstanceType": "m8a.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "m8azn.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.3xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.6xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.large", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.metal-12xl", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.metal-24xl", + "Location": "us-east-2" + }, + { + "InstanceType": "m8azn.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "m8g.12xlarge", "Location": "us-east-2" @@ -2691,6 +2727,10 @@ "InstanceType": "mac-m4.metal", "Location": "us-east-2" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-2" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2"