chore: update EC2 Instance Offerings (#8324)

getmoto · Nov 17, 2024 · a0eb7f8 · a0eb7f8
1 parent eabf377
commit a0eb7f8
Show file tree

Hide file tree

Showing 38 changed files with 100 additions and 1,060 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
@@ -723,22 +723,6 @@
   "InstanceType": "d3en.xlarge",
   "Location": "apne1-az1"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apne1-az1"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apne1-az1"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apne1-az1"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "apne1-az1"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "apne1-az1"
@@ -6167,22 +6151,6 @@
   "InstanceType": "d3en.xlarge",
   "Location": "apne1-az4"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apne1-az4"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apne1-az4"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apne1-az4"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "apne1-az4"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "apne1-az4"

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
@@ -471,22 +471,6 @@
   "InstanceType": "d2.xlarge",
   "Location": "apne2-az1"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apne2-az1"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apne2-az1"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apne2-az1"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "apne2-az1"
- },
  {
   "InstanceType": "g4dn.12xlarge",
   "Location": "apne2-az1"
@@ -3775,22 +3759,6 @@
   "InstanceType": "d2.xlarge",
   "Location": "apne2-az3"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apne2-az3"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apne2-az3"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apne2-az3"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "apne2-az3"
- },
  {
   "InstanceType": "g4dn.12xlarge",
   "Location": "apne2-az3"

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
@@ -663,18 +663,6 @@
   "InstanceType": "d3en.xlarge",
   "Location": "apse1-az1"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apse1-az1"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apse1-az1"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apse1-az1"
- },
  {
   "InstanceType": "g4dn.12xlarge",
   "Location": "apse1-az1"
@@ -3303,18 +3291,6 @@
   "InstanceType": "d3en.xlarge",
   "Location": "apse1-az2"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apse1-az2"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apse1-az2"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apse1-az2"
- },
  {
   "InstanceType": "g4dn.12xlarge",
   "Location": "apse1-az2"

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
@@ -707,22 +707,6 @@
   "InstanceType": "f1.4xlarge",
   "Location": "apse2-az1"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apse2-az1"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apse2-az1"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apse2-az1"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "apse2-az1"
- },
  {
   "InstanceType": "g4dn.12xlarge",
   "Location": "apse2-az1"
@@ -5811,22 +5795,6 @@
   "InstanceType": "d3en.xlarge",
   "Location": "apse2-az3"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "apse2-az3"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "apse2-az3"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "apse2-az3"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "apse2-az3"
- },
  {
   "InstanceType": "g4dn.12xlarge",
   "Location": "apse2-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
@@ -551,18 +551,6 @@
   "InstanceType": "d3.xlarge",
   "Location": "cac1-az1"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "cac1-az1"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "cac1-az1"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "cac1-az1"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "cac1-az1"
@@ -1403,6 +1391,10 @@
   "InstanceType": "m7i.xlarge",
   "Location": "cac1-az1"
  },
+ {
+  "InstanceType": "mac2-m2.metal",
+  "Location": "cac1-az1"
+ },
  {
   "InstanceType": "r4.16xlarge",
   "Location": "cac1-az1"
@@ -2579,18 +2571,6 @@
   "InstanceType": "d3.xlarge",
   "Location": "cac1-az2"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "cac1-az2"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "cac1-az2"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "cac1-az2"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "cac1-az2"
@@ -3431,6 +3411,10 @@
   "InstanceType": "m7i.xlarge",
   "Location": "cac1-az2"
  },
+ {
+  "InstanceType": "mac2-m2.metal",
+  "Location": "cac1-az2"
+ },
  {
   "InstanceType": "p3.16xlarge",
   "Location": "cac1-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
@@ -3479,22 +3479,6 @@
   "InstanceType": "d3en.xlarge",
   "Location": "euc1-az2"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "euc1-az2"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "euc1-az2"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "euc1-az2"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "euc1-az2"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "euc1-az2"
@@ -6275,22 +6259,6 @@
   "InstanceType": "f1.4xlarge",
   "Location": "euc1-az3"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "euc1-az3"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "euc1-az3"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "euc1-az3"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "euc1-az3"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "euc1-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
@@ -391,6 +391,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "eus2-az1"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "eus2-az1"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "eus2-az1"
+ },
  {
   "InstanceType": "i3.16xlarge",
   "Location": "eus2-az1"

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
@@ -791,22 +791,6 @@
   "InstanceType": "f1.4xlarge",
   "Location": "euw1-az1"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "euw1-az1"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "euw1-az1"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "euw1-az1"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "euw1-az1"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "euw1-az1"
@@ -3847,22 +3831,6 @@
   "InstanceType": "f1.4xlarge",
   "Location": "euw1-az2"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "euw1-az2"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "euw1-az2"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "euw1-az2"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "euw1-az2"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "euw1-az2"
@@ -6883,22 +6851,6 @@
   "InstanceType": "f1.4xlarge",
   "Location": "euw1-az3"
  },
- {
-  "InstanceType": "g3.16xlarge",
-  "Location": "euw1-az3"
- },
- {
-  "InstanceType": "g3.4xlarge",
-  "Location": "euw1-az3"
- },
- {
-  "InstanceType": "g3.8xlarge",
-  "Location": "euw1-az3"
- },
- {
-  "InstanceType": "g3s.xlarge",
-  "Location": "euw1-az3"
- },
  {
   "InstanceType": "g4ad.16xlarge",
   "Location": "euw1-az3"