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 ab4d0139e..7481cbdd4 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 @@ -407,6 +407,78 @@ "InstanceType": "c6id.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "cc2.8xlarge", "Location": "apne1-az1" @@ -1239,6 +1311,78 @@ "InstanceType": "m6id.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -1675,6 +1819,78 @@ "InstanceType": "r6id.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "t1.micro", "Location": "apne1-az1" @@ -2263,6 +2479,78 @@ "InstanceType": "c6id.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az2" @@ -2963,6 +3251,78 @@ "InstanceType": "m6id.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r4.16xlarge", "Location": "apne1-az2" @@ -3383,6 +3743,78 @@ "InstanceType": "r6id.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apne1-az2" @@ -4855,6 +5287,78 @@ "InstanceType": "m6id.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az4" @@ -5331,6 +5835,78 @@ "InstanceType": "r6id.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "t1.micro", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index 21e31b1af..3310e1a90 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json @@ -391,6 +391,42 @@ "InstanceType": "c6i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apse1-az1" @@ -1127,6 +1163,78 @@ "InstanceType": "m6i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apse1-az1" @@ -1559,6 +1667,78 @@ "InstanceType": "r6i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "t1.micro", "Location": "apse1-az1" @@ -2227,6 +2407,42 @@ "InstanceType": "c6i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apse1-az2" @@ -2963,6 +3179,78 @@ "InstanceType": "m6i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "mac1.metal", "Location": "apse1-az2" @@ -3395,6 +3683,78 @@ "InstanceType": "r6i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "t1.micro", "Location": "apse1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index 22f2c8dac..1cb0951c9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json @@ -463,6 +463,42 @@ "InstanceType": "c6id.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apse2-az1" @@ -2315,6 +2351,42 @@ "InstanceType": "c6id.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "apse2-az2" @@ -4063,6 +4135,42 @@ "InstanceType": "c6id.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apse2-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 bcecfb8d4..2c8dc822f 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 @@ -411,6 +411,42 @@ "InstanceType": "c6id.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az1" @@ -2247,6 +2283,42 @@ "InstanceType": "c6id.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az2" @@ -4183,6 +4255,42 @@ "InstanceType": "c6id.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index c42505c33..073599b9c 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 @@ -1271,6 +1271,10 @@ "InstanceType": "hpc6a.48xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "hpc6id.32xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "eun1-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 35babbfab..d5d4fdc93 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 @@ -3891,6 +3891,42 @@ "InstanceType": "m6in.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "mac1.metal", "Location": "euw1-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 b0e51fc8b..d8b06bacc 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 @@ -1819,6 +1819,42 @@ "InstanceType": "r6id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "t1.micro", "Location": "use1-az1" @@ -9055,6 +9091,42 @@ "InstanceType": "r6in.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.large", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "t1.micro", "Location": "use1-az5" 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 fe8ead627..1bb471bb5 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 @@ -3939,6 +3939,42 @@ "InstanceType": "m6in.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az2" @@ -4531,6 +4567,42 @@ "InstanceType": "r6in.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "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 70daf3ea1..fa8b58771 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 @@ -1267,6 +1267,78 @@ "InstanceType": "m6id.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1a" @@ -1743,6 +1815,78 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1a" @@ -2431,6 +2575,78 @@ "InstanceType": "c6id.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "cc2.8xlarge", "Location": "ap-northeast-1c" @@ -3263,6 +3479,78 @@ "InstanceType": "m6id.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -3699,6 +3987,78 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1c" @@ -4287,6 +4647,78 @@ "InstanceType": "c6id.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1d" @@ -4987,6 +5419,78 @@ "InstanceType": "m6id.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r4.16xlarge", "Location": "ap-northeast-1d" @@ -5407,6 +5911,78 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json index 83af2a7df..db7e4656e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json @@ -423,6 +423,42 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1a" @@ -1159,6 +1195,78 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1a" @@ -1591,6 +1699,78 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-1a" @@ -2219,6 +2399,42 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1b" @@ -2955,6 +3171,78 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1b" @@ -3387,6 +3675,78 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index 5ebb7ffaa..b2314c60a 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json @@ -439,6 +439,42 @@ "InstanceType": "c6id.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2a" @@ -2203,6 +2239,42 @@ "InstanceType": "c6id.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2b" @@ -4055,6 +4127,42 @@ "InstanceType": "c6id.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2c" 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 cc608dcd2..95ecc7faf 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 @@ -455,6 +455,42 @@ "InstanceType": "c6id.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1a" @@ -2391,6 +2427,42 @@ "InstanceType": "c6id.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1b" @@ -4367,6 +4439,42 @@ "InstanceType": "c6id.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "d2.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 3efac81a4..0d3964dd5 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 @@ -1271,6 +1271,10 @@ "InstanceType": "hpc6a.48xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "hpc6id.32xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1b" 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 f45cd95c2..b984eacc0 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 @@ -3891,6 +3891,42 @@ "InstanceType": "m6in.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-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 5a94debd3..a93e8e0a9 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 @@ -1819,6 +1819,42 @@ "InstanceType": "r6id.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "t1.micro", "Location": "us-east-1a" @@ -11531,6 +11567,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "t1.micro", "Location": "us-east-1f" 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 98aad6346..4d3eaaabf 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 @@ -3939,6 +3939,42 @@ "InstanceType": "m6in.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2b" @@ -4531,6 +4567,42 @@ "InstanceType": "r6in.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "t1.micro", "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 5c8efe4d2..bfd2d8634 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 @@ -431,6 +431,78 @@ "InstanceType": "c6id.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "cc2.8xlarge", "Location": "ap-northeast-1" @@ -1267,6 +1339,78 @@ "InstanceType": "m6id.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1" @@ -1743,6 +1887,78 @@ "InstanceType": "r6id.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index 6013f869a..412564516 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json @@ -423,6 +423,42 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "c6in.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6in.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1" @@ -1159,6 +1195,78 @@ "InstanceType": "m6i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1" @@ -1591,6 +1699,78 @@ "InstanceType": "r6i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index de7eecaa5..50dbfc8c1 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json @@ -463,6 +463,42 @@ "InstanceType": "c6id.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-2" 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 7b50e869b..e0d7a25b0 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 @@ -455,6 +455,42 @@ "InstanceType": "c6id.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index b097a0043..a27cb5e8d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -355,6 +355,10 @@ "InstanceType": "hpc6a.48xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "hpc6id.32xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1"