From b0bd4dbb5e89ef0d79ef4b20cb3cae8bb8fb7e99 Mon Sep 17 00:00:00 2001 From: Caleb Woofenden Date: Thu, 19 Nov 2020 13:37:32 -0500 Subject: [PATCH 1/4] add m6g.metal and all m6gd instance types to compute/flavors.rb --- lib/fog/aws/models/compute/flavors.rb | 100 ++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb index 95d782b4c..0a31aaf60 100644 --- a/lib/fog/aws/models/compute/flavors.rb +++ b/lib/fog/aws/models/compute/flavors.rb @@ -366,6 +366,106 @@ module Fog :ebs_optimized_available => true, :instance_store_volumes => 0 }, + { + :id => 'm6g.metal', + :name => 'M6G Metal', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 274878, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'm6gd.medium', + :name => 'M6GD Medium', + :bits => 64, + :cores => 1, + :disk => 0, + :ram => 4295, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'm6gd.large', + :name => 'M6GD Large', + :bits => 64, + :cores => 2, + :disk => 0, + :ram => 8590, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'm6gd.xlarge', + :name => 'M6GD Extra Large', + :bits => 64, + :cores => 4, + :disk => 0, + :ram => 17180, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'm6gd.2xlarge', + :name => 'M6GD Double Extra Large', + :bits => 64, + :cores => 8, + :disk => 0, + :ram => 34360, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'm6gd.4xlarge', + :name => 'M6GD Quadruple Extra Large', + :bits => 64, + :cores => 16, + :disk => 0, + :ram => 68719, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'm6gd.8xlarge', + :name => 'M6GD Octuple Extra Large', + :bits => 64, + :cores => 32, + :disk => 0, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'm6gd.12xlarge', + :name => 'M6GD Twelve Extra Large', + :bits => 64, + :cores => 48, + :disk => 0, + :ram => 206158, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, + { + :id => 'm6gd.16xlarge', + :name => 'M6GD Sixteen Extra Large', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 274878, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, + { + :id => 'm6gd.metal', + :name => 'M6GD Metal', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 274878, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, { :id => 'm1.small', :name => 'M1 Small Instance', From d39094248bc9f02f556915760951e9105cc9ac03 Mon Sep 17 00:00:00 2001 From: Caleb Woofenden Date: Thu, 19 Nov 2020 13:49:50 -0500 Subject: [PATCH 2/4] add all r6g and r6gd instance classes --- lib/fog/aws/models/compute/flavors.rb | 180 ++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb index 0a31aaf60..1b6aa9179 100644 --- a/lib/fog/aws/models/compute/flavors.rb +++ b/lib/fog/aws/models/compute/flavors.rb @@ -1796,6 +1796,186 @@ module Fog :ebs_optimized_available => true, :instance_store_volumes => 4 }, + { + :id => 'r6g.medium', + :name => 'R6G Medium', + :bits => 64, + :cores => 1, + :disk => 0, + :ram => 8590, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.large', + :name => 'R6G Large', + :bits => 64, + :cores => 2, + :disk => 0, + :ram => 17180, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.xlarge', + :name => 'R6G Extra Large', + :bits => 64, + :cores => 4, + :disk => 0, + :ram => 34360, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.2xlarge', + :name => 'R6G Double Extra Large', + :bits => 64, + :cores => 8, + :disk => 0, + :ram => 68719, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.4xlarge', + :name => 'R6G Quadruple Extra Large', + :bits => 64, + :cores => 16, + :disk => 0, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.8xlarge', + :name => 'R6G Octuple Extra Large', + :bits => 64, + :cores => 32, + :disk => 0, + :ram => 274878, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.12xlarge', + :name => 'R6G Twelve Extra Large', + :bits => 64, + :cores => 48, + :disk => 0, + :ram => 412317, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.16xlarge', + :name => 'R6G Sixteen Extra Large', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 549756, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6g.metal', + :name => 'R6G Metal', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 549756, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'r6gd.medium', + :name => 'R6GD Medium', + :bits => 64, + :cores => 1, + :disk => 59, + :ram => 8590, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'r6gd.large', + :name => 'R6GD Large', + :bits => 64, + :cores => 2, + :disk => 118, + :ram => 17180, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'r6gd.xlarge', + :name => 'R6GD Extra Large', + :bits => 64, + :cores => 4, + :disk => 237, + :ram => 34360, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'r6gd.2xlarge', + :name => 'R6GD Double Extra Large', + :bits => 64, + :cores => 8, + :disk => 474, + :ram => 68719, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'r6gd.4xlarge', + :name => 'R6GD Quadruple Extra Large', + :bits => 64, + :cores => 16, + :disk => 950, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'r6gd.8xlarge', + :name => 'R6GD Octuple Extra Large', + :bits => 64, + :cores => 32, + :disk => 1900, + :ram => 274878, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'r6gd.12xlarge', + :name => 'R6GD Twelve Extra Large', + :bits => 64, + :cores => 48, + :disk => 2850, + :ram => 412317, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, + { + :id => 'r6gd.16xlarge', + :name => 'R6GD Sixteen Extra Large', + :bits => 64, + :cores => 64, + :disk => 3800, + :ram => 549756, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, + { + :id => 'r6gd.metal', + :name => 'R6GD Metal', + :bits => 64, + :cores => 64, + :disk => 3800, + :ram => 549756, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, { :id => "x1.16xlarge", :name => "X1 Sixteen Extra Large", From b27653049c25ab59a22ae2ae7a98bf53ad63f329 Mon Sep 17 00:00:00 2001 From: Caleb Woofenden Date: Thu, 19 Nov 2020 13:51:13 -0500 Subject: [PATCH 3/4] set correct disk size for m6gd classes --- lib/fog/aws/models/compute/flavors.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb index 1b6aa9179..f6090ddcb 100644 --- a/lib/fog/aws/models/compute/flavors.rb +++ b/lib/fog/aws/models/compute/flavors.rb @@ -381,7 +381,7 @@ module Fog :name => 'M6GD Medium', :bits => 64, :cores => 1, - :disk => 0, + :disk => 59, :ram => 4295, :ebs_optimized_available => true, :instance_store_volumes => 1 @@ -391,7 +391,7 @@ module Fog :name => 'M6GD Large', :bits => 64, :cores => 2, - :disk => 0, + :disk => 118, :ram => 8590, :ebs_optimized_available => true, :instance_store_volumes => 1 @@ -401,7 +401,7 @@ module Fog :name => 'M6GD Extra Large', :bits => 64, :cores => 4, - :disk => 0, + :disk => 237, :ram => 17180, :ebs_optimized_available => true, :instance_store_volumes => 1 @@ -411,7 +411,7 @@ module Fog :name => 'M6GD Double Extra Large', :bits => 64, :cores => 8, - :disk => 0, + :disk => 474, :ram => 34360, :ebs_optimized_available => true, :instance_store_volumes => 1 @@ -421,7 +421,7 @@ module Fog :name => 'M6GD Quadruple Extra Large', :bits => 64, :cores => 16, - :disk => 0, + :disk => 950, :ram => 68719, :ebs_optimized_available => true, :instance_store_volumes => 1 @@ -431,7 +431,7 @@ module Fog :name => 'M6GD Octuple Extra Large', :bits => 64, :cores => 32, - :disk => 0, + :disk => 1900, :ram => 137439, :ebs_optimized_available => true, :instance_store_volumes => 1 @@ -441,7 +441,7 @@ module Fog :name => 'M6GD Twelve Extra Large', :bits => 64, :cores => 48, - :disk => 0, + :disk => 2850, :ram => 206158, :ebs_optimized_available => true, :instance_store_volumes => 2 @@ -451,7 +451,7 @@ module Fog :name => 'M6GD Sixteen Extra Large', :bits => 64, :cores => 64, - :disk => 0, + :disk => 3800, :ram => 274878, :ebs_optimized_available => true, :instance_store_volumes => 2 @@ -461,7 +461,7 @@ module Fog :name => 'M6GD Metal', :bits => 64, :cores => 64, - :disk => 0, + :disk => 3800, :ram => 274878, :ebs_optimized_available => true, :instance_store_volumes => 2 From ce75ac791e3c8ddd529680f4003715066a2bac42 Mon Sep 17 00:00:00 2001 From: Caleb Woofenden Date: Thu, 19 Nov 2020 13:56:47 -0500 Subject: [PATCH 4/4] add c6g and c6gd instance classes --- lib/fog/aws/models/compute/flavors.rb | 180 ++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb index f6090ddcb..c381eb2fd 100644 --- a/lib/fog/aws/models/compute/flavors.rb +++ b/lib/fog/aws/models/compute/flavors.rb @@ -876,6 +876,186 @@ module Fog :ebs_optimized_available => true, :instance_store_volumes => 0 }, + { + :id => 'c6g.medium', + :name => 'C6G Medium', + :bits => 64, + :cores => 1, + :disk => 0, + :ram => 2147, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.large', + :name => 'C6G Large', + :bits => 64, + :cores => 2, + :disk => 0, + :ram => 4295, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.xlarge', + :name => 'C6G Extra Large', + :bits => 64, + :cores => 4, + :disk => 0, + :ram => 8590, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.2xlarge', + :name => 'C6G Double Extra Large', + :bits => 64, + :cores => 8, + :disk => 0, + :ram => 17180, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.4xlarge', + :name => 'C6G Quadruple Extra Large', + :bits => 64, + :cores => 16, + :disk => 0, + :ram => 34360, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.8xlarge', + :name => 'C6G Octuple Extra Large', + :bits => 64, + :cores => 32, + :disk => 0, + :ram => 68719, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.12xlarge', + :name => 'C6G Twelve Extra Large', + :bits => 64, + :cores => 48, + :disk => 0, + :ram => 103079, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.16xlarge', + :name => 'C6G Sixteen Extra Large', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6g.metal', + :name => 'C6G Metal', + :bits => 64, + :cores => 64, + :disk => 0, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 0 + }, + { + :id => 'c6gd.medium', + :name => 'C6GD Medium', + :bits => 64, + :cores => 1, + :disk => 59, + :ram => 2147, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'c6gd.large', + :name => 'C6GD Large', + :bits => 64, + :cores => 2, + :disk => 118, + :ram => 4295, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'c6gd.xlarge', + :name => 'C6GD Extra Large', + :bits => 64, + :cores => 4, + :disk => 237, + :ram => 8590, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'c6gd.2xlarge', + :name => 'C6GD Double Extra Large', + :bits => 64, + :cores => 8, + :disk => 474, + :ram => 17180, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'c6gd.4xlarge', + :name => 'C6GD Quadruple Extra Large', + :bits => 64, + :cores => 16, + :disk => 950, + :ram => 34360, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'c6gd.8xlarge', + :name => 'C6GD Octuple Extra Large', + :bits => 64, + :cores => 32, + :disk => 1900, + :ram => 68719, + :ebs_optimized_available => true, + :instance_store_volumes => 1 + }, + { + :id => 'c6gd.12xlarge', + :name => 'C6GD Twelve Extra Large', + :bits => 64, + :cores => 48, + :disk => 2850, + :ram => 103079, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, + { + :id => 'c6gd.16xlarge', + :name => 'C6GD Sixteen Extra Large', + :bits => 64, + :cores => 64, + :disk => 3800, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, + { + :id => 'c6gd.metal', + :name => 'C6GD Metal', + :bits => 64, + :cores => 64, + :disk => 3800, + :ram => 137439, + :ebs_optimized_available => true, + :instance_store_volumes => 2 + }, { :id => 'g2.2xlarge', :name => 'GPU Double Extra Large',