diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index a388e3cf9..df649bf5e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json @@ -1423,6 +1423,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "apne2-az1" @@ -3847,6 +3851,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "x1.16xlarge", "Location": "apne2-az3" 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 0ede549e5..39a05fab8 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 @@ -347,6 +347,46 @@ "InstanceType": "m6gd.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "euc2-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "euc2-az1" @@ -455,6 +495,46 @@ "InstanceType": "r6g.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "euc2-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az1" @@ -991,6 +1071,46 @@ "InstanceType": "r6g.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "euc2-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-az2" @@ -1419,6 +1539,46 @@ "InstanceType": "m6gd.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "euc2-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "euc2-az3" @@ -1527,6 +1687,46 @@ "InstanceType": "r6g.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "euc2-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "euc2-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 5b1e62be9..bb4a823ba 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 @@ -339,6 +339,46 @@ "InstanceType": "c6i.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "c6in.12xlarge", "Location": "euw2-az1" @@ -1863,6 +1903,46 @@ "InstanceType": "c6i.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "c6in.12xlarge", "Location": "euw2-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index 5067de4b4..51293f883 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 @@ -4535,6 +4535,38 @@ "InstanceType": "r7gd.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "t1.micro", "Location": "use1-az2" @@ -7551,6 +7583,38 @@ "InstanceType": "r7gd.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "t1.micro", "Location": "use1-az4" @@ -9943,6 +10007,38 @@ "InstanceType": "r7gd.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.large", + "Location": "use1-az5" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "t1.micro", "Location": "use1-az5" @@ -12619,6 +12715,38 @@ "InstanceType": "r7gd.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "t1.micro", "Location": "use1-az6" 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 4706ae7e3..f831f396b 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 @@ -2431,6 +2431,38 @@ "InstanceType": "r7gd.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "t1.micro", "Location": "usw2-az1" @@ -5199,6 +5231,38 @@ "InstanceType": "r7gd.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "Location": "usw2-az2" @@ -7931,6 +7995,38 @@ "InstanceType": "r7gd.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "t1.micro", "Location": "usw2-az3" @@ -9547,6 +9643,38 @@ "InstanceType": "r6id.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "t3.2xlarge", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index d300b57e4..5f3948912 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json @@ -1423,6 +1423,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "x1.16xlarge", "Location": "ap-northeast-2a" @@ -3847,6 +3851,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "x1.16xlarge", "Location": "ap-northeast-2c" 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 12242ed08..07eeed867 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 @@ -347,6 +347,46 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-central-2a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-central-2a" @@ -455,6 +495,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-2a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2a" @@ -991,6 +1071,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-2b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2b" @@ -1419,6 +1539,46 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-central-2c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-central-2c" @@ -1527,6 +1687,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-2c" + }, + { + "InstanceType": "r6i.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-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index 9f32e0d78..c84f55844 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 @@ -339,6 +339,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "c6in.12xlarge", "Location": "eu-west-2a" @@ -3379,6 +3419,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "c6in.12xlarge", "Location": "eu-west-2c" 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 e03aa1845..e3719f2a9 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 @@ -4535,6 +4535,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "t1.micro", "Location": "us-east-1b" @@ -7287,6 +7319,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "t1.micro", "Location": "us-east-1c" @@ -10031,6 +10095,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "t1.micro", "Location": "us-east-1d" @@ -12699,6 +12795,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "t1.micro", "Location": "us-east-1f" 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 00f060d27..11df2a55e 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 @@ -2431,6 +2431,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -5199,6 +5231,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "t1.micro", "Location": "us-west-2b" @@ -7931,6 +7995,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "t1.micro", "Location": "us-west-2c" @@ -9547,6 +9643,38 @@ "InstanceType": "r6id.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "t3.2xlarge", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 9f9c72237..f16ab3f10 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -1431,6 +1431,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "u-9tb1.112xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "x1.16xlarge", "Location": "ap-northeast-2" 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 b08aab677..1e4e0d73d 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 @@ -347,6 +347,46 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-central-2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-central-2" @@ -455,6 +495,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-central-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index 38195f09b..6cab6806f 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -339,6 +339,46 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "c6in.12xlarge", "Location": "eu-west-2" 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 3e3754098..52a77fa4b 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 @@ -2471,6 +2471,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "t1.micro", "Location": "us-east-1" 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 3042b95cc..3ab626bbf 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 @@ -2459,6 +2459,38 @@ "InstanceType": "r7gd.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r7iz.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r7iz.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "t1.micro", "Location": "us-west-2"