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 d9f75aee4..ca2b0aac3 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 @@ -955,6 +955,70 @@ "InstanceType": "m7g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apne2-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne2-az1" @@ -2407,6 +2471,70 @@ "InstanceType": "m7g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apne2-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "apne2-az2" @@ -4743,6 +4871,70 @@ "InstanceType": "m6i.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apne2-az4" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "mac1.metal", "Location": "apne2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json index a1421dcc0..31fc85109 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json @@ -1079,6 +1079,70 @@ "InstanceType": "m7gd.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "aps1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "mac1.metal", "Location": "aps1-az1" @@ -2815,6 +2879,70 @@ "InstanceType": "m7gd.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "aps1-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "mac1.metal", "Location": "aps1-az2" @@ -4455,6 +4583,70 @@ "InstanceType": "m7gd.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "aps1-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index e5c3a1260..a4a211189 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json @@ -1447,6 +1447,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse2-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "mac1.metal", "Location": "apse2-az1" @@ -3651,6 +3715,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse2-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "apse2-az2" @@ -5799,6 +5927,70 @@ "InstanceType": "m7gd.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "mac1.metal", "Location": "apse2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json index ef133cc94..81a8546b8 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-3.json @@ -171,6 +171,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse3-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse3-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse3-az1" + }, { "InstanceType": "c6in.12xlarge", "Location": "apse3-az1" @@ -943,6 +975,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse3-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse3-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse3-az2" + }, { "InstanceType": "c6in.12xlarge", "Location": "apse3-az2" @@ -1635,6 +1699,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse3-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse3-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse3-az3" + }, { "InstanceType": "c6in.12xlarge", "Location": "apse3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json index c55a5a879..498350e83 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json @@ -1075,6 +1075,70 @@ "InstanceType": "m7g.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "cac1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "r4.16xlarge", "Location": "cac1-az1" @@ -4163,6 +4227,70 @@ "InstanceType": "m7g.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "cac1-az4" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "r5.12xlarge", "Location": "cac1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index 5df5e731b..e0980b914 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json @@ -1375,6 +1375,70 @@ "InstanceType": "m7gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az1" @@ -3603,6 +3667,70 @@ "InstanceType": "m7g.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az2" @@ -5915,6 +6043,70 @@ "InstanceType": "m7gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index 1cd2da9b5..506eeafb9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json @@ -351,6 +351,38 @@ "InstanceType": "c7g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "c7i.12xlarge", "Location": "eun1-az1" @@ -855,6 +887,38 @@ "InstanceType": "m7g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eun1-az1" @@ -1179,6 +1243,38 @@ "InstanceType": "r7g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "r7i.12xlarge", "Location": "eun1-az1" @@ -1687,6 +1783,38 @@ "InstanceType": "c7g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "eun1-az2" @@ -2215,6 +2343,38 @@ "InstanceType": "m7g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eun1-az2" @@ -2611,6 +2771,38 @@ "InstanceType": "r7g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "r7i.12xlarge", "Location": "eun1-az2" @@ -3119,6 +3311,38 @@ "InstanceType": "c7g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az3" @@ -3611,6 +3835,38 @@ "InstanceType": "m7g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eun1-az3" @@ -3967,6 +4223,38 @@ "InstanceType": "r7g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "r7i.12xlarge", "Location": "eun1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json index 2357c7a10..dbe56e0c4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json @@ -447,6 +447,38 @@ "InstanceType": "m7g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eus2-az1" @@ -655,6 +687,38 @@ "InstanceType": "r7g.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eus2-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "r7i.12xlarge", "Location": "eus2-az1" @@ -1399,6 +1463,38 @@ "InstanceType": "r7g.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eus2-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "r7i.12xlarge", "Location": "eus2-az2" @@ -1979,6 +2075,38 @@ "InstanceType": "m7g.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eus2-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 cd1fc9da4..1d11715cf 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 @@ -419,6 +419,42 @@ "InstanceType": "c6in.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euw2-az1" @@ -987,6 +1023,106 @@ "InstanceType": "m6i.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw2-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw2-az1" @@ -1999,6 +2135,42 @@ "InstanceType": "c6in.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "euw2-az2" @@ -2615,6 +2787,106 @@ "InstanceType": "m6i.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw2-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "euw2-az2" @@ -4111,6 +4383,106 @@ "InstanceType": "m6i.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.medium", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw2-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "p3.16xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index 2e7c74c8e..9440e905d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json @@ -759,6 +759,70 @@ "InstanceType": "m6i.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw3-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "r4.16xlarge", "Location": "euw3-az1" @@ -3271,6 +3335,70 @@ "InstanceType": "m6i.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "euw3-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "r4.16xlarge", "Location": "euw3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index d88b9f252..08cd8c8ba 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -4007,6 +4007,42 @@ "InstanceType": "r6g.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "r6i.12xlarge", "Location": "sae1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json index c23bcc795..fffcb7629 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json @@ -1199,6 +1199,70 @@ "InstanceType": "m7gd.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "usw1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "r3.2xlarge", "Location": "usw1-az1" @@ -3031,6 +3095,70 @@ "InstanceType": "m7gd.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "usw1-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "r3.2xlarge", "Location": "usw1-az3" 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 b5efc5304..d24d46565 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 @@ -955,6 +955,70 @@ "InstanceType": "m7g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-2a" @@ -2407,6 +2471,70 @@ "InstanceType": "m7g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-northeast-2b" @@ -4743,6 +4871,70 @@ "InstanceType": "m6i.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-2d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json index 86a586a6e..37ac2336e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json @@ -1079,6 +1079,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-south-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1a" @@ -2883,6 +2947,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-south-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-south-1b" @@ -4619,6 +4747,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-south-1c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index 1ca9c5515..34f7fbbf8 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json @@ -1351,6 +1351,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2a" @@ -3563,6 +3627,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2b" @@ -5767,6 +5895,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json index 397ecf349..13c3c62ae 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-3.json @@ -171,6 +171,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-3a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-3a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-3a" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-3a" @@ -943,6 +975,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-3b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-3b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-3b" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-3b" @@ -1635,6 +1699,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-3c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-3c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-3c" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json index 782af04e5..b8422eade 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json @@ -1075,6 +1075,70 @@ "InstanceType": "m7g.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ca-central-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "r4.16xlarge", "Location": "ca-central-1a" @@ -4163,6 +4227,70 @@ "InstanceType": "m7g.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ca-central-1d" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "r5.12xlarge", "Location": "ca-central-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json index 494b3ba92..022d71160 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json @@ -1371,6 +1371,70 @@ "InstanceType": "m7g.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1a" @@ -3683,6 +3747,70 @@ "InstanceType": "m7gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1b" @@ -5959,6 +6087,70 @@ "InstanceType": "m7gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index 589c1452a..9bdb5fb1a 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json @@ -351,6 +351,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-north-1a" @@ -855,6 +887,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1a" @@ -1179,6 +1243,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-north-1a" @@ -1687,6 +1783,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-north-1b" @@ -2215,6 +2343,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1b" @@ -2611,6 +2771,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-north-1b" @@ -3119,6 +3311,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1c" @@ -3611,6 +3835,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1c" @@ -3967,6 +4223,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-north-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json index 650ab8d81..325396097 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json @@ -447,6 +447,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2a" @@ -655,6 +687,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-south-2a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-south-2a" @@ -1399,6 +1463,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-south-2b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-south-2b" @@ -1979,6 +2075,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-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 d5204ef33..3616d1bc6 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 @@ -419,6 +419,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2a" @@ -1035,6 +1071,106 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-2a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2a" @@ -2531,6 +2667,106 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "p3.16xlarge", "Location": "eu-west-2b" @@ -3515,6 +3751,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2c" @@ -4083,6 +4355,106 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json index ca086598e..0ee25a3d3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json @@ -759,6 +759,70 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-3a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "r4.16xlarge", "Location": "eu-west-3a" @@ -3271,6 +3335,70 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-3c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "r4.16xlarge", "Location": "eu-west-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index e326e8968..739ff7ffd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -4007,6 +4007,42 @@ "InstanceType": "r6g.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "r6i.12xlarge", "Location": "sa-east-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json index 4506b84f6..1c254269f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json @@ -1199,6 +1199,70 @@ "InstanceType": "m7gd.xlarge", "Location": "us-west-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "us-west-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1a" @@ -3031,6 +3095,70 @@ "InstanceType": "m7gd.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1b" 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 964816cde..bc91bbe28 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 @@ -955,6 +955,70 @@ "InstanceType": "m7g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index ae4b10d5b..376c02eeb 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json @@ -1103,6 +1103,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-south-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "mac1.metal", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index 53409356e..ff27350e5 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json @@ -1447,6 +1447,70 @@ "InstanceType": "m7gd.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "mac1.metal", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json index 68eaa0039..870a5107f 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-3.json @@ -171,6 +171,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-3" + }, { "InstanceType": "c6in.12xlarge", "Location": "ap-southeast-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json index 97b43781e..0c82705eb 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json @@ -1079,6 +1079,70 @@ "InstanceType": "m7g.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "ca-central-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "p3.16xlarge", "Location": "ca-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 83752c1d1..c69400608 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json @@ -1551,6 +1551,70 @@ "InstanceType": "m7gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index b0791b44f..3eba92127 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -351,6 +351,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-north-1" @@ -895,6 +927,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-north-1" @@ -1291,6 +1355,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json index 7af22f886..e53bc3a35 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json @@ -447,6 +447,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "m7i-flex.2xlarge", "Location": "eu-south-2" @@ -655,6 +687,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-south-2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-south-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 d7642bc91..6b3b6ca18 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 @@ -419,6 +419,42 @@ "InstanceType": "c6in.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-2" @@ -1035,6 +1071,106 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "m7g.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.medium", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7g.xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json index 1d26786d9..f9d9a54fb 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json @@ -759,6 +759,70 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "eu-west-3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "r4.16xlarge", "Location": "eu-west-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index fcdb77e10..2dc750306 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json @@ -1199,6 +1199,70 @@ "InstanceType": "m7gd.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.large", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.metal-24xl", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.metal-48xl", + "Location": "us-west-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "r3.2xlarge", "Location": "us-west-1"