diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json index 0752a78b1..7ab3d7cd9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json @@ -1067,6 +1067,42 @@ "InstanceType": "c5n.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.medium", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "afs1-az2" @@ -1999,6 +2035,42 @@ "InstanceType": "c5n.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.medium", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "afs1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index 6ef98b9a7..e910111e1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json @@ -295,6 +295,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "c6in.12xlarge", "Location": "apne2-az1" @@ -2163,6 +2203,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "c6in.12xlarge", "Location": "apne2-az2" @@ -3487,6 +3567,46 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "c6in.12xlarge", "Location": "apne2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index bc54eae51..50571baee 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json @@ -391,6 +391,46 @@ "InstanceType": "c6i.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "c6in.12xlarge", "Location": "apse1-az1" @@ -2935,6 +2975,46 @@ "InstanceType": "c6i.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "c6in.12xlarge", "Location": "apse1-az2" @@ -5423,6 +5503,46 @@ "InstanceType": "c6i.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "c6in.12xlarge", "Location": "apse1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json index 0fbb8d850..ba6110941 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json @@ -699,6 +699,50 @@ "InstanceType": "r6gd.xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.large", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "apse3-az1" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "apse3-az1" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index bf57c7acf..198ce241a 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json @@ -3995,6 +3995,10 @@ "InstanceType": "m7i.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "p5.48xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "eun1-az3" 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 c37a819ff..933128f62 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 @@ -483,6 +483,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.metal", + "Location": "eus2-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "m7g.12xlarge", "Location": "eus2-az1" @@ -1407,6 +1487,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.metal", + "Location": "eus2-az2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "m7g.12xlarge", "Location": "eus2-az2" @@ -2331,6 +2491,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.metal", + "Location": "eus2-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "m7g.12xlarge", "Location": "eus2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json index 8a3d379b5..425540be5 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json @@ -1067,6 +1067,42 @@ "InstanceType": "c5n.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.medium", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "c6i.12xlarge", "Location": "af-south-1b" @@ -1999,6 +2035,42 @@ "InstanceType": "c5n.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.medium", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "c6i.12xlarge", "Location": "af-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 1cd4edecd..b08ed0dea 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json @@ -295,6 +295,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-northeast-2a" @@ -2163,6 +2203,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-northeast-2b" @@ -3487,6 +3567,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-northeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json index 5c01eb5bc..559710141 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json @@ -423,6 +423,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-1a" @@ -2931,6 +2971,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-1b" @@ -5423,6 +5503,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json index 5e5ee3331..63f6c2060 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json @@ -699,6 +699,50 @@ "InstanceType": "r6gd.xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "r7i.12xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.16xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.24xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.2xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.48xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.4xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.8xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.large", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.metal-24xl", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.metal-48xl", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "r7i.xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-southeast-3a" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index d193fc565..613f5c864 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json @@ -3995,6 +3995,10 @@ "InstanceType": "m7i.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "p5.48xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-north-1c" 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 507b85302..f6782d79f 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 @@ -483,6 +483,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "m7g.12xlarge", "Location": "eu-south-2a" @@ -1407,6 +1487,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "m7g.12xlarge", "Location": "eu-south-2b" @@ -2331,6 +2491,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "m7g.12xlarge", "Location": "eu-south-2c" diff --git a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json index fcfc7e5f5..3d01b69a5 100644 --- a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json @@ -163,6 +163,42 @@ "InstanceType": "c5n.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.large", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.medium", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "c6i.12xlarge", "Location": "af-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index a212d8624..75ee4737c 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -295,6 +295,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index d4e6d86f3..1d2953d33 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json @@ -423,6 +423,46 @@ "InstanceType": "c6i.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.metal", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index 9c7311cdd..b3ea9a4c3 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -1043,6 +1043,10 @@ "InstanceType": "mac1.metal", "Location": "eu-north-1" }, + { + "InstanceType": "p5.48xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-north-1" 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 9eac84983..d77b464fb 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 @@ -483,6 +483,86 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-south-2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "m7g.12xlarge", "Location": "eu-south-2"