diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json index 48606f946..c3e292ff2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json @@ -227,6 +227,46 @@ "InstanceType": "c6i.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.metal", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "ape1-az1" @@ -995,6 +1035,46 @@ "InstanceType": "c6i.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.metal", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "ape1-az2" @@ -1779,6 +1859,46 @@ "InstanceType": "c6i.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.metal", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "ape1-az3" 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 12e14c147..d87248695 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 @@ -2191,6 +2191,46 @@ "InstanceType": "r7gd.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "t1.micro", "Location": "apne1-az1" @@ -6839,6 +6879,46 @@ "InstanceType": "r7gd.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "t1.micro", "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 7239cfad6..ebac10712 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 @@ -3347,6 +3347,42 @@ "InstanceType": "c6in.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apne2-az3" @@ -3867,6 +3903,86 @@ "InstanceType": "m6id.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apne2-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "apne2-az3" @@ -4295,6 +4411,42 @@ "InstanceType": "r6id.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "apne2-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 81a8546b8..68faee139 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 @@ -1527,6 +1527,22 @@ "InstanceType": "t4g.xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apse3-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "apse3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index c6c399bc2..58776201e 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 @@ -2055,6 +2055,46 @@ "InstanceType": "r7gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -6799,6 +6839,46 @@ "InstanceType": "r7gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.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 e86823f46..d865ca200 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 @@ -3359,6 +3359,50 @@ "InstanceType": "c7gd.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json index d7597b2cb..fe7f6f4a6 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json @@ -1679,6 +1679,50 @@ "InstanceType": "m5d.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "eus1-az2" 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 dbe56e0c4..958a3ae82 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 @@ -1019,6 +1019,50 @@ "InstanceType": "c7g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eus2-az2" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "eus2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 1d11715cf..939462ba0 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 @@ -1511,6 +1511,42 @@ "InstanceType": "r6id.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-az1" @@ -3287,6 +3323,42 @@ "InstanceType": "r6id.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euw2-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 1458024e2..c1ae7f1c9 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 @@ -2883,34 +2883,10 @@ "InstanceType": "x2idn.metal", "Location": "sae1-az2" }, - { - "InstanceType": "x2iedn.16xlarge", - "Location": "sae1-az2" - }, - { - "InstanceType": "x2iedn.24xlarge", - "Location": "sae1-az2" - }, { "InstanceType": "x2iedn.2xlarge", "Location": "sae1-az2" }, - { - "InstanceType": "x2iedn.32xlarge", - "Location": "sae1-az2" - }, - { - "InstanceType": "x2iedn.4xlarge", - "Location": "sae1-az2" - }, - { - "InstanceType": "x2iedn.8xlarge", - "Location": "sae1-az2" - }, - { - "InstanceType": "x2iedn.metal", - "Location": "sae1-az2" - }, { "InstanceType": "x2iedn.xlarge", "Location": "sae1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 101817abf..e22670c2a 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 @@ -1323,6 +1323,82 @@ "InstanceType": "m7g.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "mac2.metal", "Location": "use1-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json index d17d1733b..2ea0ff718 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json @@ -227,6 +227,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1a" @@ -995,6 +1035,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1b" @@ -1779,6 +1859,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1c" 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 6a58414ab..8d5206e03 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 @@ -2247,6 +2247,46 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1a" @@ -4719,6 +4759,46 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1c" 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 49f96ee45..9e20aaf2b 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 @@ -3347,6 +3347,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-2c" @@ -3867,6 +3903,86 @@ "InstanceType": "m6id.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-northeast-2c" @@ -4295,6 +4411,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-2c" 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 13c3c62ae..32072ca3b 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 @@ -1527,6 +1527,22 @@ "InstanceType": "t4g.xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-3b" + }, { "InstanceType": "c5.12xlarge", "Location": "ap-southeast-3c" 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 a86e8df7b..cb77e9bd2 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 @@ -4503,6 +4503,46 @@ "InstanceType": "r7gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -6799,6 +6839,46 @@ "InstanceType": "r7gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "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 620bf5347..618393432 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 @@ -3359,6 +3359,50 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json index 30a2890a4..aa6b0e6de 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json @@ -1679,6 +1679,50 @@ "InstanceType": "m5d.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-south-1b" 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 325396097..9423548f0 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 @@ -1019,6 +1019,50 @@ "InstanceType": "c7g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "c7i.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.48xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.metal-24xl", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.metal-48xl", + "Location": "eu-south-2b" + }, + { + "InstanceType": "c7i.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-south-2b" 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 3616d1bc6..eb4a6c5ad 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 @@ -1571,6 +1571,42 @@ "InstanceType": "r6id.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2a" @@ -4843,6 +4879,42 @@ "InstanceType": "r6id.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "t2.2xlarge", "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 430ac04fd..b39c26756 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 @@ -2883,34 +2883,10 @@ "InstanceType": "x2idn.metal", "Location": "sa-east-1b" }, - { - "InstanceType": "x2iedn.16xlarge", - "Location": "sa-east-1b" - }, - { - "InstanceType": "x2iedn.24xlarge", - "Location": "sa-east-1b" - }, { "InstanceType": "x2iedn.2xlarge", "Location": "sa-east-1b" }, - { - "InstanceType": "x2iedn.32xlarge", - "Location": "sa-east-1b" - }, - { - "InstanceType": "x2iedn.4xlarge", - "Location": "sa-east-1b" - }, - { - "InstanceType": "x2iedn.8xlarge", - "Location": "sa-east-1b" - }, - { - "InstanceType": "x2iedn.metal", - "Location": "sa-east-1b" - }, { "InstanceType": "x2iedn.xlarge", "Location": "sa-east-1b" 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 5ac495e12..e466c9a64 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 @@ -1323,6 +1323,82 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1a" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json index 0a981e6a2..44a6dfbec 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json @@ -227,6 +227,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.metal", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1" 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 0221eea86..d0163d54c 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 @@ -2271,6 +2271,46 @@ "InstanceType": "r7gd.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1" 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 f880a7b8c..24c5a518a 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 @@ -2295,6 +2295,46 @@ "InstanceType": "r7gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.metal-16xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.metal-32xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-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 6b3b6ca18..dae3ddb12 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 @@ -1571,6 +1571,42 @@ "InstanceType": "r6id.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-west-2"