diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json index 4dcc85be4..72abdc299 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json @@ -1391,6 +1391,42 @@ "InstanceType": "m6in.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -1907,6 +1943,42 @@ "InstanceType": "r6in.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "t1.micro", "Location": "apne1-az1" @@ -3351,6 +3423,42 @@ "InstanceType": "m6in.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "r4.16xlarge", "Location": "apne1-az2" @@ -3851,6 +3959,42 @@ "InstanceType": "r6in.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apne1-az2" @@ -6031,6 +6175,42 @@ "InstanceType": "r6in.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.metal", + "Location": "apne1-az4" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "t1.micro", "Location": "apne1-az4" 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 2d431a3c0..eb76a423d 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 @@ -431,6 +431,42 @@ "InstanceType": "c6in.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "apse1-az1" @@ -4031,6 +4067,10 @@ "InstanceType": "t4g.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "apse1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index 45302e524..77e7c2078 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json @@ -1263,6 +1263,42 @@ "InstanceType": "m6id.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "mac1.metal", "Location": "apse2-az1" @@ -1731,6 +1767,42 @@ "InstanceType": "r6id.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "t1.micro", "Location": "apse2-az1" @@ -3159,6 +3231,42 @@ "InstanceType": "m6id.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "apse2-az2" @@ -3611,6 +3719,42 @@ "InstanceType": "r6id.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "apse2-az2" @@ -5007,6 +5151,42 @@ "InstanceType": "m6id.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "mac1.metal", "Location": "apse2-az3" @@ -5451,6 +5631,42 @@ "InstanceType": "r6id.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "t1.micro", "Location": "apse2-az3" 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 5ae1cdccf..70850803b 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 @@ -1239,6 +1239,42 @@ "InstanceType": "m6in.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az1" @@ -1787,6 +1823,42 @@ "InstanceType": "r6in.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -5455,6 +5527,42 @@ "InstanceType": "m6in.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euc1-az3" @@ -6047,6 +6155,42 @@ "InstanceType": "r6in.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index aa65ae79f..8c438fa81 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json @@ -3811,6 +3811,50 @@ "InstanceType": "m5d.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "m6g.12xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json index e0ad6d58e..1aea3535c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json @@ -1975,6 +1975,42 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1a" @@ -3647,6 +3683,42 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -4163,6 +4235,42 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1c" @@ -5607,6 +5715,42 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r4.16xlarge", "Location": "ap-northeast-1d" @@ -6107,6 +6251,42 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-northeast-1d" 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 9008c2a6a..97b3a062e 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 @@ -1983,6 +1983,10 @@ "InstanceType": "t4g.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "u-12tb1.112xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "ap-southeast-1a" @@ -2539,6 +2543,42 @@ "InstanceType": "c6in.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-southeast-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index 5e5e85a1f..240faf917 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json @@ -1167,6 +1167,42 @@ "InstanceType": "m6id.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2a" @@ -1611,6 +1647,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2a" @@ -3079,6 +3151,42 @@ "InstanceType": "m6id.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2b" @@ -3547,6 +3655,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2b" @@ -4975,6 +5119,42 @@ "InstanceType": "m6id.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-2c" @@ -5427,6 +5607,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "ap-southeast-2c" 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 b4df61083..7ae41c3f3 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 @@ -3427,6 +3427,42 @@ "InstanceType": "m6in.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1b" @@ -4019,6 +4055,42 @@ "InstanceType": "r6in.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -5499,6 +5571,42 @@ "InstanceType": "m6in.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1c" @@ -6047,6 +6155,42 @@ "InstanceType": "r6in.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index ca5224b02..8c7a28404 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json @@ -2287,6 +2287,50 @@ "InstanceType": "m5d.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-west-2b" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index ba8609e27..ea6f7afdd 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json @@ -1419,6 +1419,42 @@ "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1" @@ -1975,6 +2011,42 @@ "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "t1.micro", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index 93c529cfc..1afd4beb0 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json @@ -1263,6 +1263,42 @@ "InstanceType": "m6id.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2" @@ -1731,6 +1767,42 @@ "InstanceType": "r6id.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 2ad11863d..4efe90ddb 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json @@ -1423,6 +1423,42 @@ "InstanceType": "m6in.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1" @@ -2019,6 +2055,42 @@ "InstanceType": "r6in.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r7g.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7g.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1"