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 6eaac2320b92..1b17788f0fa6 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 @@ -615,6 +615,42 @@ "InstanceType": "r5n.xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.large", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.medium", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.metal", + "Location": "afs1-az1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "r6i.12xlarge", "Location": "afs1-az1" @@ -1139,6 +1175,42 @@ "InstanceType": "m5d.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.medium", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "m6gd.12xlarge", "Location": "afs1-az2" @@ -1359,6 +1431,42 @@ "InstanceType": "r5n.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.medium", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "afs1-az2" @@ -1883,6 +1991,42 @@ "InstanceType": "m5d.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.medium", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "m6i.12xlarge", "Location": "afs1-az3" @@ -2067,6 +2211,42 @@ "InstanceType": "r5n.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.medium", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "r6i.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 197af9e37ce4..e105cb771999 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 @@ -727,6 +727,42 @@ "InstanceType": "m6g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "m6i.12xlarge", "Location": "apne2-az1" @@ -1943,6 +1979,42 @@ "InstanceType": "m6g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "m6i.12xlarge", "Location": "apne2-az2" @@ -4051,6 +4123,42 @@ "InstanceType": "m6g.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.medium", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.metal", + "Location": "apne2-az4" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "m6i.12xlarge", "Location": "apne2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json index 83bfe0d1b0f5..dada8cf65d15 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json @@ -403,6 +403,42 @@ "InstanceType": "m5d.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "m6gd.12xlarge", "Location": "apne3-az1" @@ -1867,6 +1903,42 @@ "InstanceType": "m5d.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.medium", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "m6gd.12xlarge", "Location": "apne3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json index 8989bd4bdb37..f548cb771ce9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json @@ -595,6 +595,42 @@ "InstanceType": "r5d.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.medium", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.metal", + "Location": "mes1-az1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "r6i.12xlarge", "Location": "mes1-az1" @@ -1303,6 +1339,42 @@ "InstanceType": "r5d.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.medium", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.metal", + "Location": "mes1-az2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "mes1-az2" @@ -2011,6 +2083,42 @@ "InstanceType": "r5d.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.medium", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.metal", + "Location": "mes1-az3" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "r6i.12xlarge", "Location": "mes1-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 502047dda4b7..5ef1466e7796 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 @@ -615,6 +615,42 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.large", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.medium", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.metal", + "Location": "af-south-1a" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "r6i.12xlarge", "Location": "af-south-1a" @@ -1139,6 +1175,42 @@ "InstanceType": "m5d.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.medium", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "m6gd.12xlarge", "Location": "af-south-1b" @@ -1359,6 +1431,42 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.medium", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "r6i.12xlarge", "Location": "af-south-1b" @@ -1883,6 +1991,42 @@ "InstanceType": "m5d.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.medium", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "m6i.12xlarge", "Location": "af-south-1c" @@ -2067,6 +2211,42 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.medium", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "r6i.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 bb75aab1ab10..2a194d707eb3 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 @@ -727,6 +727,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-2a" @@ -1943,6 +1979,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-2b" @@ -4051,6 +4123,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-2d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json index fc00208b44e5..c78ee2b79a7b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json @@ -387,6 +387,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "m6gd.12xlarge", "Location": "ap-northeast-3a" @@ -1127,6 +1163,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "m6gd.12xlarge", "Location": "ap-northeast-3b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json index 32c51403f4d8..d2bafc88121c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json @@ -595,6 +595,42 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.medium", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.metal", + "Location": "me-south-1a" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "r6i.12xlarge", "Location": "me-south-1a" @@ -1303,6 +1339,42 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.medium", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.metal", + "Location": "me-south-1b" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "r6i.12xlarge", "Location": "me-south-1b" @@ -2011,6 +2083,42 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.medium", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.metal", + "Location": "me-south-1c" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "r6i.12xlarge", "Location": "me-south-1c" 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 f11d4e206644..403257a5aa8b 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 @@ -423,6 +423,42 @@ "InstanceType": "m5d.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.large", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.medium", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "m6gd.12xlarge", "Location": "af-south-1" @@ -643,6 +679,42 @@ "InstanceType": "r5n.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.large", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.medium", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "r6i.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 c5f89b162742..6157f28318fa 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 @@ -727,6 +727,42 @@ "InstanceType": "m6g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "m6i.12xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json index 836f4e74860a..c51f61cbd618 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json @@ -459,6 +459,42 @@ "InstanceType": "m5d.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "m6gd.12xlarge", "Location": "ap-northeast-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json index 53bf3a863e60..a14757d7255e 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json @@ -639,6 +639,42 @@ "InstanceType": "r5d.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.large", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.medium", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.metal", + "Location": "me-south-1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "me-south-1" + }, { "InstanceType": "r6i.12xlarge", "Location": "me-south-1"