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 4c43eb9646a1..d58c2d1ea3b7 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 @@ -4707,6 +4707,10 @@ "InstanceType": "p5.4xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "p6-b200.48xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "aps1-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 5673590348ed..b6fa3c032da0 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 @@ -1011,6 +1011,58 @@ "InstanceType": "c8id.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "c8in.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.96xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.large", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.metal-96xl", + "Location": "use1-az1" + }, + { + "InstanceType": "c8in.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az1" @@ -2827,6 +2879,10 @@ "InstanceType": "mac-m4.metal", "Location": "use1-az1" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use1-az1" + }, { "InstanceType": "mac2.metal", "Location": "use1-az1" @@ -13271,6 +13327,10 @@ "InstanceType": "mac-m4max.metal", "Location": "use1-az4" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "use1-az4" + }, { "InstanceType": "mac1.metal", "Location": "use1-az4" 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 d3d34568bc23..7b671690a7b9 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 @@ -1211,6 +1211,30 @@ "InstanceType": "g6f.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "g7.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "use2-az1" + }, { "InstanceType": "g7e.12xlarge", "Location": "use2-az1" @@ -2783,6 +2807,10 @@ "InstanceType": "m9gd.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "mac-m4.metal", + "Location": "use2-az1" + }, { "InstanceType": "mac-m4pro.metal", "Location": "use2-az1" @@ -5647,6 +5675,30 @@ "InstanceType": "g6f.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "g7.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "use2-az2" + }, { "InstanceType": "g7e.12xlarge", "Location": "use2-az2" @@ -10067,6 +10119,30 @@ "InstanceType": "g6f.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "g7.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "use2-az3" + }, { "InstanceType": "gr6.4xlarge", "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 e1416c33e1f1..b34846fc13ab 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 @@ -1439,6 +1439,30 @@ "InstanceType": "g6f.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "g7.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "g7e.12xlarge", "Location": "usw2-az1" @@ -6615,6 +6639,30 @@ "InstanceType": "g6f.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "g7.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "g7e.12xlarge", "Location": "usw2-az2" @@ -11731,6 +11779,30 @@ "InstanceType": "g6f.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "g7.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "g7e.12xlarge", "Location": "usw2-az3" @@ -16391,6 +16463,58 @@ "InstanceType": "c8id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "c8in.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.96xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.metal-48xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.metal-96xl", + "Location": "usw2-az4" + }, + { + "InstanceType": "c8in.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az4" @@ -16531,6 +16655,30 @@ "InstanceType": "g6f.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "g7.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "g7e.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 f5fa429129f4..58e4a1dfaea8 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 @@ -7631,6 +7631,10 @@ "InstanceType": "p5.4xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "p6-b200.48xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-south-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 c4d026afd59b..7820c3554bdb 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 @@ -6295,6 +6295,58 @@ "InstanceType": "c8id.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c8in.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.96xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.metal-48xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.metal-96xl", + "Location": "us-east-1b" + }, + { + "InstanceType": "c8in.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1b" @@ -8111,6 +8163,10 @@ "InstanceType": "mac-m4.metal", "Location": "us-east-1b" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-1b" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1b" @@ -18323,6 +18379,10 @@ "InstanceType": "mac-m4max.metal", "Location": "us-east-1d" }, + { + "InstanceType": "mac-m4pro.metal", + "Location": "us-east-1d" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index 37b4ea7c6819..9014de89f4f7 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 @@ -1211,6 +1211,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-east-2a" @@ -2783,6 +2807,10 @@ "InstanceType": "m9gd.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "mac-m4.metal", + "Location": "us-east-2a" + }, { "InstanceType": "mac-m4pro.metal", "Location": "us-east-2a" @@ -5647,6 +5675,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-east-2b" @@ -10067,6 +10119,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "gr6.4xlarge", "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 ea04d962ffa8..5ad4585c4e17 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 @@ -1447,6 +1447,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-west-2a" @@ -6575,6 +6599,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-west-2b" @@ -11731,6 +11779,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-west-2c" @@ -16391,6 +16463,58 @@ "InstanceType": "c8id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "c8in.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.96xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.metal-48xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.metal-96xl", + "Location": "us-west-2d" + }, + { + "InstanceType": "c8in.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2d" @@ -16531,6 +16655,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "g7e.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 56628f9efcae..60ff4c7bda9f 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 @@ -1995,6 +1995,10 @@ "InstanceType": "p5en.48xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "p6-b200.48xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "r3.2xlarge", "Location": "ap-south-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 5a012735a78c..0bbd8bf4d6c3 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 @@ -1211,6 +1211,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-east-2" + }, { "InstanceType": "g7e.12xlarge", "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 68b92649a4ab..fcdac56459df 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 @@ -1467,6 +1467,30 @@ "InstanceType": "g6f.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "g7.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "g7.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "g7.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "g7.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "g7.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "g7.8xlarge", + "Location": "us-west-2" + }, { "InstanceType": "g7e.12xlarge", "Location": "us-west-2"