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 520ee9461299..8608d307267d 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 @@ -1068,79 +1068,147 @@ "Location": "apne1-az1" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "c9g.12xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "c9g.16xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d2.8xlarge", + "InstanceType": "c9g.24xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d2.xlarge", + "InstanceType": "c9g.2xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3.2xlarge", + "InstanceType": "c9g.48xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3.4xlarge", + "InstanceType": "c9g.4xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3.8xlarge", + "InstanceType": "c9g.8xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3.xlarge", + "InstanceType": "c9g.large", "Location": "apne1-az1" }, { - "InstanceType": "d3en.12xlarge", + "InstanceType": "c9g.medium", "Location": "apne1-az1" }, { - "InstanceType": "d3en.2xlarge", + "InstanceType": "c9g.metal-48xl", "Location": "apne1-az1" }, { - "InstanceType": "d3en.4xlarge", + "InstanceType": "c9g.xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3en.6xlarge", + "InstanceType": "c9gd.12xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3en.8xlarge", + "InstanceType": "c9gd.16xlarge", "Location": "apne1-az1" }, { - "InstanceType": "d3en.xlarge", + "InstanceType": "c9gd.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "c9gd.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d2.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d2.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d2.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d2.xlarge", "Location": "apne1-az1" }, { - "InstanceType": "g4ad.16xlarge", + "InstanceType": "d3.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d3.8xlarge", "Location": "apne1-az1" }, { - "InstanceType": "g4ad.2xlarge", + "InstanceType": "d3.xlarge", "Location": "apne1-az1" }, { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "d3en.12xlarge", "Location": "apne1-az1" }, { - "InstanceType": "g4ad.8xlarge", + "InstanceType": "d3en.2xlarge", "Location": "apne1-az1" }, { - "InstanceType": "g4ad.xlarge", + "InstanceType": "d3en.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d3en.6xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d3en.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "d3en.xlarge", "Location": "apne1-az1" }, { @@ -2967,6 +3035,94 @@ "InstanceType": "m8in.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apne1-az1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -5532,67 +5688,135 @@ "Location": "apne1-az2" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "c9g.12xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "c9g.16xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d2.8xlarge", + "InstanceType": "c9g.24xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d2.xlarge", + "InstanceType": "c9g.2xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d3.2xlarge", + "InstanceType": "c9g.48xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d3.4xlarge", + "InstanceType": "c9g.4xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d3.8xlarge", + "InstanceType": "c9g.8xlarge", "Location": "apne1-az2" }, { - "InstanceType": "d3.xlarge", + "InstanceType": "c9g.large", "Location": "apne1-az2" }, { - "InstanceType": "f2.12xlarge", + "InstanceType": "c9g.medium", "Location": "apne1-az2" }, { - "InstanceType": "f2.48xlarge", + "InstanceType": "c9g.metal-48xl", "Location": "apne1-az2" }, { - "InstanceType": "f2.6xlarge", + "InstanceType": "c9g.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c9gd.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c9gd.16xlarge", "Location": "apne1-az2" }, { - "InstanceType": "g4ad.16xlarge", + "InstanceType": "c9gd.24xlarge", "Location": "apne1-az2" }, { - "InstanceType": "g4ad.2xlarge", + "InstanceType": "c9gd.2xlarge", "Location": "apne1-az2" }, { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "c9gd.48xlarge", "Location": "apne1-az2" }, { - "InstanceType": "g4ad.8xlarge", + "InstanceType": "c9gd.4xlarge", "Location": "apne1-az2" }, { - "InstanceType": "g4ad.xlarge", + "InstanceType": "c9gd.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c9gd.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c9gd.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "c9gd.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "c9gd.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d2.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d2.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d2.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d2.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "d3.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "f2.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "f2.6xlarge", "Location": "apne1-az2" }, { @@ -7199,6 +7423,94 @@ "InstanceType": "m8in.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r4.16xlarge", "Location": "apne1-az2" @@ -9780,79 +10092,147 @@ "Location": "apne1-az4" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "c9g.12xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "c9g.16xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d2.8xlarge", + "InstanceType": "c9g.24xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d2.xlarge", + "InstanceType": "c9g.2xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3.2xlarge", + "InstanceType": "c9g.48xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3.4xlarge", + "InstanceType": "c9g.4xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3.8xlarge", + "InstanceType": "c9g.8xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3.xlarge", + "InstanceType": "c9g.large", "Location": "apne1-az4" }, { - "InstanceType": "d3en.12xlarge", + "InstanceType": "c9g.medium", "Location": "apne1-az4" }, { - "InstanceType": "d3en.2xlarge", + "InstanceType": "c9g.metal-48xl", "Location": "apne1-az4" }, { - "InstanceType": "d3en.4xlarge", + "InstanceType": "c9g.xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3en.6xlarge", + "InstanceType": "c9gd.12xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3en.8xlarge", + "InstanceType": "c9gd.16xlarge", "Location": "apne1-az4" }, { - "InstanceType": "d3en.xlarge", + "InstanceType": "c9gd.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "c9gd.xlarge", "Location": "apne1-az4" }, { - "InstanceType": "g4ad.16xlarge", + "InstanceType": "d2.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d2.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d2.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d2.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d3.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d3.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d3en.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "d3en.2xlarge", "Location": "apne1-az4" }, { - "InstanceType": "g4ad.2xlarge", + "InstanceType": "d3en.4xlarge", "Location": "apne1-az4" }, { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "d3en.6xlarge", "Location": "apne1-az4" }, { - "InstanceType": "g4ad.8xlarge", + "InstanceType": "d3en.8xlarge", "Location": "apne1-az4" }, { - "InstanceType": "g4ad.xlarge", + "InstanceType": "d3en.xlarge", "Location": "apne1-az4" }, { @@ -11675,6 +12055,94 @@ "InstanceType": "m8in.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "mac1.metal", "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 c6563fd0a03a..cf88b8a89560 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 @@ -2263,6 +2263,94 @@ "InstanceType": "m8i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.medium", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apse1-az1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apse1-az1" @@ -5695,6 +5783,94 @@ "InstanceType": "m8i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.medium", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apse1-az2" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "mac1.metal", "Location": "apse1-az2" @@ -8939,6 +9115,94 @@ "InstanceType": "m8i.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.medium", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apse1-az3" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "p4de.24xlarge", "Location": "apse1-az3" 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 d4a9539cac37..75d1750746b8 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 @@ -2419,6 +2419,94 @@ "InstanceType": "m8i.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "mac-m4.metal", "Location": "apse2-az1" @@ -6059,6 +6147,94 @@ "InstanceType": "m8i.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "p4d.24xlarge", "Location": "apse2-az2" @@ -9611,6 +9787,94 @@ "InstanceType": "m8i.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "mac-m4.metal", "Location": "apse2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json index a4e51856884f..7fbbaa9887d7 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json @@ -863,26 +863,6 @@ "InstanceType": "d3.xlarge", "Location": "cac1-az1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "cac1-az1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "cac1-az1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "cac1-az1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "cac1-az1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "cac1-az1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "cac1-az1" @@ -3951,26 +3931,6 @@ "InstanceType": "d3.xlarge", "Location": "cac1-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "cac1-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "cac1-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "cac1-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "cac1-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "cac1-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "cac1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index d5861f6007f2..1d8069a43bff 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 @@ -3951,6 +3951,94 @@ "InstanceType": "r8in.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -5523,26 +5611,6 @@ "InstanceType": "d3en.xlarge", "Location": "euc1-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euc1-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euc1-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euc1-az2" @@ -8467,6 +8535,94 @@ "InstanceType": "r8in.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" @@ -10047,26 +10203,6 @@ "InstanceType": "f2.6xlarge", "Location": "euc1-az3" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euc1-az3" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euc1-az3" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euc1-az3" @@ -12975,6 +13111,94 @@ "InstanceType": "r8in.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "r9gd.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 1dfa7294e1ac..253cc808dad6 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 @@ -1095,26 +1095,6 @@ "InstanceType": "d3en.xlarge", "Location": "euw1-az1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euw1-az1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euw1-az1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euw1-az1" @@ -2843,6 +2823,94 @@ "InstanceType": "m8in.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "euw1-az1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "mac-m4.metal", "Location": "euw1-az1" @@ -5471,26 +5539,6 @@ "InstanceType": "d3en.xlarge", "Location": "euw1-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euw1-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euw1-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euw1-az2" @@ -7295,6 +7343,94 @@ "InstanceType": "m8in.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "euw1-az2" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "mac-m4.metal", "Location": "euw1-az2" @@ -10071,26 +10207,6 @@ "InstanceType": "d3en.xlarge", "Location": "euw1-az3" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euw1-az3" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euw1-az3" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euw1-az3" @@ -11843,6 +11959,94 @@ "InstanceType": "m8in.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "euw1-az3" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "mac-m4.metal", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 8ba22ed063bc..2ea97c1df594 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json @@ -871,26 +871,6 @@ "InstanceType": "f2.6xlarge", "Location": "euw2-az1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euw2-az1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euw2-az1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euw2-az1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euw2-az1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euw2-az1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euw2-az1" @@ -3955,26 +3935,6 @@ "InstanceType": "f2.6xlarge", "Location": "euw2-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "euw2-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "euw2-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "euw2-az2" @@ -4823,6 +4783,46 @@ "InstanceType": "m6id.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "m7a.12xlarge", "Location": "euw2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index 641a02c88a51..c73f90c4f720 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 @@ -4367,6 +4367,86 @@ "InstanceType": "m6i.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "m7g.12xlarge", "Location": "sae1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index b4a221cf1535..1f0308660991 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 @@ -1295,26 +1295,6 @@ "InstanceType": "f2.6xlarge", "Location": "use1-az1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use1-az1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use1-az1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use1-az1" @@ -4687,6 +4667,94 @@ "InstanceType": "r8in.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "t1.micro", "Location": "use1-az1" @@ -6487,26 +6555,6 @@ "InstanceType": "f2.6xlarge", "Location": "use1-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use1-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use1-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use1-az2" @@ -10023,6 +10071,94 @@ "InstanceType": "r8in.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use1-az2" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use1-az2" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "t1.micro", "Location": "use1-az2" @@ -12075,26 +12211,6 @@ "InstanceType": "f2.6xlarge", "Location": "use1-az4" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use1-az4" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use1-az4" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use1-az4" @@ -15603,6 +15719,94 @@ "InstanceType": "r8in.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use1-az4" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use1-az4" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "t1.micro", "Location": "use1-az4" @@ -21359,26 +21563,6 @@ "InstanceType": "f2.6xlarge", "Location": "use1-az6" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use1-az6" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use1-az6" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use1-az6" @@ -24939,6 +25123,94 @@ "InstanceType": "r8in.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use1-az6" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use1-az6" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "t1.micro", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index 986ffc0bfbd9..99d198582fb4 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 @@ -1183,26 +1183,6 @@ "InstanceType": "d3.xlarge", "Location": "use2-az1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use2-az1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use2-az1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use2-az1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use2-az1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use2-az1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use2-az1" @@ -4375,6 +4355,94 @@ "InstanceType": "r8in.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use2-az1" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use2-az1" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az1" @@ -5955,26 +6023,6 @@ "InstanceType": "d3.xlarge", "Location": "use2-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use2-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use2-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use2-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use2-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use2-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use2-az2" @@ -9183,6 +9231,94 @@ "InstanceType": "r8in.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use2-az2" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use2-az2" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az2" @@ -10707,26 +10843,6 @@ "InstanceType": "d3.xlarge", "Location": "use2-az3" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "use2-az3" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "use2-az3" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "use2-az3" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "use2-az3" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "use2-az3" - }, { "InstanceType": "g4dn.12xlarge", "Location": "use2-az3" @@ -13883,6 +13999,94 @@ "InstanceType": "r8in.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "use2-az3" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "use2-az3" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index c8eda44c47ee..aaf9cc7a8352 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 @@ -1339,26 +1339,6 @@ "InstanceType": "f2.6xlarge", "Location": "usw2-az1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "usw2-az1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "usw2-az1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "usw2-az1" @@ -4811,6 +4791,94 @@ "InstanceType": "r8in.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "usw2-az1" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "t1.micro", "Location": "usw2-az1" @@ -6639,26 +6707,6 @@ "InstanceType": "d3en.xlarge", "Location": "usw2-az2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "usw2-az2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "usw2-az2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "usw2-az2" @@ -10091,6 +10139,94 @@ "InstanceType": "r8in.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "usw2-az2" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "Location": "usw2-az2" @@ -11875,26 +12011,6 @@ "InstanceType": "f2.6xlarge", "Location": "usw2-az3" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "usw2-az3" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "usw2-az3" - }, { "InstanceType": "g4dn.12xlarge", "Location": "usw2-az3" @@ -15351,6 +15467,94 @@ "InstanceType": "r8in.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "usw2-az3" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "t1.micro", "Location": "usw2-az3" @@ -19731,6 +19935,94 @@ "InstanceType": "r8in.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "t3.2xlarge", "Location": "usw2-az4" 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 174d90422bcb..0b44c8697fee 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 @@ -1092,79 +1092,147 @@ "Location": "ap-northeast-1a" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "c9g.12xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "c9g.16xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d2.8xlarge", + "InstanceType": "c9g.24xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d2.xlarge", + "InstanceType": "c9g.2xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3.2xlarge", + "InstanceType": "c9g.48xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3.4xlarge", + "InstanceType": "c9g.4xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3.8xlarge", + "InstanceType": "c9g.8xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3.xlarge", + "InstanceType": "c9g.large", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3en.12xlarge", + "InstanceType": "c9g.medium", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3en.2xlarge", + "InstanceType": "c9g.metal-48xl", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3en.4xlarge", + "InstanceType": "c9g.xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3en.6xlarge", + "InstanceType": "c9gd.12xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3en.8xlarge", + "InstanceType": "c9gd.16xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "d3en.xlarge", + "InstanceType": "c9gd.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c9gd.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d2.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d2.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d2.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d2.xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "g4ad.16xlarge", + "InstanceType": "d3.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d3.8xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "g4ad.2xlarge", + "InstanceType": "d3.xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "d3en.12xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "g4ad.8xlarge", + "InstanceType": "d3en.2xlarge", "Location": "ap-northeast-1a" }, { - "InstanceType": "g4ad.xlarge", + "InstanceType": "d3en.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d3en.6xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d3en.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "d3en.xlarge", "Location": "ap-northeast-1a" }, { @@ -2987,6 +3055,94 @@ "InstanceType": "m8in.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1a" @@ -5576,79 +5732,147 @@ "Location": "ap-northeast-1c" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "c9g.12xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "c9g.16xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d2.8xlarge", + "InstanceType": "c9g.24xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d2.xlarge", + "InstanceType": "c9g.2xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3.2xlarge", + "InstanceType": "c9g.48xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3.4xlarge", + "InstanceType": "c9g.4xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3.8xlarge", + "InstanceType": "c9g.8xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3.xlarge", + "InstanceType": "c9g.large", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3en.12xlarge", + "InstanceType": "c9g.medium", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3en.2xlarge", + "InstanceType": "c9g.metal-48xl", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3en.4xlarge", + "InstanceType": "c9g.xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3en.6xlarge", + "InstanceType": "c9gd.12xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3en.8xlarge", + "InstanceType": "c9gd.16xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "d3en.xlarge", + "InstanceType": "c9gd.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c9gd.2xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "g4ad.16xlarge", + "InstanceType": "c9gd.48xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "g4ad.2xlarge", + "InstanceType": "c9gd.4xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "c9gd.8xlarge", "Location": "ap-northeast-1c" }, { - "InstanceType": "g4ad.8xlarge", + "InstanceType": "c9gd.large", "Location": "ap-northeast-1c" }, { - "InstanceType": "g4ad.xlarge", + "InstanceType": "c9gd.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c9gd.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c9gd.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d2.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d2.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d2.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d2.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3en.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3en.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3en.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3en.6xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3en.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "d3en.xlarge", "Location": "ap-northeast-1c" }, { @@ -7475,6 +7699,94 @@ "InstanceType": "m8in.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -10040,67 +10352,135 @@ "Location": "ap-northeast-1d" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "c9g.12xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "c9g.16xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d2.8xlarge", + "InstanceType": "c9g.24xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d2.xlarge", + "InstanceType": "c9g.2xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d3.2xlarge", + "InstanceType": "c9g.48xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d3.4xlarge", + "InstanceType": "c9g.4xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d3.8xlarge", + "InstanceType": "c9g.8xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "d3.xlarge", + "InstanceType": "c9g.large", "Location": "ap-northeast-1d" }, { - "InstanceType": "f2.12xlarge", + "InstanceType": "c9g.medium", "Location": "ap-northeast-1d" }, { - "InstanceType": "f2.48xlarge", + "InstanceType": "c9g.metal-48xl", "Location": "ap-northeast-1d" }, { - "InstanceType": "f2.6xlarge", + "InstanceType": "c9g.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c9gd.8xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "g4ad.16xlarge", + "InstanceType": "c9gd.large", "Location": "ap-northeast-1d" }, { - "InstanceType": "g4ad.2xlarge", + "InstanceType": "c9gd.medium", "Location": "ap-northeast-1d" }, { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "c9gd.metal-48xl", "Location": "ap-northeast-1d" }, { - "InstanceType": "g4ad.8xlarge", + "InstanceType": "c9gd.xlarge", "Location": "ap-northeast-1d" }, { - "InstanceType": "g4ad.xlarge", + "InstanceType": "d2.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d2.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d2.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d2.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "f2.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "f2.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "f2.6xlarge", "Location": "ap-northeast-1d" }, { @@ -11707,6 +12087,94 @@ "InstanceType": "m8in.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r4.16xlarge", "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 015c58dbd363..80fbe411e884 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 @@ -2307,6 +2307,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1a" @@ -5747,6 +5835,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-1b" @@ -8939,6 +9115,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "p4de.24xlarge", "Location": "ap-southeast-1c" 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 ec26e95dfd06..9443965283af 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 @@ -2291,6 +2291,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "mac-m4.metal", "Location": "ap-southeast-2a" @@ -5963,6 +6051,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "mac-m4.metal", "Location": "ap-southeast-2b" @@ -9603,6 +9779,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "p4d.24xlarge", "Location": "ap-southeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json index da87bada063a..acc02dbce837 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json @@ -863,26 +863,6 @@ "InstanceType": "d3.xlarge", "Location": "ca-central-1a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "ca-central-1a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "ca-central-1a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "ca-central-1a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "ca-central-1a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "ca-central-1a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "ca-central-1a" @@ -3951,26 +3931,6 @@ "InstanceType": "d3.xlarge", "Location": "ca-central-1b" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "ca-central-1b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "ca-central-1b" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "ca-central-1b" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "ca-central-1b" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "ca-central-1b" - }, { "InstanceType": "g4dn.12xlarge", "Location": "ca-central-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json index 9e649c7b2ada..f47a84da74e0 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 @@ -1215,26 +1215,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-central-1a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-central-1a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-central-1a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-central-1a" @@ -4159,6 +4139,94 @@ "InstanceType": "r8in.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" @@ -5739,26 +5807,6 @@ "InstanceType": "f2.6xlarge", "Location": "eu-central-1b" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-central-1b" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-central-1b" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-central-1b" @@ -8667,6 +8715,94 @@ "InstanceType": "r8in.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -12975,6 +13111,94 @@ "InstanceType": "r8in.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r9gd.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 4489be34914c..81c600c04b5a 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 @@ -1047,26 +1047,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-1a" @@ -2871,6 +2851,94 @@ "InstanceType": "m8in.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "mac-m4.metal", "Location": "eu-west-1a" @@ -5647,26 +5715,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-1b" @@ -7419,6 +7467,94 @@ "InstanceType": "m8in.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "mac-m4.metal", "Location": "eu-west-1b" @@ -10079,26 +10215,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1c" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-1c" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-1c" @@ -11827,6 +11943,94 @@ "InstanceType": "m8in.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "mac-m4.metal", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index 4dcb774cabcb..d6bd8f6e55ae 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json @@ -871,26 +871,6 @@ "InstanceType": "f2.6xlarge", "Location": "eu-west-2a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-2a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-2a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-2a" @@ -1739,6 +1719,46 @@ "InstanceType": "m6id.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "m7a.12xlarge", "Location": "eu-west-2a" @@ -6959,26 +6979,6 @@ "InstanceType": "f2.6xlarge", "Location": "eu-west-2c" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-2c" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-2c" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-2c" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-2c" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-2c" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index 9ee0dcf3afd1..6246d7a44aab 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 @@ -4367,6 +4367,86 @@ "InstanceType": "m6i.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "m7g.12xlarge", "Location": "sa-east-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index d038f4c5b3b6..77a38032b123 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 @@ -1387,26 +1387,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-east-1a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-1a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-1a" @@ -4967,6 +4947,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-1a" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "t1.micro", "Location": "us-east-1a" @@ -6691,26 +6759,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-1b" @@ -10083,6 +10131,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "t1.micro", "Location": "us-east-1b" @@ -11883,26 +12019,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-1c" @@ -15419,6 +15535,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-1c" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "t1.micro", "Location": "us-east-1c" @@ -17239,26 +17443,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-east-1d" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-1d" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-1d" @@ -20767,6 +20951,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "t1.micro", "Location": "us-east-1d" 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 fe36a9cdb728..de34b93d28ac 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 @@ -1183,26 +1183,6 @@ "InstanceType": "d3.xlarge", "Location": "us-east-2a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-2a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-2a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-2a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-2a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-2a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-2a" @@ -4375,6 +4355,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-2a" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2a" @@ -5955,26 +6023,6 @@ "InstanceType": "d3.xlarge", "Location": "us-east-2b" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-2b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-2b" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-2b" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-2b" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-2b" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-2b" @@ -9183,6 +9231,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-2b" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2b" @@ -10707,26 +10843,6 @@ "InstanceType": "d3.xlarge", "Location": "us-east-2c" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-2c" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-2c" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-2c" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-2c" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-2c" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-2c" @@ -13883,6 +13999,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-2c" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index f6b6a59c3701..b3fa93faaaba 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 @@ -1351,26 +1351,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-west-2a" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-west-2a" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-west-2a" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-west-2a" @@ -4803,6 +4783,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-west-2a" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -6595,26 +6663,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-west-2b" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-west-2b" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-west-2b" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-west-2b" @@ -10067,6 +10115,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-west-2b" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "t1.micro", "Location": "us-west-2b" @@ -11875,26 +12011,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-west-2c" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-west-2c" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-west-2c" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-west-2c" @@ -15351,6 +15467,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-west-2c" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "t1.micro", "Location": "us-west-2c" @@ -19731,6 +19935,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "t3.2xlarge", "Location": "us-west-2d" 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 c8a8a19f3e9d..e1d4b81006ac 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 @@ -1091,6 +1091,94 @@ "InstanceType": "c8ine.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c9g.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9g.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c9gd.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1" @@ -1159,26 +1247,6 @@ "InstanceType": "f2.6xlarge", "Location": "ap-northeast-1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "ap-northeast-1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "ap-northeast-1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "ap-northeast-1" @@ -3023,6 +3091,94 @@ "InstanceType": "m8in.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "mac1.metal", "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 3e31f37c8a4a..dbb4db08cab1 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 @@ -2311,6 +2311,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "mac1.metal", "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 17fe71214a31..7ec465c4c782 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 @@ -2419,6 +2419,94 @@ "InstanceType": "m8i.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "mac-m4.metal", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json index 2711e57aaf10..ca381d34db1d 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json @@ -875,26 +875,6 @@ "InstanceType": "f2.6xlarge", "Location": "ca-central-1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "ca-central-1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "ca-central-1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "ca-central-1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "ca-central-1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "ca-central-1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "ca-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 8e758bf07c10..e5d3a077d5de 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 @@ -1231,26 +1231,6 @@ "InstanceType": "f2.6xlarge", "Location": "eu-central-1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-central-1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-central-1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-central-1" @@ -4199,6 +4179,94 @@ "InstanceType": "r8in.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index f364cf93e551..a557253b34db 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -1095,26 +1095,6 @@ "InstanceType": "d3en.xlarge", "Location": "eu-west-1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-1" @@ -2947,6 +2927,94 @@ "InstanceType": "m8in.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "m9g.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.metal-48xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9g.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.metal-48xl", + "Location": "eu-west-1" + }, + { + "InstanceType": "m9gd.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "mac-m4.metal", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 47ff27d912b5..158e39b34315 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -907,26 +907,6 @@ "InstanceType": "f2.6xlarge", "Location": "eu-west-2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "eu-west-2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "eu-west-2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "eu-west-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index 6d64838bedf0..434d5e996cb2 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json @@ -1387,26 +1387,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-east-1" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-1" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-1" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-1" @@ -4967,6 +4947,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-1" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-1" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "t1.micro", "Location": "us-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 6c10c3b71196..112cf99bf6d4 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 @@ -1183,26 +1183,6 @@ "InstanceType": "d3.xlarge", "Location": "us-east-2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-east-2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-east-2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-east-2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-east-2" @@ -4411,6 +4391,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-east-2" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-east-2" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index 2197298188b7..15fd4df216ef 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json @@ -1367,26 +1367,6 @@ "InstanceType": "f2.6xlarge", "Location": "us-west-2" }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "g4ad.4xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "g4ad.8xlarge", - "Location": "us-west-2" - }, - { - "InstanceType": "g4ad.xlarge", - "Location": "us-west-2" - }, { "InstanceType": "g4dn.12xlarge", "Location": "us-west-2" @@ -4851,6 +4831,94 @@ "InstanceType": "r8in.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r9g.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.metal-48xl", + "Location": "us-west-2" + }, + { + "InstanceType": "r9g.xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.metal-48xl", + "Location": "us-west-2" + }, + { + "InstanceType": "r9gd.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "t1.micro", "Location": "us-west-2"