diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json index 4107549de..f1de3c4db 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json @@ -331,6 +331,42 @@ "InstanceType": "c6i.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az1" @@ -863,6 +899,42 @@ "InstanceType": "m6i.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "mac1.metal", "Location": "aps1-az1" @@ -1251,6 +1323,42 @@ "InstanceType": "r6i.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-az1" @@ -1863,6 +1971,42 @@ "InstanceType": "c6in.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az2" @@ -2323,6 +2467,42 @@ "InstanceType": "m6i.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "mac1.metal", "Location": "aps1-az2" @@ -2695,6 +2875,42 @@ "InstanceType": "r6id.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "aps1-az2" @@ -3219,6 +3435,42 @@ "InstanceType": "c6in.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "aps1-az3" @@ -3751,6 +4003,42 @@ "InstanceType": "m6i.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "aps1-az3" @@ -4175,6 +4463,42 @@ "InstanceType": "r6id.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "aps1-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 549bec941..167d99b74 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 @@ -1931,6 +1931,30 @@ "InstanceType": "i3en.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "i4g.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4g.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4g.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4g.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4g.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4g.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "i4i.16xlarge", "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 70850803b..9673f6c0c 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 @@ -3863,6 +3863,42 @@ "InstanceType": "r6id.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index 73affc090..178edcd78 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 @@ -5147,6 +5147,18 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "vt1.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "vt1.6xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "x1.16xlarge", "Location": "euw1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index c4508470e..05b51da89 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 @@ -3115,6 +3115,22 @@ "InstanceType": "inf1.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "is4gen.2xlarge", "Location": "use1-az2" @@ -6043,6 +6059,22 @@ "InstanceType": "inf1.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "is4gen.2xlarge", "Location": "use1-az4" @@ -8499,6 +8531,22 @@ "InstanceType": "inf1.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "m4.10xlarge", "Location": "use1-az5" 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 3ada7f0b5..a69881f15 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 @@ -5899,6 +5899,22 @@ "InstanceType": "inf1.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "is4gen.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 064bfb7a8..b98625393 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 @@ -967,6 +967,22 @@ "InstanceType": "inf1.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "is4gen.2xlarge", "Location": "usw2-az1" @@ -3671,6 +3687,22 @@ "InstanceType": "inf1.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "is4gen.2xlarge", "Location": "usw2-az2" @@ -5195,6 +5227,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "usw2-az2" @@ -6335,6 +6371,22 @@ "InstanceType": "inf1.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "is4gen.2xlarge", "Location": "usw2-az3" @@ -8631,6 +8683,22 @@ "InstanceType": "inf1.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "m5.12xlarge", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json index 075b61fbf..ab158c7e0 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json @@ -331,6 +331,42 @@ "InstanceType": "c6i.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1a" @@ -863,6 +899,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1a" @@ -1251,6 +1323,42 @@ "InstanceType": "r6i.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1a" @@ -1883,6 +1991,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1b" @@ -2415,6 +2559,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-south-1b" @@ -2839,6 +3019,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1b" @@ -3455,6 +3671,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1c" @@ -3915,6 +4167,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1c" @@ -4287,6 +4575,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-south-1c" 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 787ba9f5d..72f85f005 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 @@ -1931,6 +1931,30 @@ "InstanceType": "i3en.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "i4g.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4g.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4g.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4g.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4g.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4g.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "i4i.16xlarge", "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 7ae41c3f3..8f4d11d73 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 @@ -1763,6 +1763,42 @@ "InstanceType": "r6id.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" 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 af429d970..c361f2e14 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 @@ -5147,6 +5147,18 @@ "InstanceType": "u-9tb1.112xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "vt1.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "vt1.6xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 9393df039..c3e5614b5 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 @@ -3115,6 +3115,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "is4gen.2xlarge", "Location": "us-east-1b" @@ -5779,6 +5795,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "is4gen.2xlarge", "Location": "us-east-1c" @@ -11207,6 +11239,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "m4.10xlarge", "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 355c15ecb..908e2480d 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 @@ -5899,6 +5899,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "is4gen.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 c80da6266..4363508d6 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 @@ -967,6 +967,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "is4gen.2xlarge", "Location": "us-west-2a" @@ -3671,6 +3687,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "is4gen.2xlarge", "Location": "us-west-2b" @@ -5195,6 +5227,10 @@ "InstanceType": "u-18tb1.112xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "u-24tb1.112xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-west-2b" @@ -6335,6 +6371,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "is4gen.2xlarge", "Location": "us-west-2c" @@ -8631,6 +8683,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "m5.12xlarge", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index fcf968a1f..d33f20147 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json @@ -403,6 +403,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-south-1" @@ -935,6 +971,42 @@ "InstanceType": "m6i.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1" @@ -1363,6 +1435,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-south-1" 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 3bf69d6b0..a8564a46b 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 @@ -991,6 +991,22 @@ "InstanceType": "inf1.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "is4gen.2xlarge", "Location": "us-west-2"