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 e3d3fc13e..a388e3cf9 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 @@ -355,6 +355,38 @@ "InstanceType": "g4dn.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "g5g.16xlarge", "Location": "apne2-az1" @@ -4071,6 +4103,38 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "i3.16xlarge", "Location": "apne2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index 3c4c8379f..45302e524 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 @@ -635,6 +635,38 @@ "InstanceType": "g4dn.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "i2.2xlarge", "Location": "apse2-az1" @@ -2527,6 +2559,38 @@ "InstanceType": "g4dn.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "i2.2xlarge", "Location": "apse2-az2" 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 e40d479d3..a34eafc1f 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 @@ -211,6 +211,38 @@ "InstanceType": "c6in.xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "apse3-az1" @@ -1563,6 +1595,38 @@ "InstanceType": "c6in.xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "i3.16xlarge", "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 1b066f4e4..5ae1cdccf 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 @@ -1159,6 +1159,86 @@ "InstanceType": "m6id.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az1" @@ -1627,6 +1707,86 @@ "InstanceType": "r6id.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -2463,6 +2623,38 @@ "InstanceType": "g4dn.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "g5g.16xlarge", "Location": "euc1-az2" @@ -5183,6 +5375,86 @@ "InstanceType": "m6id.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euc1-az3" @@ -5695,6 +5967,86 @@ "InstanceType": "r6id.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az3" 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 2007e9018..3e61f7036 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 @@ -5127,6 +5127,38 @@ "InstanceType": "c5a.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "c5ad.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "c5ad.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "c5d.12xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json index 2744c5e6e..66febb80c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json @@ -107,6 +107,38 @@ "InstanceType": "c6g.xlarge", "Location": "mec1-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "mec1-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "mec1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "mec1-az1" @@ -659,6 +691,38 @@ "InstanceType": "c6g.xlarge", "Location": "mec1-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "mec1-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "mec1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "mec1-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 ce7679733..9a5d37b3c 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 @@ -467,6 +467,38 @@ "InstanceType": "g4dn.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "sae1-az1" @@ -1931,6 +1963,38 @@ "InstanceType": "g4dn.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "sae1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index d11b52f26..81c4b9913 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json @@ -639,6 +639,38 @@ "InstanceType": "g4dn.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "h1.16xlarge", "Location": "use2-az1" @@ -1439,6 +1471,10 @@ "InstanceType": "m7g.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "mac2.metal", + "Location": "use2-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "use2-az1" @@ -2975,6 +3011,38 @@ "InstanceType": "g4dn.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "h1.16xlarge", "Location": "use2-az2" @@ -5275,6 +5343,38 @@ "InstanceType": "g4dn.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "g5.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g5.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "h1.16xlarge", "Location": "use2-az3" 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 ab2fc9e18..d300b57e4 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 @@ -355,6 +355,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "g5g.16xlarge", "Location": "ap-northeast-2a" @@ -4071,6 +4103,38 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "i3.16xlarge", "Location": "ap-northeast-2d" 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 f3caf66e9..5e5e85a1f 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 @@ -2451,6 +2451,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-2b" @@ -4343,6 +4375,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-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 37aa0e614..c69fbf200 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 @@ -211,6 +211,38 @@ "InstanceType": "c6in.xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "i3.16xlarge", "Location": "ap-southeast-3a" @@ -1563,6 +1595,38 @@ "InstanceType": "c6in.xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "i3.16xlarge", "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 7bd99e0e1..b4df61083 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 @@ -595,6 +595,38 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "g5g.16xlarge", "Location": "eu-central-1a" @@ -3315,6 +3347,86 @@ "InstanceType": "m6id.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1b" @@ -3827,6 +3939,86 @@ "InstanceType": "r6id.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -5227,6 +5419,86 @@ "InstanceType": "m6id.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1c" @@ -5695,6 +5967,86 @@ "InstanceType": "r6id.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1c" 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 07ef762e2..cea2dcc8d 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 @@ -5127,6 +5127,38 @@ "InstanceType": "c5a.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "c5ad.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c5ad.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "c5d.12xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json index af5601f7d..4f6d10a17 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json @@ -107,6 +107,38 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "me-central-1a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "me-central-1a" + }, { "InstanceType": "i3.16xlarge", "Location": "me-central-1a" @@ -659,6 +691,38 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "me-central-1b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "me-central-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "me-central-1b" 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 ca610bed3..f017048a5 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 @@ -467,6 +467,38 @@ "InstanceType": "g4dn.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "i3.16xlarge", "Location": "sa-east-1a" @@ -1931,6 +1963,38 @@ "InstanceType": "g4dn.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "sa-east-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index 4780eeffe..77c25eb42 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json @@ -639,6 +639,38 @@ "InstanceType": "g4dn.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "h1.16xlarge", "Location": "us-east-2a" @@ -1439,6 +1471,10 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-2a" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-2a" @@ -2975,6 +3011,38 @@ "InstanceType": "g4dn.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "h1.16xlarge", "Location": "us-east-2b" @@ -5275,6 +5343,38 @@ "InstanceType": "g4dn.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "g5.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g5.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "h1.16xlarge", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 596f7a012..9f9c72237 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -355,6 +355,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "g5g.16xlarge", "Location": "ap-northeast-2" 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 65f23a3dc..93c529cfc 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 @@ -635,6 +635,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json index d25e4fce4..76068ec02 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json @@ -211,6 +211,38 @@ "InstanceType": "c6in.xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "i3.16xlarge", "Location": "ap-southeast-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 1ed8e39d8..2ad11863d 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 @@ -1343,6 +1343,86 @@ "InstanceType": "m6id.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1" @@ -1859,6 +1939,86 @@ "InstanceType": "r6id.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r6idn.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6idn.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6in.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json index cb0424b04..0832b434b 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json @@ -107,6 +107,38 @@ "InstanceType": "c6g.xlarge", "Location": "me-central-1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "me-central-1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "me-central-1" + }, { "InstanceType": "i3.16xlarge", "Location": "me-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 2c5f79a7b..31318f3ec 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -467,6 +467,38 @@ "InstanceType": "g4dn.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "i3.16xlarge", "Location": "sa-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index 5f44fea91..d0c96a62e 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json @@ -639,6 +639,38 @@ "InstanceType": "g4dn.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "h1.16xlarge", "Location": "us-east-2"