From d4b1f09032b232fbcc7b60a910efbeec207e55d7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 21:30:15 -0100 Subject: [PATCH] chore: update EC2 Instance Offerings (#6058) --- .../availability-zone-id/ap-northeast-1.json | 8 -- .../availability-zone-id/ap-southeast-1.json | 44 ++++++ .../availability-zone-id/eu-west-1.json | 12 -- .../availability-zone-id/eu-west-3.json | 132 ++++++++++++++++++ .../availability-zone-id/me-south-1.json | 12 ++ .../availability-zone-id/us-east-1.json | 12 -- .../availability-zone-id/us-west-2.json | 12 -- .../availability-zone/ap-northeast-1.json | 8 -- .../availability-zone/ap-southeast-1.json | 44 ++++++ .../availability-zone/eu-west-1.json | 12 -- .../availability-zone/eu-west-3.json | 132 ++++++++++++++++++ .../availability-zone/me-south-1.json | 12 ++ .../availability-zone/us-east-1.json | 12 -- .../availability-zone/us-west-2.json | 12 -- .../region/ap-northeast-1.json | 4 - .../region/eu-west-1.json | 4 - .../region/me-south-1.json | 4 + .../region/us-east-1.json | 4 - .../region/us-west-2.json | 4 - 19 files changed, 380 insertions(+), 104 deletions(-) diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json index 7481cbdd4..cd5299cde 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json @@ -479,10 +479,6 @@ "InstanceType": "c7g.xlarge", "Location": "apne1-az1" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "apne1-az1" - }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az1" @@ -4451,10 +4447,6 @@ "InstanceType": "c6id.xlarge", "Location": "apne1-az4" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "apne1-az4" - }, { "InstanceType": "d2.2xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index 3310e1a90..f0ed93ec0 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json @@ -4811,6 +4811,50 @@ "InstanceType": "m5n.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "m6g.12xlarge", "Location": "apse1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index d5d4fdc93..96b87bba4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -535,10 +535,6 @@ "InstanceType": "c7g.xlarge", "Location": "euw1-az1" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "euw1-az1" - }, { "InstanceType": "d2.2xlarge", "Location": "euw1-az1" @@ -2959,10 +2955,6 @@ "InstanceType": "c7g.xlarge", "Location": "euw1-az2" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "euw1-az2" - }, { "InstanceType": "d2.2xlarge", "Location": "euw1-az2" @@ -5343,10 +5335,6 @@ "InstanceType": "c7g.xlarge", "Location": "euw1-az3" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "euw1-az3" - }, { "InstanceType": "d2.2xlarge", "Location": "euw1-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 5832df100..951d2ce42 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 @@ -155,6 +155,42 @@ "InstanceType": "c6g.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.medium", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "c6gn.12xlarge", "Location": "euw3-az1" @@ -363,6 +399,30 @@ "InstanceType": "i4i.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "im4gn.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "euw3-az1" @@ -379,6 +439,30 @@ "InstanceType": "inf1.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "is4gen.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euw3-az1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "m5.12xlarge", "Location": "euw3-az1" @@ -1079,6 +1163,38 @@ "InstanceType": "x2idn.metal", "Location": "euw3-az1" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "euw3-az2" @@ -2179,6 +2295,22 @@ "InstanceType": "x1.32xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euw3-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euw3-az2" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json index 7d5ee255f..4addba93e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json @@ -295,6 +295,10 @@ "InstanceType": "i3.large", "Location": "mes1-az1" }, + { + "InstanceType": "i3.metal", + "Location": "mes1-az1" + }, { "InstanceType": "i3.xlarge", "Location": "mes1-az1" @@ -943,6 +947,10 @@ "InstanceType": "i3.large", "Location": "mes1-az2" }, + { + "InstanceType": "i3.metal", + "Location": "mes1-az2" + }, { "InstanceType": "i3.xlarge", "Location": "mes1-az2" @@ -1607,6 +1615,10 @@ "InstanceType": "i3.large", "Location": "mes1-az3" }, + { + "InstanceType": "i3.metal", + "Location": "mes1-az3" + }, { "InstanceType": "i3.xlarge", "Location": "mes1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json index d8b06bacc..d12d53121 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json @@ -2687,10 +2687,6 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az2" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "use1-az2" - }, { "InstanceType": "d2.2xlarge", "Location": "use1-az2" @@ -5423,10 +5419,6 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az4" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "use1-az4" - }, { "InstanceType": "d2.2xlarge", "Location": "use1-az4" @@ -9907,10 +9899,6 @@ "InstanceType": "c7g.xlarge", "Location": "use1-az6" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "use1-az6" - }, { "InstanceType": "d2.2xlarge", "Location": "use1-az6" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json index 1bb471bb5..69cf11ee5 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json @@ -511,10 +511,6 @@ "InstanceType": "c7g.xlarge", "Location": "usw2-az1" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "usw2-az1" - }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az1" @@ -2995,10 +2991,6 @@ "InstanceType": "c7g.xlarge", "Location": "usw2-az2" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "usw2-az2" - }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az2" @@ -5415,10 +5407,6 @@ "InstanceType": "c7g.xlarge", "Location": "usw2-az3" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "usw2-az3" - }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json index fa8b58771..8b0aebe24 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json @@ -431,10 +431,6 @@ "InstanceType": "c6id.xlarge", "Location": "ap-northeast-1a" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "ap-northeast-1a" - }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1a" @@ -2647,10 +2643,6 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-1c" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "ap-northeast-1c" - }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json index db7e4656e..0495c209b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json @@ -4811,6 +4811,50 @@ "InstanceType": "m5n.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "m6g.12xlarge", "Location": "ap-southeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index b984eacc0..6affda909 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -535,10 +535,6 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1a" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-1a" @@ -2959,10 +2955,6 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-1b" @@ -5343,10 +5335,6 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1c" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "eu-west-1c" - }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-1c" 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 9e15db319..18c1f47ef 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 @@ -155,6 +155,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.medium", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "c6gn.12xlarge", "Location": "eu-west-3a" @@ -363,6 +399,30 @@ "InstanceType": "i4i.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-3a" @@ -379,6 +439,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-3a" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "m5.12xlarge", "Location": "eu-west-3a" @@ -1079,6 +1163,38 @@ "InstanceType": "x2idn.metal", "Location": "eu-west-3a" }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-west-3b" @@ -2179,6 +2295,22 @@ "InstanceType": "x1.32xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-3b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-west-3b" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json index 6d9f87f2b..f8511957e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json @@ -295,6 +295,10 @@ "InstanceType": "i3.large", "Location": "me-south-1a" }, + { + "InstanceType": "i3.metal", + "Location": "me-south-1a" + }, { "InstanceType": "i3.xlarge", "Location": "me-south-1a" @@ -943,6 +947,10 @@ "InstanceType": "i3.large", "Location": "me-south-1b" }, + { + "InstanceType": "i3.metal", + "Location": "me-south-1b" + }, { "InstanceType": "i3.xlarge", "Location": "me-south-1b" @@ -1607,6 +1615,10 @@ "InstanceType": "i3.large", "Location": "me-south-1c" }, + { + "InstanceType": "i3.metal", + "Location": "me-south-1c" + }, { "InstanceType": "i3.xlarge", "Location": "me-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json index a93e8e0a9..22f6b17bd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json @@ -2687,10 +2687,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1b" @@ -5159,10 +5155,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1c" @@ -7615,10 +7607,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1d" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-east-1d" - }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json index 4d3eaaabf..db037144c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json @@ -511,10 +511,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2a" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-west-2a" - }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2a" @@ -2995,10 +2991,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2b" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-west-2b" - }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2b" @@ -5415,10 +5407,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2c" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-west-2c" - }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index bfd2d8634..4e4a2aa45 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json @@ -503,10 +503,6 @@ "InstanceType": "c7g.xlarge", "Location": "ap-northeast-1" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "ap-northeast-1" - }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index 4045131bf..69cc93fb2 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -535,10 +535,6 @@ "InstanceType": "c7g.xlarge", "Location": "eu-west-1" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "eu-west-1" - }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json index cd7973e59..6696f26f0 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json @@ -323,6 +323,10 @@ "InstanceType": "i3.large", "Location": "me-south-1" }, + { + "InstanceType": "i3.metal", + "Location": "me-south-1" + }, { "InstanceType": "i3.xlarge", "Location": "me-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json index 896d6daca..69d2dd2e4 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json @@ -535,10 +535,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-east-1" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-east-1" - }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json index 26e97e0a5..281c6dc89 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json @@ -535,10 +535,6 @@ "InstanceType": "c7g.xlarge", "Location": "us-west-2" }, - { - "InstanceType": "cc2.8xlarge", - "Location": "us-west-2" - }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2"