From 7edf69acbd30f9b676a873414a2ae6db387e5dc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 11:07:41 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings (#8242) --- .../availability-zone-id/af-south-1.json | 16 ++++ .../availability-zone-id/ap-northeast-2.json | 40 ++++++++++ .../availability-zone-id/ap-south-1.json | 80 +++++++++++++++++++ .../availability-zone-id/ap-southeast-2.json | 80 +++++++++++++++++++ .../availability-zone-id/eu-central-1.json | 40 ++++++++++ .../availability-zone-id/eu-central-2.json | 80 +++++++++++++++++++ .../availability-zone-id/eu-north-1.json | 80 +++++++++++++++++++ .../availability-zone-id/sa-east-1.json | 80 +++++++++++++++++++ .../availability-zone/af-south-1.json | 16 ++++ .../availability-zone/ap-northeast-2.json | 40 ++++++++++ .../availability-zone/ap-south-1.json | 80 +++++++++++++++++++ .../availability-zone/ap-southeast-2.json | 80 +++++++++++++++++++ .../availability-zone/eu-central-1.json | 40 ++++++++++ .../availability-zone/eu-central-2.json | 80 +++++++++++++++++++ .../availability-zone/eu-north-1.json | 80 +++++++++++++++++++ .../availability-zone/sa-east-1.json | 80 +++++++++++++++++++ .../region/af-south-1.json | 8 ++ .../region/ap-northeast-2.json | 20 +++++ .../region/ap-south-1.json | 40 ++++++++++ .../region/ap-southeast-2.json | 40 ++++++++++ .../region/eu-central-1.json | 20 +++++ .../region/eu-central-2.json | 40 ++++++++++ .../region/eu-north-1.json | 40 ++++++++++ .../region/sa-east-1.json | 40 ++++++++++ 24 files changed, 1240 insertions(+) diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json index 391448067f34..43f9c26488e8 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json @@ -827,6 +827,14 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "afs1-az1" @@ -2731,6 +2739,14 @@ "InstanceType": "t4g.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "x2idn.16xlarge", "Location": "afs1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index 37cf61aace93..d4635928c93c 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 @@ -2327,6 +2327,26 @@ "InstanceType": "c7g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "c7i.12xlarge", "Location": "apne2-az2" @@ -5287,6 +5307,26 @@ "InstanceType": "c6i.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "c7i.12xlarge", "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 1a435985840b..36c9ffedd606 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 @@ -607,6 +607,46 @@ "InstanceType": "g5.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "i2.2xlarge", "Location": "aps1-az1" @@ -4631,6 +4671,46 @@ "InstanceType": "g5.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "g6.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g6.xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "i2.2xlarge", "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 242390509740..8611e7960371 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 @@ -783,6 +783,46 @@ "InstanceType": "g5.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "hpc6a.48xlarge", "Location": "apse2-az1" @@ -3335,6 +3375,46 @@ "InstanceType": "g5.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "g6.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "g6.xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "i2.2xlarge", "Location": "apse2-az2" 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 22d006b5f168..dbc1c5afcfdc 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 @@ -571,6 +571,26 @@ "InstanceType": "c7gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "c7i.12xlarge", "Location": "euc1-az1" @@ -6079,6 +6099,26 @@ "InstanceType": "c7gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "c7i.12xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json index d5c9e659b22c..1ff7e1c67edb 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json @@ -983,6 +983,46 @@ "InstanceType": "d3.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "g6.12xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "g6.xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-az2" @@ -1715,6 +1755,46 @@ "InstanceType": "c6in.xlarge", "Location": "euc2-az3" }, + { + "InstanceType": "g6.12xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "g6.xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "euc2-az3" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "euc2-az3" + }, { "InstanceType": "i3.16xlarge", "Location": "euc2-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 12493e70a1db..e470dbc9fc0a 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 @@ -543,6 +543,46 @@ "InstanceType": "g4dn.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "eun1-az1" @@ -2283,6 +2323,46 @@ "InstanceType": "g5.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "hpc6a.48xlarge", "Location": "eun1-az2" 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 3062b879efee..111c08172fce 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 @@ -639,6 +639,46 @@ "InstanceType": "g5.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "sae1-az1" @@ -2535,6 +2575,46 @@ "InstanceType": "g5.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "g6.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "g6.xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "sae1-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json index 713ea6cf65c5..8569b048f627 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json @@ -827,6 +827,14 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "x1.16xlarge", "Location": "af-south-1a" @@ -2731,6 +2739,14 @@ "InstanceType": "t4g.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "x2idn.16xlarge", "Location": "af-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 8c313085b5a3..27fa12e07c7f 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 @@ -2327,6 +2327,26 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "c7i.12xlarge", "Location": "ap-northeast-2b" @@ -5287,6 +5307,26 @@ "InstanceType": "c6i.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "c7i.12xlarge", "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 a2b4be4c7b35..641419d02f95 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 @@ -607,6 +607,46 @@ "InstanceType": "g5.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "g6.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g6.xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-south-1a" @@ -2755,6 +2795,46 @@ "InstanceType": "g5.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "g6.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g6.xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-south-1b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index 4e050e8e2304..ea4d84bdfe43 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 @@ -3215,6 +3215,46 @@ "InstanceType": "g5.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "g6.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "g6.xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "hpc6a.48xlarge", "Location": "ap-southeast-2b" @@ -5767,6 +5807,46 @@ "InstanceType": "g5.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "g6.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "g6.xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json index b97fba8fbb01..b955b9ef0541 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 @@ -3299,6 +3299,26 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-central-1b" @@ -6275,6 +6295,26 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json index 9ce7dab36e44..eb71f2a91604 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json @@ -983,6 +983,46 @@ "InstanceType": "d3.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2b" @@ -1715,6 +1755,46 @@ "InstanceType": "c6in.xlarge", "Location": "eu-central-2c" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eu-central-2c" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eu-central-2c" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2c" 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 a2385e043703..27ae154a55b9 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 @@ -543,6 +543,46 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1a" @@ -2283,6 +2323,46 @@ "InstanceType": "g5.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "hpc6a.48xlarge", "Location": "eu-north-1b" 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 8dc7549d1155..1dd1ee63cac1 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 @@ -639,6 +639,46 @@ "InstanceType": "g5.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "g6.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "g6.xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "i3.16xlarge", "Location": "sa-east-1a" @@ -2535,6 +2575,46 @@ "InstanceType": "g5.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "g6.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "g6.xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "sa-east-1b" diff --git a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json index ead4f90378a6..d5e447e31d69 100644 --- a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json @@ -891,6 +891,14 @@ "InstanceType": "u-12tb1.112xlarge", "Location": "af-south-1" }, + { + "InstanceType": "u-6tb1.112xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "u-6tb1.56xlarge", + "Location": "af-south-1" + }, { "InstanceType": "x1.16xlarge", "Location": "af-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index e5c25d3150d2..ad90647b3c34 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 @@ -411,6 +411,26 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "c7i.12xlarge", "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 a772e4c6440e..2b18f01bf6c7 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 @@ -631,6 +631,46 @@ "InstanceType": "g5.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "i2.2xlarge", "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 4f4c3ade8735..69ca7434346f 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 @@ -783,6 +783,46 @@ "InstanceType": "g5.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "g6.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "g6.xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "hpc6a.48xlarge", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 9189e52260a2..7eb2a43587f6 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 @@ -615,6 +615,26 @@ "InstanceType": "c7gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c7i-flex.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i-flex.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i-flex.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i-flex.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7i-flex.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "c7i.12xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json index a1a041b21816..5aef88101066 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json @@ -199,6 +199,46 @@ "InstanceType": "d3.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-2" 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 fbd5d4d13893..0f7c08bcc242 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 @@ -575,6 +575,46 @@ "InstanceType": "g5.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "hpc6a.48xlarge", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 121584c1dbcf..42492883a7fd 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -639,6 +639,46 @@ "InstanceType": "g5.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "g6.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "g6.xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "gr6.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "gr6.8xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "i3.16xlarge", "Location": "sa-east-1"