diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json index e0aee4834..4240c358d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json @@ -275,6 +275,50 @@ "InstanceType": "m5d.xlarge", "Location": "aps2-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "aps2-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "aps2-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "aps2-az1" @@ -919,6 +963,50 @@ "InstanceType": "m5d.xlarge", "Location": "aps2-az2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "aps2-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "aps2-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "aps2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json index ee30185dd..b182d12fb 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json @@ -107,6 +107,30 @@ "InstanceType": "c6g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "g5g.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "eus2-az1" 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 3e61f7036..ec0440baf 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 @@ -539,6 +539,38 @@ "InstanceType": "c7g.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "c7gn.12xlarge", "Location": "euw1-az1" @@ -1551,6 +1583,38 @@ "InstanceType": "m7g.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az1" @@ -2175,6 +2239,38 @@ "InstanceType": "r7g.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "t1.micro", "Location": "euw1-az1" @@ -3035,6 +3131,38 @@ "InstanceType": "c7g.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "c7gn.12xlarge", "Location": "euw1-az2" @@ -4063,6 +4191,38 @@ "InstanceType": "m7g.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az2" @@ -4703,6 +4863,38 @@ "InstanceType": "r7g.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "t1.micro", "Location": "euw1-az2" @@ -5527,6 +5719,38 @@ "InstanceType": "c7g.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "c7gn.12xlarge", "Location": "euw1-az3" @@ -6555,6 +6779,38 @@ "InstanceType": "m7g.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euw1-az3" @@ -7179,6 +7435,38 @@ "InstanceType": "r7g.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "t1.micro", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 409ea6845..85d714d53 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 @@ -2695,6 +2695,38 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az2" @@ -4351,6 +4383,38 @@ "InstanceType": "r7g.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "t1.micro", "Location": "use1-az2" @@ -5475,6 +5539,38 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.large", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "c7gn.12xlarge", "Location": "use1-az4" @@ -6531,6 +6627,38 @@ "InstanceType": "m7g.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.large", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "mac1.metal", "Location": "use1-az4" @@ -7151,6 +7279,38 @@ "InstanceType": "r7g.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "t1.micro", "Location": "use1-az4" @@ -7939,6 +8099,38 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.large", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "c7gn.12xlarge", "Location": "use1-az5" @@ -8767,6 +8959,38 @@ "InstanceType": "m7g.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.large", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "p3.16xlarge", "Location": "use1-az5" @@ -8779,6 +9003,10 @@ "InstanceType": "p3.8xlarge", "Location": "use1-az5" }, + { + "InstanceType": "p5.48xlarge", + "Location": "use1-az5" + }, { "InstanceType": "r4.16xlarge", "Location": "use1-az5" @@ -9323,6 +9551,38 @@ "InstanceType": "r7g.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.large", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "t1.micro", "Location": "use1-az5" @@ -11191,6 +11451,38 @@ "InstanceType": "m7g.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.large", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "mac1.metal", "Location": "use1-az6" @@ -11831,6 +12123,38 @@ "InstanceType": "r7g.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "r7gd.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 81c4b9913..2d251c1c6 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 @@ -511,6 +511,38 @@ "InstanceType": "c7g.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "c7gn.12xlarge", "Location": "use2-az1" @@ -1471,6 +1503,38 @@ "InstanceType": "m7g.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "mac2.metal", "Location": "use2-az1" @@ -2099,6 +2163,38 @@ "InstanceType": "r7g.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az1" @@ -2883,6 +2979,38 @@ "InstanceType": "c7g.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "c7gn.12xlarge", "Location": "use2-az2" @@ -3851,6 +3979,38 @@ "InstanceType": "m7g.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "mac1.metal", "Location": "use2-az2" @@ -4487,6 +4647,38 @@ "InstanceType": "r7g.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az2" @@ -5215,6 +5407,38 @@ "InstanceType": "c7g.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "c7gn.12xlarge", "Location": "use2-az3" @@ -6159,6 +6383,38 @@ "InstanceType": "m7g.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "mac1.metal", "Location": "use2-az3" @@ -6779,6 +7035,38 @@ "InstanceType": "r7g.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "r7gd.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 4030d1216..385071cf9 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 @@ -515,6 +515,38 @@ "InstanceType": "c7g.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "c7gn.12xlarge", "Location": "usw2-az1" @@ -1575,6 +1607,38 @@ "InstanceType": "m7g.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az1" @@ -2215,6 +2279,38 @@ "InstanceType": "r7g.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "t1.micro", "Location": "usw2-az1" @@ -3079,6 +3175,38 @@ "InstanceType": "c7g.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "c7gn.12xlarge", "Location": "usw2-az2" @@ -4119,6 +4247,38 @@ "InstanceType": "m7g.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az2" @@ -4155,6 +4315,10 @@ "InstanceType": "p4d.24xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "p5.48xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "r3.2xlarge", "Location": "usw2-az2" @@ -4755,6 +4919,38 @@ "InstanceType": "r7g.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "Location": "usw2-az2" @@ -5571,6 +5767,38 @@ "InstanceType": "c7g.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "c7gn.12xlarge", "Location": "usw2-az3" @@ -6627,6 +6855,38 @@ "InstanceType": "m7g.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az3" @@ -7267,6 +7527,38 @@ "InstanceType": "r7g.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "t1.micro", "Location": "usw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json index 94132be2f..2328d7502 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json @@ -275,6 +275,50 @@ "InstanceType": "m5d.xlarge", "Location": "ap-south-2a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-2a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-south-2a" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-south-2a" @@ -919,6 +963,50 @@ "InstanceType": "m5d.xlarge", "Location": "ap-south-2b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-2b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-south-2b" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-south-2b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json index 9c950095e..27519b1f2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json @@ -107,6 +107,30 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "g5g.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-south-2a" 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 cea2dcc8d..f8562b1df 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 @@ -539,6 +539,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "c7gn.12xlarge", "Location": "eu-west-1a" @@ -1551,6 +1583,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1a" @@ -2175,6 +2239,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1a" @@ -3035,6 +3131,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "c7gn.12xlarge", "Location": "eu-west-1b" @@ -4063,6 +4191,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1b" @@ -4703,6 +4863,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1b" @@ -5527,6 +5719,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "c7gn.12xlarge", "Location": "eu-west-1c" @@ -6555,6 +6779,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-west-1c" @@ -7179,6 +7435,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index fbc272144..e30205a99 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 @@ -2695,6 +2695,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1b" @@ -4351,6 +4383,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "t1.micro", "Location": "us-east-1b" @@ -5211,6 +5275,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-1c" @@ -6267,6 +6363,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1c" @@ -6887,6 +7015,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "t1.micro", "Location": "us-east-1c" @@ -8823,6 +8983,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1d" @@ -9463,6 +9655,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "t1.micro", "Location": "us-east-1d" @@ -10527,6 +10751,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-1f" @@ -11355,6 +11611,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "p3.16xlarge", "Location": "us-east-1f" @@ -11367,6 +11655,10 @@ "InstanceType": "p3.8xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "r4.16xlarge", "Location": "us-east-1f" @@ -11911,6 +12203,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "t1.micro", "Location": "us-east-1f" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index 77c25eb42..8f3ff5ca6 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 @@ -511,6 +511,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-2a" @@ -1471,6 +1503,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "mac2.metal", "Location": "us-east-2a" @@ -2099,6 +2163,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2a" @@ -2883,6 +2979,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-2b" @@ -3851,6 +3979,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2b" @@ -4487,6 +4647,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2b" @@ -5215,6 +5407,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-2c" @@ -6159,6 +6383,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2c" @@ -6779,6 +7035,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "r7gd.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 592fdae46..4b5a68863 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 @@ -515,6 +515,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-west-2a" @@ -1575,6 +1607,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2a" @@ -2215,6 +2279,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -3079,6 +3175,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-west-2b" @@ -4119,6 +4247,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2b" @@ -4155,6 +4315,10 @@ "InstanceType": "p4d.24xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-2b" @@ -4755,6 +4919,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "t1.micro", "Location": "us-west-2b" @@ -5571,6 +5767,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-west-2c" @@ -6627,6 +6855,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2c" @@ -7267,6 +7527,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "t1.micro", "Location": "us-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json index 52ed986ed..1c2e4bd37 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json @@ -275,6 +275,50 @@ "InstanceType": "m5d.xlarge", "Location": "ap-south-2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-south-2" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json index 49fd1fdbc..6200d428b 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json @@ -107,6 +107,30 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "g5g.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g5g.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g5g.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g5g.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "g5g.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "g5g.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-south-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 00ff89864..00a6a6cef 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 @@ -539,6 +539,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "c7gn.12xlarge", "Location": "eu-west-1" @@ -1567,6 +1599,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1" @@ -2207,6 +2271,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1" 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 70f5f81d4..fa85ac380 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 @@ -539,6 +539,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-1" @@ -1627,6 +1659,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1" @@ -1667,6 +1731,10 @@ "InstanceType": "p4d.24xlarge", "Location": "us-east-1" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-east-1" + }, { "InstanceType": "r3.2xlarge", "Location": "us-east-1" @@ -2267,6 +2335,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "r7gd.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 d0c96a62e..02edab840 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 @@ -511,6 +511,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-east-2" @@ -1479,6 +1511,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2" @@ -2115,6 +2179,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "r7gd.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 b8d5470fa..0b162fb3f 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 @@ -539,6 +539,38 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.large", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "c7gn.12xlarge", "Location": "us-west-2" @@ -1599,6 +1631,38 @@ "InstanceType": "m7g.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2" @@ -1639,6 +1703,10 @@ "InstanceType": "p4d.24xlarge", "Location": "us-west-2" }, + { + "InstanceType": "p5.48xlarge", + "Location": "us-west-2" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-2" @@ -2239,6 +2307,38 @@ "InstanceType": "r7g.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "t1.micro", "Location": "us-west-2"