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 cd5299cde..fb995f7da 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 @@ -439,6 +439,10 @@ "InstanceType": "c6in.large", "Location": "apne1-az1" }, + { + "InstanceType": "c6in.metal", + "Location": "apne1-az1" + }, { "InstanceType": "c6in.xlarge", "Location": "apne1-az1" @@ -1339,6 +1343,10 @@ "InstanceType": "m6idn.large", "Location": "apne1-az1" }, + { + "InstanceType": "m6idn.metal", + "Location": "apne1-az1" + }, { "InstanceType": "m6idn.xlarge", "Location": "apne1-az1" @@ -1375,6 +1383,10 @@ "InstanceType": "m6in.large", "Location": "apne1-az1" }, + { + "InstanceType": "m6in.metal", + "Location": "apne1-az1" + }, { "InstanceType": "m6in.xlarge", "Location": "apne1-az1" @@ -1847,6 +1859,10 @@ "InstanceType": "r6idn.large", "Location": "apne1-az1" }, + { + "InstanceType": "r6idn.metal", + "Location": "apne1-az1" + }, { "InstanceType": "r6idn.xlarge", "Location": "apne1-az1" @@ -1883,6 +1899,10 @@ "InstanceType": "r6in.large", "Location": "apne1-az1" }, + { + "InstanceType": "r6in.metal", + "Location": "apne1-az1" + }, { "InstanceType": "r6in.xlarge", "Location": "apne1-az1" @@ -2507,6 +2527,10 @@ "InstanceType": "c6in.large", "Location": "apne1-az2" }, + { + "InstanceType": "c6in.metal", + "Location": "apne1-az2" + }, { "InstanceType": "c6in.xlarge", "Location": "apne1-az2" @@ -3279,6 +3303,10 @@ "InstanceType": "m6idn.large", "Location": "apne1-az2" }, + { + "InstanceType": "m6idn.metal", + "Location": "apne1-az2" + }, { "InstanceType": "m6idn.xlarge", "Location": "apne1-az2" @@ -3315,6 +3343,10 @@ "InstanceType": "m6in.large", "Location": "apne1-az2" }, + { + "InstanceType": "m6in.metal", + "Location": "apne1-az2" + }, { "InstanceType": "m6in.xlarge", "Location": "apne1-az2" @@ -3771,6 +3803,10 @@ "InstanceType": "r6idn.large", "Location": "apne1-az2" }, + { + "InstanceType": "r6idn.metal", + "Location": "apne1-az2" + }, { "InstanceType": "r6idn.xlarge", "Location": "apne1-az2" @@ -3807,6 +3843,10 @@ "InstanceType": "r6in.large", "Location": "apne1-az2" }, + { + "InstanceType": "r6in.metal", + "Location": "apne1-az2" + }, { "InstanceType": "r6in.xlarge", "Location": "apne1-az2" @@ -5311,6 +5351,10 @@ "InstanceType": "m6idn.large", "Location": "apne1-az4" }, + { + "InstanceType": "m6idn.metal", + "Location": "apne1-az4" + }, { "InstanceType": "m6idn.xlarge", "Location": "apne1-az4" @@ -5347,6 +5391,10 @@ "InstanceType": "m6in.large", "Location": "apne1-az4" }, + { + "InstanceType": "m6in.metal", + "Location": "apne1-az4" + }, { "InstanceType": "m6in.xlarge", "Location": "apne1-az4" @@ -5859,6 +5907,10 @@ "InstanceType": "r6idn.large", "Location": "apne1-az4" }, + { + "InstanceType": "r6idn.metal", + "Location": "apne1-az4" + }, { "InstanceType": "r6idn.xlarge", "Location": "apne1-az4" @@ -5895,6 +5947,10 @@ "InstanceType": "r6in.large", "Location": "apne1-az4" }, + { + "InstanceType": "r6in.metal", + "Location": "apne1-az4" + }, { "InstanceType": "r6in.xlarge", "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 f0ed93ec0..f9e810985 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 @@ -423,6 +423,10 @@ "InstanceType": "c6in.large", "Location": "apse1-az1" }, + { + "InstanceType": "c6in.metal", + "Location": "apse1-az1" + }, { "InstanceType": "c6in.xlarge", "Location": "apse1-az1" @@ -1195,6 +1199,10 @@ "InstanceType": "m6idn.large", "Location": "apse1-az1" }, + { + "InstanceType": "m6idn.metal", + "Location": "apse1-az1" + }, { "InstanceType": "m6idn.xlarge", "Location": "apse1-az1" @@ -1231,6 +1239,10 @@ "InstanceType": "m6in.large", "Location": "apse1-az1" }, + { + "InstanceType": "m6in.metal", + "Location": "apse1-az1" + }, { "InstanceType": "m6in.xlarge", "Location": "apse1-az1" @@ -1699,6 +1711,10 @@ "InstanceType": "r6idn.large", "Location": "apse1-az1" }, + { + "InstanceType": "r6idn.metal", + "Location": "apse1-az1" + }, { "InstanceType": "r6idn.xlarge", "Location": "apse1-az1" @@ -1735,6 +1751,10 @@ "InstanceType": "r6in.large", "Location": "apse1-az1" }, + { + "InstanceType": "r6in.metal", + "Location": "apse1-az1" + }, { "InstanceType": "r6in.xlarge", "Location": "apse1-az1" @@ -2439,6 +2459,10 @@ "InstanceType": "c6in.large", "Location": "apse1-az2" }, + { + "InstanceType": "c6in.metal", + "Location": "apse1-az2" + }, { "InstanceType": "c6in.xlarge", "Location": "apse1-az2" @@ -3211,6 +3235,10 @@ "InstanceType": "m6idn.large", "Location": "apse1-az2" }, + { + "InstanceType": "m6idn.metal", + "Location": "apse1-az2" + }, { "InstanceType": "m6idn.xlarge", "Location": "apse1-az2" @@ -3247,6 +3275,10 @@ "InstanceType": "m6in.large", "Location": "apse1-az2" }, + { + "InstanceType": "m6in.metal", + "Location": "apse1-az2" + }, { "InstanceType": "m6in.xlarge", "Location": "apse1-az2" @@ -3715,6 +3747,10 @@ "InstanceType": "r6idn.large", "Location": "apse1-az2" }, + { + "InstanceType": "r6idn.metal", + "Location": "apse1-az2" + }, { "InstanceType": "r6idn.xlarge", "Location": "apse1-az2" @@ -3751,6 +3787,10 @@ "InstanceType": "r6in.large", "Location": "apse1-az2" }, + { + "InstanceType": "r6in.metal", + "Location": "apse1-az2" + }, { "InstanceType": "r6in.xlarge", "Location": "apse1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json index f40fc71b3..e8145529e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json @@ -71,10 +71,42 @@ "InstanceType": "c5d.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "c6g.16xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6g.large", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6g.medium", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6g.metal", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az1" @@ -203,10 +235,42 @@ "InstanceType": "m5d.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "m6g.16xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6g.large", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6g.medium", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6g.metal", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "m6gd.12xlarge", "Location": "euc2-az1" @@ -315,10 +379,42 @@ "InstanceType": "r5d.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "r6g.16xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6g.large", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6g.medium", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6g.metal", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az1" @@ -435,10 +531,42 @@ "InstanceType": "c5d.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "c6g.16xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6g.large", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6g.medium", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6g.metal", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az2" @@ -567,10 +695,42 @@ "InstanceType": "m5d.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "m6g.16xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6g.large", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6g.medium", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6g.metal", + "Location": "euc2-az2" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "m6gd.12xlarge", "Location": "euc2-az2" @@ -679,10 +839,42 @@ "InstanceType": "r5d.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "r6g.16xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6g.large", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6g.medium", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6g.metal", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az2" @@ -799,10 +991,42 @@ "InstanceType": "c5d.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "c6g.16xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "c6g.large", + "Location": "euc2-az3" + }, + { + "InstanceType": "c6g.medium", + "Location": "euc2-az3" + }, + { + "InstanceType": "c6g.metal", + "Location": "euc2-az3" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az3" @@ -931,10 +1155,42 @@ "InstanceType": "m5d.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "m6g.16xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6g.large", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6g.medium", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6g.metal", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "m6gd.12xlarge", "Location": "euc2-az3" @@ -1043,10 +1299,42 @@ "InstanceType": "r5d.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "r6g.16xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6g.large", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6g.medium", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6g.metal", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index 96b87bba4..737438359 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -495,6 +495,10 @@ "InstanceType": "c6in.large", "Location": "euw1-az1" }, + { + "InstanceType": "c6in.metal", + "Location": "euw1-az1" + }, { "InstanceType": "c6in.xlarge", "Location": "euw1-az1" @@ -1407,6 +1411,10 @@ "InstanceType": "m6idn.large", "Location": "euw1-az1" }, + { + "InstanceType": "m6idn.metal", + "Location": "euw1-az1" + }, { "InstanceType": "m6idn.xlarge", "Location": "euw1-az1" @@ -1443,6 +1451,10 @@ "InstanceType": "m6in.large", "Location": "euw1-az1" }, + { + "InstanceType": "m6in.metal", + "Location": "euw1-az1" + }, { "InstanceType": "m6in.xlarge", "Location": "euw1-az1" @@ -2023,6 +2035,10 @@ "InstanceType": "r6idn.large", "Location": "euw1-az1" }, + { + "InstanceType": "r6idn.metal", + "Location": "euw1-az1" + }, { "InstanceType": "r6idn.xlarge", "Location": "euw1-az1" @@ -2059,6 +2075,10 @@ "InstanceType": "r6in.large", "Location": "euw1-az1" }, + { + "InstanceType": "r6in.metal", + "Location": "euw1-az1" + }, { "InstanceType": "r6in.xlarge", "Location": "euw1-az1" @@ -2915,6 +2935,10 @@ "InstanceType": "c6in.large", "Location": "euw1-az2" }, + { + "InstanceType": "c6in.metal", + "Location": "euw1-az2" + }, { "InstanceType": "c6in.xlarge", "Location": "euw1-az2" @@ -3843,6 +3867,10 @@ "InstanceType": "m6idn.large", "Location": "euw1-az2" }, + { + "InstanceType": "m6idn.metal", + "Location": "euw1-az2" + }, { "InstanceType": "m6idn.xlarge", "Location": "euw1-az2" @@ -3879,6 +3907,10 @@ "InstanceType": "m6in.large", "Location": "euw1-az2" }, + { + "InstanceType": "m6in.metal", + "Location": "euw1-az2" + }, { "InstanceType": "m6in.xlarge", "Location": "euw1-az2" @@ -4475,6 +4507,10 @@ "InstanceType": "r6idn.large", "Location": "euw1-az2" }, + { + "InstanceType": "r6idn.metal", + "Location": "euw1-az2" + }, { "InstanceType": "r6idn.xlarge", "Location": "euw1-az2" @@ -4511,6 +4547,10 @@ "InstanceType": "r6in.large", "Location": "euw1-az2" }, + { + "InstanceType": "r6in.metal", + "Location": "euw1-az2" + }, { "InstanceType": "r6in.xlarge", "Location": "euw1-az2" @@ -5295,6 +5335,10 @@ "InstanceType": "c6in.large", "Location": "euw1-az3" }, + { + "InstanceType": "c6in.metal", + "Location": "euw1-az3" + }, { "InstanceType": "c6in.xlarge", "Location": "euw1-az3" @@ -6223,6 +6267,10 @@ "InstanceType": "m6idn.large", "Location": "euw1-az3" }, + { + "InstanceType": "m6idn.metal", + "Location": "euw1-az3" + }, { "InstanceType": "m6idn.xlarge", "Location": "euw1-az3" @@ -6259,6 +6307,10 @@ "InstanceType": "m6in.large", "Location": "euw1-az3" }, + { + "InstanceType": "m6in.metal", + "Location": "euw1-az3" + }, { "InstanceType": "m6in.xlarge", "Location": "euw1-az3" @@ -6839,6 +6891,10 @@ "InstanceType": "r6idn.large", "Location": "euw1-az3" }, + { + "InstanceType": "r6idn.metal", + "Location": "euw1-az3" + }, { "InstanceType": "r6idn.xlarge", "Location": "euw1-az3" @@ -6875,6 +6931,10 @@ "InstanceType": "r6in.large", "Location": "euw1-az3" }, + { + "InstanceType": "r6in.metal", + "Location": "euw1-az3" + }, { "InstanceType": "r6in.xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 01017eae4..d87b883b7 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json @@ -443,6 +443,10 @@ "InstanceType": "c6in.large", "Location": "use1-az1" }, + { + "InstanceType": "c6in.metal", + "Location": "use1-az1" + }, { "InstanceType": "c6in.xlarge", "Location": "use1-az1" @@ -2647,6 +2651,10 @@ "InstanceType": "c6in.large", "Location": "use1-az2" }, + { + "InstanceType": "c6in.metal", + "Location": "use1-az2" + }, { "InstanceType": "c6in.xlarge", "Location": "use1-az2" @@ -3607,6 +3615,10 @@ "InstanceType": "m6idn.large", "Location": "use1-az2" }, + { + "InstanceType": "m6idn.metal", + "Location": "use1-az2" + }, { "InstanceType": "m6idn.xlarge", "Location": "use1-az2" @@ -3643,6 +3655,10 @@ "InstanceType": "m6in.large", "Location": "use1-az2" }, + { + "InstanceType": "m6in.metal", + "Location": "use1-az2" + }, { "InstanceType": "m6in.xlarge", "Location": "use1-az2" @@ -4227,6 +4243,10 @@ "InstanceType": "r6idn.large", "Location": "use1-az2" }, + { + "InstanceType": "r6idn.metal", + "Location": "use1-az2" + }, { "InstanceType": "r6idn.xlarge", "Location": "use1-az2" @@ -4263,6 +4283,10 @@ "InstanceType": "r6in.large", "Location": "use1-az2" }, + { + "InstanceType": "r6in.metal", + "Location": "use1-az2" + }, { "InstanceType": "r6in.xlarge", "Location": "use1-az2" @@ -5379,6 +5403,10 @@ "InstanceType": "c6in.large", "Location": "use1-az4" }, + { + "InstanceType": "c6in.metal", + "Location": "use1-az4" + }, { "InstanceType": "c6in.xlarge", "Location": "use1-az4" @@ -6335,6 +6363,10 @@ "InstanceType": "m6idn.large", "Location": "use1-az4" }, + { + "InstanceType": "m6idn.metal", + "Location": "use1-az4" + }, { "InstanceType": "m6idn.xlarge", "Location": "use1-az4" @@ -6371,6 +6403,10 @@ "InstanceType": "m6in.large", "Location": "use1-az4" }, + { + "InstanceType": "m6in.metal", + "Location": "use1-az4" + }, { "InstanceType": "m6in.xlarge", "Location": "use1-az4" @@ -6947,6 +6983,10 @@ "InstanceType": "r6idn.large", "Location": "use1-az4" }, + { + "InstanceType": "r6idn.metal", + "Location": "use1-az4" + }, { "InstanceType": "r6idn.xlarge", "Location": "use1-az4" @@ -6983,6 +7023,10 @@ "InstanceType": "r6in.large", "Location": "use1-az4" }, + { + "InstanceType": "r6in.metal", + "Location": "use1-az4" + }, { "InstanceType": "r6in.xlarge", "Location": "use1-az4" @@ -7767,6 +7811,10 @@ "InstanceType": "c6in.large", "Location": "use1-az5" }, + { + "InstanceType": "c6in.metal", + "Location": "use1-az5" + }, { "InstanceType": "c6in.xlarge", "Location": "use1-az5" @@ -8495,6 +8543,10 @@ "InstanceType": "m6idn.large", "Location": "use1-az5" }, + { + "InstanceType": "m6idn.metal", + "Location": "use1-az5" + }, { "InstanceType": "m6idn.xlarge", "Location": "use1-az5" @@ -8531,6 +8583,10 @@ "InstanceType": "m6in.large", "Location": "use1-az5" }, + { + "InstanceType": "m6in.metal", + "Location": "use1-az5" + }, { "InstanceType": "m6in.xlarge", "Location": "use1-az5" @@ -9043,6 +9099,10 @@ "InstanceType": "r6idn.large", "Location": "use1-az5" }, + { + "InstanceType": "r6idn.metal", + "Location": "use1-az5" + }, { "InstanceType": "r6idn.xlarge", "Location": "use1-az5" @@ -9079,6 +9139,10 @@ "InstanceType": "r6in.large", "Location": "use1-az5" }, + { + "InstanceType": "r6in.metal", + "Location": "use1-az5" + }, { "InstanceType": "r6in.xlarge", "Location": "use1-az5" @@ -9859,6 +9923,10 @@ "InstanceType": "c6in.large", "Location": "use1-az6" }, + { + "InstanceType": "c6in.metal", + "Location": "use1-az6" + }, { "InstanceType": "c6in.xlarge", "Location": "use1-az6" @@ -10815,6 +10883,10 @@ "InstanceType": "m6idn.large", "Location": "use1-az6" }, + { + "InstanceType": "m6idn.metal", + "Location": "use1-az6" + }, { "InstanceType": "m6idn.xlarge", "Location": "use1-az6" @@ -10851,6 +10923,10 @@ "InstanceType": "m6in.large", "Location": "use1-az6" }, + { + "InstanceType": "m6in.metal", + "Location": "use1-az6" + }, { "InstanceType": "m6in.xlarge", "Location": "use1-az6" @@ -11447,6 +11523,10 @@ "InstanceType": "r6idn.large", "Location": "use1-az6" }, + { + "InstanceType": "r6idn.metal", + "Location": "use1-az6" + }, { "InstanceType": "r6idn.xlarge", "Location": "use1-az6" @@ -11483,6 +11563,10 @@ "InstanceType": "r6in.large", "Location": "use1-az6" }, + { + "InstanceType": "r6in.metal", + "Location": "use1-az6" + }, { "InstanceType": "r6in.xlarge", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json index 087fbc14c..909c45aec 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json @@ -467,6 +467,10 @@ "InstanceType": "c6in.large", "Location": "use2-az1" }, + { + "InstanceType": "c6in.metal", + "Location": "use2-az1" + }, { "InstanceType": "c6in.xlarge", "Location": "use2-az1" @@ -1279,6 +1283,10 @@ "InstanceType": "m6idn.large", "Location": "use2-az1" }, + { + "InstanceType": "m6idn.metal", + "Location": "use2-az1" + }, { "InstanceType": "m6idn.xlarge", "Location": "use2-az1" @@ -1315,6 +1323,10 @@ "InstanceType": "m6in.large", "Location": "use2-az1" }, + { + "InstanceType": "m6in.metal", + "Location": "use2-az1" + }, { "InstanceType": "m6in.xlarge", "Location": "use2-az1" @@ -1895,6 +1907,10 @@ "InstanceType": "r6idn.large", "Location": "use2-az1" }, + { + "InstanceType": "r6idn.metal", + "Location": "use2-az1" + }, { "InstanceType": "r6idn.xlarge", "Location": "use2-az1" @@ -1931,6 +1947,10 @@ "InstanceType": "r6in.large", "Location": "use2-az1" }, + { + "InstanceType": "r6in.metal", + "Location": "use2-az1" + }, { "InstanceType": "r6in.xlarge", "Location": "use2-az1" @@ -2711,6 +2731,10 @@ "InstanceType": "c6in.large", "Location": "use2-az2" }, + { + "InstanceType": "c6in.metal", + "Location": "use2-az2" + }, { "InstanceType": "c6in.xlarge", "Location": "use2-az2" @@ -3531,6 +3555,10 @@ "InstanceType": "m6idn.large", "Location": "use2-az2" }, + { + "InstanceType": "m6idn.metal", + "Location": "use2-az2" + }, { "InstanceType": "m6idn.xlarge", "Location": "use2-az2" @@ -3567,6 +3595,10 @@ "InstanceType": "m6in.large", "Location": "use2-az2" }, + { + "InstanceType": "m6in.metal", + "Location": "use2-az2" + }, { "InstanceType": "m6in.xlarge", "Location": "use2-az2" @@ -4159,6 +4191,10 @@ "InstanceType": "r6idn.large", "Location": "use2-az2" }, + { + "InstanceType": "r6idn.metal", + "Location": "use2-az2" + }, { "InstanceType": "r6idn.xlarge", "Location": "use2-az2" @@ -4195,6 +4231,10 @@ "InstanceType": "r6in.large", "Location": "use2-az2" }, + { + "InstanceType": "r6in.metal", + "Location": "use2-az2" + }, { "InstanceType": "r6in.xlarge", "Location": "use2-az2" @@ -4919,6 +4959,10 @@ "InstanceType": "c6in.large", "Location": "use2-az3" }, + { + "InstanceType": "c6in.metal", + "Location": "use2-az3" + }, { "InstanceType": "c6in.xlarge", "Location": "use2-az3" @@ -5731,6 +5775,10 @@ "InstanceType": "m6idn.large", "Location": "use2-az3" }, + { + "InstanceType": "m6idn.metal", + "Location": "use2-az3" + }, { "InstanceType": "m6idn.xlarge", "Location": "use2-az3" @@ -5767,6 +5815,10 @@ "InstanceType": "m6in.large", "Location": "use2-az3" }, + { + "InstanceType": "m6in.metal", + "Location": "use2-az3" + }, { "InstanceType": "m6in.xlarge", "Location": "use2-az3" @@ -6343,6 +6395,10 @@ "InstanceType": "r6idn.large", "Location": "use2-az3" }, + { + "InstanceType": "r6idn.metal", + "Location": "use2-az3" + }, { "InstanceType": "r6idn.xlarge", "Location": "use2-az3" @@ -6379,6 +6435,10 @@ "InstanceType": "r6in.large", "Location": "use2-az3" }, + { + "InstanceType": "r6in.metal", + "Location": "use2-az3" + }, { "InstanceType": "r6in.xlarge", "Location": "use2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index 69cf11ee5..af80de54c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json @@ -471,6 +471,10 @@ "InstanceType": "c6in.large", "Location": "usw2-az1" }, + { + "InstanceType": "c6in.metal", + "Location": "usw2-az1" + }, { "InstanceType": "c6in.xlarge", "Location": "usw2-az1" @@ -1431,6 +1435,10 @@ "InstanceType": "m6idn.large", "Location": "usw2-az1" }, + { + "InstanceType": "m6idn.metal", + "Location": "usw2-az1" + }, { "InstanceType": "m6idn.xlarge", "Location": "usw2-az1" @@ -1467,6 +1475,10 @@ "InstanceType": "m6in.large", "Location": "usw2-az1" }, + { + "InstanceType": "m6in.metal", + "Location": "usw2-az1" + }, { "InstanceType": "m6in.xlarge", "Location": "usw2-az1" @@ -2063,6 +2075,10 @@ "InstanceType": "r6idn.large", "Location": "usw2-az1" }, + { + "InstanceType": "r6idn.metal", + "Location": "usw2-az1" + }, { "InstanceType": "r6idn.xlarge", "Location": "usw2-az1" @@ -2099,6 +2115,10 @@ "InstanceType": "r6in.large", "Location": "usw2-az1" }, + { + "InstanceType": "r6in.metal", + "Location": "usw2-az1" + }, { "InstanceType": "r6in.xlarge", "Location": "usw2-az1" @@ -2951,6 +2971,10 @@ "InstanceType": "c6in.large", "Location": "usw2-az2" }, + { + "InstanceType": "c6in.metal", + "Location": "usw2-az2" + }, { "InstanceType": "c6in.xlarge", "Location": "usw2-az2" @@ -3891,6 +3915,10 @@ "InstanceType": "m6idn.large", "Location": "usw2-az2" }, + { + "InstanceType": "m6idn.metal", + "Location": "usw2-az2" + }, { "InstanceType": "m6idn.xlarge", "Location": "usw2-az2" @@ -3927,6 +3955,10 @@ "InstanceType": "m6in.large", "Location": "usw2-az2" }, + { + "InstanceType": "m6in.metal", + "Location": "usw2-az2" + }, { "InstanceType": "m6in.xlarge", "Location": "usw2-az2" @@ -4519,6 +4551,10 @@ "InstanceType": "r6idn.large", "Location": "usw2-az2" }, + { + "InstanceType": "r6idn.metal", + "Location": "usw2-az2" + }, { "InstanceType": "r6idn.xlarge", "Location": "usw2-az2" @@ -4555,6 +4591,10 @@ "InstanceType": "r6in.large", "Location": "usw2-az2" }, + { + "InstanceType": "r6in.metal", + "Location": "usw2-az2" + }, { "InstanceType": "r6in.xlarge", "Location": "usw2-az2" @@ -5367,6 +5407,10 @@ "InstanceType": "c6in.large", "Location": "usw2-az3" }, + { + "InstanceType": "c6in.metal", + "Location": "usw2-az3" + }, { "InstanceType": "c6in.xlarge", "Location": "usw2-az3" @@ -6323,6 +6367,10 @@ "InstanceType": "m6idn.large", "Location": "usw2-az3" }, + { + "InstanceType": "m6idn.metal", + "Location": "usw2-az3" + }, { "InstanceType": "m6idn.xlarge", "Location": "usw2-az3" @@ -6359,6 +6407,10 @@ "InstanceType": "m6in.large", "Location": "usw2-az3" }, + { + "InstanceType": "m6in.metal", + "Location": "usw2-az3" + }, { "InstanceType": "m6in.xlarge", "Location": "usw2-az3" @@ -6955,6 +7007,10 @@ "InstanceType": "r6idn.large", "Location": "usw2-az3" }, + { + "InstanceType": "r6idn.metal", + "Location": "usw2-az3" + }, { "InstanceType": "r6idn.xlarge", "Location": "usw2-az3" @@ -6991,6 +7047,10 @@ "InstanceType": "r6in.large", "Location": "usw2-az3" }, + { + "InstanceType": "r6in.metal", + "Location": "usw2-az3" + }, { "InstanceType": "r6in.xlarge", "Location": "usw2-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 8b0aebe24..ab43a9194 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 @@ -1295,6 +1295,10 @@ "InstanceType": "m6idn.large", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-northeast-1a" @@ -1331,6 +1335,10 @@ "InstanceType": "m6in.large", "Location": "ap-northeast-1a" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1a" @@ -1843,6 +1851,10 @@ "InstanceType": "r6idn.large", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-northeast-1a" @@ -1879,6 +1891,10 @@ "InstanceType": "r6in.large", "Location": "ap-northeast-1a" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1a" @@ -2603,6 +2619,10 @@ "InstanceType": "c6in.large", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "c6in.xlarge", "Location": "ap-northeast-1c" @@ -3503,6 +3523,10 @@ "InstanceType": "m6idn.large", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-northeast-1c" @@ -3539,6 +3563,10 @@ "InstanceType": "m6in.large", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1c" @@ -4011,6 +4039,10 @@ "InstanceType": "r6idn.large", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-northeast-1c" @@ -4047,6 +4079,10 @@ "InstanceType": "r6in.large", "Location": "ap-northeast-1c" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1c" @@ -4671,6 +4707,10 @@ "InstanceType": "c6in.large", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "c6in.xlarge", "Location": "ap-northeast-1d" @@ -5443,6 +5483,10 @@ "InstanceType": "m6idn.large", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-northeast-1d" @@ -5479,6 +5523,10 @@ "InstanceType": "m6in.large", "Location": "ap-northeast-1d" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1d" @@ -5935,6 +5983,10 @@ "InstanceType": "r6idn.large", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-northeast-1d" @@ -5971,6 +6023,10 @@ "InstanceType": "r6in.large", "Location": "ap-northeast-1d" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "r6in.xlarge", "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 0495c209b..b1475d1fa 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 @@ -455,6 +455,10 @@ "InstanceType": "c6in.large", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c6in.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "c6in.xlarge", "Location": "ap-southeast-1a" @@ -1227,6 +1231,10 @@ "InstanceType": "m6idn.large", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-southeast-1a" @@ -1263,6 +1271,10 @@ "InstanceType": "m6in.large", "Location": "ap-southeast-1a" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-southeast-1a" @@ -1731,6 +1743,10 @@ "InstanceType": "r6idn.large", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-southeast-1a" @@ -1767,6 +1783,10 @@ "InstanceType": "r6in.large", "Location": "ap-southeast-1a" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "r6in.xlarge", "Location": "ap-southeast-1a" @@ -2431,6 +2451,10 @@ "InstanceType": "c6in.large", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c6in.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "c6in.xlarge", "Location": "ap-southeast-1b" @@ -3203,6 +3227,10 @@ "InstanceType": "m6idn.large", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-southeast-1b" @@ -3239,6 +3267,10 @@ "InstanceType": "m6in.large", "Location": "ap-southeast-1b" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-southeast-1b" @@ -3707,6 +3739,10 @@ "InstanceType": "r6idn.large", "Location": "ap-southeast-1b" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-southeast-1b" @@ -3743,6 +3779,10 @@ "InstanceType": "r6in.large", "Location": "ap-southeast-1b" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "r6in.xlarge", "Location": "ap-southeast-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json index 176b6cffa..d7c35670c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json @@ -71,10 +71,42 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "c6g.16xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6g.large", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6g.medium", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6g.metal", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2a" @@ -203,10 +235,42 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "m6g.16xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6g.large", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6g.medium", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6g.metal", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2a" @@ -315,10 +379,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "r6g.16xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6g.large", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6g.medium", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6g.metal", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2a" @@ -435,10 +531,42 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "c6g.16xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6g.large", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6g.medium", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6g.metal", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2b" @@ -567,10 +695,42 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "m6g.16xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6g.large", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6g.medium", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6g.metal", + "Location": "eu-central-2b" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2b" @@ -679,10 +839,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "r6g.16xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6g.large", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6g.medium", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6g.metal", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2b" @@ -799,10 +991,42 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "c6g.16xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "c6g.large", + "Location": "eu-central-2c" + }, + { + "InstanceType": "c6g.medium", + "Location": "eu-central-2c" + }, + { + "InstanceType": "c6g.metal", + "Location": "eu-central-2c" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2c" @@ -931,10 +1155,42 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "m6g.16xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6g.large", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6g.medium", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6g.metal", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2c" @@ -1043,10 +1299,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "r6g.16xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6g.large", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6g.medium", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6g.metal", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index 6affda909..5e71a6b43 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -495,6 +495,10 @@ "InstanceType": "c6in.large", "Location": "eu-west-1a" }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "c6in.xlarge", "Location": "eu-west-1a" @@ -1407,6 +1411,10 @@ "InstanceType": "m6idn.large", "Location": "eu-west-1a" }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "m6idn.xlarge", "Location": "eu-west-1a" @@ -1443,6 +1451,10 @@ "InstanceType": "m6in.large", "Location": "eu-west-1a" }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "m6in.xlarge", "Location": "eu-west-1a" @@ -2023,6 +2035,10 @@ "InstanceType": "r6idn.large", "Location": "eu-west-1a" }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "r6idn.xlarge", "Location": "eu-west-1a" @@ -2059,6 +2075,10 @@ "InstanceType": "r6in.large", "Location": "eu-west-1a" }, + { + "InstanceType": "r6in.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "r6in.xlarge", "Location": "eu-west-1a" @@ -2915,6 +2935,10 @@ "InstanceType": "c6in.large", "Location": "eu-west-1b" }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "c6in.xlarge", "Location": "eu-west-1b" @@ -3843,6 +3867,10 @@ "InstanceType": "m6idn.large", "Location": "eu-west-1b" }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "m6idn.xlarge", "Location": "eu-west-1b" @@ -3879,6 +3907,10 @@ "InstanceType": "m6in.large", "Location": "eu-west-1b" }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "m6in.xlarge", "Location": "eu-west-1b" @@ -4475,6 +4507,10 @@ "InstanceType": "r6idn.large", "Location": "eu-west-1b" }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "r6idn.xlarge", "Location": "eu-west-1b" @@ -4511,6 +4547,10 @@ "InstanceType": "r6in.large", "Location": "eu-west-1b" }, + { + "InstanceType": "r6in.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "r6in.xlarge", "Location": "eu-west-1b" @@ -5295,6 +5335,10 @@ "InstanceType": "c6in.large", "Location": "eu-west-1c" }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "c6in.xlarge", "Location": "eu-west-1c" @@ -6223,6 +6267,10 @@ "InstanceType": "m6idn.large", "Location": "eu-west-1c" }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "m6idn.xlarge", "Location": "eu-west-1c" @@ -6259,6 +6307,10 @@ "InstanceType": "m6in.large", "Location": "eu-west-1c" }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "m6in.xlarge", "Location": "eu-west-1c" @@ -6839,6 +6891,10 @@ "InstanceType": "r6idn.large", "Location": "eu-west-1c" }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "r6idn.xlarge", "Location": "eu-west-1c" @@ -6875,6 +6931,10 @@ "InstanceType": "r6in.large", "Location": "eu-west-1c" }, + { + "InstanceType": "r6in.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "r6in.xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index 56610e67d..1746626ea 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json @@ -443,6 +443,10 @@ "InstanceType": "c6in.large", "Location": "us-east-1a" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-1a" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-1a" @@ -2647,6 +2651,10 @@ "InstanceType": "c6in.large", "Location": "us-east-1b" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-1b" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-1b" @@ -3607,6 +3615,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-1b" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-1b" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-1b" @@ -3643,6 +3655,10 @@ "InstanceType": "m6in.large", "Location": "us-east-1b" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-1b" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-1b" @@ -4227,6 +4243,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-1b" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-1b" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-1b" @@ -4263,6 +4283,10 @@ "InstanceType": "r6in.large", "Location": "us-east-1b" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-1b" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-1b" @@ -5115,6 +5139,10 @@ "InstanceType": "c6in.large", "Location": "us-east-1c" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-1c" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-1c" @@ -6071,6 +6099,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-1c" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-1c" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-1c" @@ -6107,6 +6139,10 @@ "InstanceType": "m6in.large", "Location": "us-east-1c" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-1c" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-1c" @@ -6683,6 +6719,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-1c" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-1c" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-1c" @@ -6719,6 +6759,10 @@ "InstanceType": "r6in.large", "Location": "us-east-1c" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-1c" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-1c" @@ -7567,6 +7611,10 @@ "InstanceType": "c6in.large", "Location": "us-east-1d" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-1d" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-1d" @@ -8523,6 +8571,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-1d" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-1d" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-1d" @@ -8559,6 +8611,10 @@ "InstanceType": "m6in.large", "Location": "us-east-1d" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-1d" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-1d" @@ -9155,6 +9211,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-1d" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-1d" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-1d" @@ -9191,6 +9251,10 @@ "InstanceType": "r6in.large", "Location": "us-east-1d" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-1d" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-1d" @@ -10247,6 +10311,10 @@ "InstanceType": "c6in.large", "Location": "us-east-1f" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-1f" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-1f" @@ -10975,6 +11043,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-1f" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-1f" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-1f" @@ -11011,6 +11083,10 @@ "InstanceType": "m6in.large", "Location": "us-east-1f" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-1f" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-1f" @@ -11523,6 +11599,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-1f" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-1f" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-1f" @@ -11559,6 +11639,10 @@ "InstanceType": "r6in.large", "Location": "us-east-1f" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-1f" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-1f" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json index d7b113033..15d391d9d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json @@ -467,6 +467,10 @@ "InstanceType": "c6in.large", "Location": "us-east-2a" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-2a" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-2a" @@ -1279,6 +1283,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-2a" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-2a" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-2a" @@ -1315,6 +1323,10 @@ "InstanceType": "m6in.large", "Location": "us-east-2a" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-2a" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-2a" @@ -1895,6 +1907,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-2a" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-2a" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-2a" @@ -1931,6 +1947,10 @@ "InstanceType": "r6in.large", "Location": "us-east-2a" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-2a" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-2a" @@ -2711,6 +2731,10 @@ "InstanceType": "c6in.large", "Location": "us-east-2b" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-2b" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-2b" @@ -3531,6 +3555,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-2b" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-2b" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-2b" @@ -3567,6 +3595,10 @@ "InstanceType": "m6in.large", "Location": "us-east-2b" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-2b" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-2b" @@ -4159,6 +4191,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-2b" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-2b" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-2b" @@ -4195,6 +4231,10 @@ "InstanceType": "r6in.large", "Location": "us-east-2b" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-2b" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-2b" @@ -4919,6 +4959,10 @@ "InstanceType": "c6in.large", "Location": "us-east-2c" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-2c" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-2c" @@ -5731,6 +5775,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-2c" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-2c" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-2c" @@ -5767,6 +5815,10 @@ "InstanceType": "m6in.large", "Location": "us-east-2c" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-2c" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-2c" @@ -6343,6 +6395,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-2c" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-2c" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-2c" @@ -6379,6 +6435,10 @@ "InstanceType": "r6in.large", "Location": "us-east-2c" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-2c" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index db037144c..47b3f4f87 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json @@ -471,6 +471,10 @@ "InstanceType": "c6in.large", "Location": "us-west-2a" }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-2a" + }, { "InstanceType": "c6in.xlarge", "Location": "us-west-2a" @@ -1431,6 +1435,10 @@ "InstanceType": "m6idn.large", "Location": "us-west-2a" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-2a" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-west-2a" @@ -1467,6 +1475,10 @@ "InstanceType": "m6in.large", "Location": "us-west-2a" }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-2a" + }, { "InstanceType": "m6in.xlarge", "Location": "us-west-2a" @@ -2063,6 +2075,10 @@ "InstanceType": "r6idn.large", "Location": "us-west-2a" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-west-2a" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-west-2a" @@ -2099,6 +2115,10 @@ "InstanceType": "r6in.large", "Location": "us-west-2a" }, + { + "InstanceType": "r6in.metal", + "Location": "us-west-2a" + }, { "InstanceType": "r6in.xlarge", "Location": "us-west-2a" @@ -2951,6 +2971,10 @@ "InstanceType": "c6in.large", "Location": "us-west-2b" }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-2b" + }, { "InstanceType": "c6in.xlarge", "Location": "us-west-2b" @@ -3891,6 +3915,10 @@ "InstanceType": "m6idn.large", "Location": "us-west-2b" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-2b" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-west-2b" @@ -3927,6 +3955,10 @@ "InstanceType": "m6in.large", "Location": "us-west-2b" }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-2b" + }, { "InstanceType": "m6in.xlarge", "Location": "us-west-2b" @@ -4519,6 +4551,10 @@ "InstanceType": "r6idn.large", "Location": "us-west-2b" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-west-2b" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-west-2b" @@ -4555,6 +4591,10 @@ "InstanceType": "r6in.large", "Location": "us-west-2b" }, + { + "InstanceType": "r6in.metal", + "Location": "us-west-2b" + }, { "InstanceType": "r6in.xlarge", "Location": "us-west-2b" @@ -5367,6 +5407,10 @@ "InstanceType": "c6in.large", "Location": "us-west-2c" }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-2c" + }, { "InstanceType": "c6in.xlarge", "Location": "us-west-2c" @@ -6323,6 +6367,10 @@ "InstanceType": "m6idn.large", "Location": "us-west-2c" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-2c" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-west-2c" @@ -6359,6 +6407,10 @@ "InstanceType": "m6in.large", "Location": "us-west-2c" }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-2c" + }, { "InstanceType": "m6in.xlarge", "Location": "us-west-2c" @@ -6955,6 +7007,10 @@ "InstanceType": "r6idn.large", "Location": "us-west-2c" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-west-2c" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-west-2c" @@ -6991,6 +7047,10 @@ "InstanceType": "r6in.large", "Location": "us-west-2c" }, + { + "InstanceType": "r6in.metal", + "Location": "us-west-2c" + }, { "InstanceType": "r6in.xlarge", "Location": "us-west-2c" 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 4e4a2aa45..ba8609e27 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 @@ -463,6 +463,10 @@ "InstanceType": "c6in.large", "Location": "ap-northeast-1" }, + { + "InstanceType": "c6in.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "c6in.xlarge", "Location": "ap-northeast-1" @@ -1367,6 +1371,10 @@ "InstanceType": "m6idn.large", "Location": "ap-northeast-1" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-northeast-1" @@ -1403,6 +1411,10 @@ "InstanceType": "m6in.large", "Location": "ap-northeast-1" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-northeast-1" @@ -1915,6 +1927,10 @@ "InstanceType": "r6idn.large", "Location": "ap-northeast-1" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-northeast-1" @@ -1951,6 +1967,10 @@ "InstanceType": "r6in.large", "Location": "ap-northeast-1" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "r6in.xlarge", "Location": "ap-northeast-1" 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 412564516..36f21db94 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 @@ -455,6 +455,10 @@ "InstanceType": "c6in.large", "Location": "ap-southeast-1" }, + { + "InstanceType": "c6in.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "c6in.xlarge", "Location": "ap-southeast-1" @@ -1227,6 +1231,10 @@ "InstanceType": "m6idn.large", "Location": "ap-southeast-1" }, + { + "InstanceType": "m6idn.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "m6idn.xlarge", "Location": "ap-southeast-1" @@ -1263,6 +1271,10 @@ "InstanceType": "m6in.large", "Location": "ap-southeast-1" }, + { + "InstanceType": "m6in.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "m6in.xlarge", "Location": "ap-southeast-1" @@ -1731,6 +1743,10 @@ "InstanceType": "r6idn.large", "Location": "ap-southeast-1" }, + { + "InstanceType": "r6idn.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "r6idn.xlarge", "Location": "ap-southeast-1" @@ -1767,6 +1783,10 @@ "InstanceType": "r6in.large", "Location": "ap-southeast-1" }, + { + "InstanceType": "r6in.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "r6in.xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json index d173e8902..1fefff011 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json @@ -71,10 +71,42 @@ "InstanceType": "c5d.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "c6g.16xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "c6g.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6g.large", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6g.medium", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6g.metal", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2" @@ -203,10 +235,42 @@ "InstanceType": "m5d.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "m6g.12xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "m6g.16xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "m6g.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6g.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6g.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6g.large", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6g.medium", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6g.metal", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6g.xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "m6gd.12xlarge", "Location": "eu-central-2" @@ -315,10 +379,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "r6g.12xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "r6g.16xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "r6g.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6g.large", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6g.medium", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6g.metal", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 69cc93fb2..c65049279 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -495,6 +495,10 @@ "InstanceType": "c6in.large", "Location": "eu-west-1" }, + { + "InstanceType": "c6in.metal", + "Location": "eu-west-1" + }, { "InstanceType": "c6in.xlarge", "Location": "eu-west-1" @@ -1423,6 +1427,10 @@ "InstanceType": "m6idn.large", "Location": "eu-west-1" }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-1" + }, { "InstanceType": "m6idn.xlarge", "Location": "eu-west-1" @@ -1459,6 +1467,10 @@ "InstanceType": "m6in.large", "Location": "eu-west-1" }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-1" + }, { "InstanceType": "m6in.xlarge", "Location": "eu-west-1" @@ -2055,6 +2067,10 @@ "InstanceType": "r6idn.large", "Location": "eu-west-1" }, + { + "InstanceType": "r6idn.metal", + "Location": "eu-west-1" + }, { "InstanceType": "r6idn.xlarge", "Location": "eu-west-1" @@ -2091,6 +2107,10 @@ "InstanceType": "r6in.large", "Location": "eu-west-1" }, + { + "InstanceType": "r6in.metal", + "Location": "eu-west-1" + }, { "InstanceType": "r6in.xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index 69d2dd2e4..8695268be 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json @@ -495,6 +495,10 @@ "InstanceType": "c6in.large", "Location": "us-east-1" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-1" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-1" @@ -1455,6 +1459,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-1" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-1" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-1" @@ -1491,6 +1499,10 @@ "InstanceType": "m6in.large", "Location": "us-east-1" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-1" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-1" @@ -2087,6 +2099,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-1" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-1" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-1" @@ -2123,6 +2139,10 @@ "InstanceType": "r6in.large", "Location": "us-east-1" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-1" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json index c106375cc..39d23f9c4 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json @@ -467,6 +467,10 @@ "InstanceType": "c6in.large", "Location": "us-east-2" }, + { + "InstanceType": "c6in.metal", + "Location": "us-east-2" + }, { "InstanceType": "c6in.xlarge", "Location": "us-east-2" @@ -1287,6 +1291,10 @@ "InstanceType": "m6idn.large", "Location": "us-east-2" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-east-2" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-east-2" @@ -1323,6 +1331,10 @@ "InstanceType": "m6in.large", "Location": "us-east-2" }, + { + "InstanceType": "m6in.metal", + "Location": "us-east-2" + }, { "InstanceType": "m6in.xlarge", "Location": "us-east-2" @@ -1915,6 +1927,10 @@ "InstanceType": "r6idn.large", "Location": "us-east-2" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-east-2" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-east-2" @@ -1951,6 +1967,10 @@ "InstanceType": "r6in.large", "Location": "us-east-2" }, + { + "InstanceType": "r6in.metal", + "Location": "us-east-2" + }, { "InstanceType": "r6in.xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index 281c6dc89..8d17156c7 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json @@ -495,6 +495,10 @@ "InstanceType": "c6in.large", "Location": "us-west-2" }, + { + "InstanceType": "c6in.metal", + "Location": "us-west-2" + }, { "InstanceType": "c6in.xlarge", "Location": "us-west-2" @@ -1455,6 +1459,10 @@ "InstanceType": "m6idn.large", "Location": "us-west-2" }, + { + "InstanceType": "m6idn.metal", + "Location": "us-west-2" + }, { "InstanceType": "m6idn.xlarge", "Location": "us-west-2" @@ -1491,6 +1499,10 @@ "InstanceType": "m6in.large", "Location": "us-west-2" }, + { + "InstanceType": "m6in.metal", + "Location": "us-west-2" + }, { "InstanceType": "m6in.xlarge", "Location": "us-west-2" @@ -2087,6 +2099,10 @@ "InstanceType": "r6idn.large", "Location": "us-west-2" }, + { + "InstanceType": "r6idn.metal", + "Location": "us-west-2" + }, { "InstanceType": "r6idn.xlarge", "Location": "us-west-2" @@ -2123,6 +2139,10 @@ "InstanceType": "r6in.large", "Location": "us-west-2" }, + { + "InstanceType": "r6in.metal", + "Location": "us-west-2" + }, { "InstanceType": "r6in.xlarge", "Location": "us-west-2"