fog-aws 3.5.2 → 3.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/CHANGELOG.md +82 -7
  4. data/LICENSE.md +1 -1
  5. data/README.md +39 -6
  6. data/bin/console +14 -0
  7. data/bin/setup +8 -0
  8. data/fog-aws.gemspec +3 -3
  9. data/lib/fog/aws.rb +6 -1
  10. data/lib/fog/aws/credential_fetcher.rb +27 -4
  11. data/lib/fog/aws/elasticache.rb +4 -2
  12. data/lib/fog/aws/elb.rb +1 -1
  13. data/lib/fog/aws/elbv2.rb +72 -0
  14. data/lib/fog/aws/kinesis.rb +23 -15
  15. data/lib/fog/aws/models/compute/flavors.rb +1556 -134
  16. data/lib/fog/aws/models/compute/server.rb +4 -2
  17. data/lib/fog/aws/models/compute/servers.rb +2 -0
  18. data/lib/fog/aws/models/compute/snapshot.rb +7 -6
  19. data/lib/fog/aws/models/compute/vpc.rb +8 -2
  20. data/lib/fog/aws/models/storage/directory.rb +0 -1
  21. data/lib/fog/aws/models/storage/file.rb +3 -0
  22. data/lib/fog/aws/parsers/compute/create_snapshot.rb +1 -1
  23. data/lib/fog/aws/parsers/compute/create_subnet.rb +33 -6
  24. data/lib/fog/aws/parsers/compute/describe_subnets.rb +33 -6
  25. data/lib/fog/aws/parsers/dns/create_hosted_zone.rb +1 -1
  26. data/lib/fog/aws/parsers/dns/get_hosted_zone.rb +3 -3
  27. data/lib/fog/aws/parsers/dns/list_hosted_zones.rb +3 -1
  28. data/lib/fog/aws/parsers/elbv2/create_load_balancer.rb +88 -0
  29. data/lib/fog/aws/parsers/elbv2/describe_listeners.rb +110 -0
  30. data/lib/fog/aws/parsers/elbv2/describe_load_balancers.rb +88 -0
  31. data/lib/fog/aws/parsers/elbv2/describe_tags.rb +53 -0
  32. data/lib/fog/aws/parsers/elbv2/empty.rb +10 -0
  33. data/lib/fog/aws/parsers/storage/get_object_tagging.rb +33 -0
  34. data/lib/fog/aws/parsers/sts/assume_role_with_web_identity.rb +1 -1
  35. data/lib/fog/aws/requests/compute/create_vpc.rb +2 -2
  36. data/lib/fog/aws/requests/compute/run_instances.rb +20 -0
  37. data/lib/fog/aws/requests/compute/stop_instances.rb +11 -3
  38. data/lib/fog/aws/requests/elbv2/add_tags.rb +45 -0
  39. data/lib/fog/aws/requests/elbv2/create_load_balancer.rb +160 -0
  40. data/lib/fog/aws/requests/elbv2/describe_listeners.rb +38 -0
  41. data/lib/fog/aws/requests/elbv2/describe_load_balancers.rb +100 -0
  42. data/lib/fog/aws/requests/elbv2/describe_tags.rb +50 -0
  43. data/lib/fog/aws/requests/elbv2/remove_tags.rb +45 -0
  44. data/lib/fog/aws/requests/storage/get_object_tagging.rb +41 -0
  45. data/lib/fog/aws/requests/storage/put_object_tagging.rb +42 -0
  46. data/lib/fog/aws/requests/sts/assume_role_with_web_identity.rb +7 -6
  47. data/lib/fog/aws/storage.rb +2 -0
  48. data/lib/fog/aws/version.rb +1 -1
  49. data/tests/credentials_tests.rb +20 -0
  50. data/tests/parsers/elbv2/create_load_balancer_tests.rb +48 -0
  51. data/tests/parsers/elbv2/describe_listeners_tests.rb +76 -0
  52. data/tests/parsers/elbv2/describe_load_balancers_tests.rb +54 -0
  53. data/tests/parsers/elbv2/describe_tags_tests.rb +35 -0
  54. data/tests/requests/compute/vpc_tests.rb +6 -0
  55. data/tests/requests/elbv2/helper.rb +66 -0
  56. data/tests/requests/elbv2/load_balancer_tests.rb +50 -0
  57. metadata +32 -9
@@ -125,23 +125,26 @@ module Fog
125
125
  end
126
126
 
127
127
  class Mock
128
- def self.mutex
129
- @mutex ||= Mutex.new
130
- end
131
- def mutex; self.class.mutex; end
128
+ @mutex = Mutex.new
132
129
 
133
130
  def self.data
134
- @data ||= Hash.new do |hash, region|
135
- hash[region] = Hash.new do |region_hash, key|
136
- region_hash[key] = {
137
- :kinesis_streams => {}
138
- }
131
+ @mutex.synchronize do
132
+ @data ||= Hash.new do |hash, region|
133
+ hash[region] = Hash.new do |region_hash, key|
134
+ region_hash[key] = {
135
+ :kinesis_streams => {}
136
+ }
137
+ end
139
138
  end
139
+
140
+ yield @data if block_given?
140
141
  end
141
142
  end
142
143
 
143
144
  def self.reset
144
- @data = nil
145
+ @mutex.synchronize do
146
+ @data = nil
147
+ end
145
148
  end
146
149
 
147
150
  def initialize(options={})
@@ -153,31 +156,36 @@ module Fog
153
156
  end
154
157
 
155
158
  def data
156
- self.class.data[@region][@aws_access_key_id]
159
+ self.class.data do |data|
160
+ data[@region][@aws_access_key_id]
161
+ end
157
162
  end
158
163
 
159
164
  def reset_data
160
- self.class.data[@region].delete(@aws_access_key_id)
165
+ self.class.data do |data|
166
+ data[@region].delete(@aws_access_key_id)
167
+ end
161
168
  end
162
169
 
163
170
  def self.next_sequence_number
164
- mutex.synchronize do
171
+ @mutex.synchronize do
165
172
  @sequence_number ||= -1
166
173
  @sequence_number += 1
167
174
  @sequence_number.to_s
168
175
  end
169
176
  end
177
+
170
178
  def next_sequence_number; self.class.next_sequence_number; end
171
179
 
172
180
  def self.next_shard_id
173
- mutex.synchronize do
181
+ @mutex.synchronize do
174
182
  @shard_id ||= -1
175
183
  @shard_id += 1
176
184
  "shardId-#{@shard_id.to_s.rjust(12, "0")}"
177
185
  end
178
186
  end
187
+
179
188
  def next_shard_id; self.class.next_shard_id; end
180
-
181
189
  end
182
190
 
183
191
  end
@@ -1,12 +1,74 @@
1
1
  require 'fog/aws/models/compute/flavor'
2
2
 
3
+ # To compute RAM from AWS doc https://aws.amazon.com/fr/ec2/instance-types
4
+ # we can use this formula: RAM (in MB) = AWS_RAM (in GiB) * 1073.742 MB/GiB
3
5
  module Fog
4
6
  module AWS
5
7
  class Compute
6
8
  FLAVORS = [
9
+ {
10
+ :id => 'a1.medium',
11
+ :name => 'A1 Medium Instance',
12
+ :bits => 64,
13
+ :cores => 1,
14
+ :disk => 0,
15
+ :ram => 2147,
16
+ :ebs_optimized_available => false,
17
+ :instance_store_volumes => 0
18
+ },
19
+ {
20
+ :id => 'a1.large',
21
+ :name => 'A1 Large Instance',
22
+ :bits => 64,
23
+ :cores => 2,
24
+ :disk => 0,
25
+ :ram => 4295,
26
+ :ebs_optimized_available => false,
27
+ :instance_store_volumes => 0
28
+ },
29
+ {
30
+ :id => 'a1.xlarge',
31
+ :name => 'A1 Extra Large Instance',
32
+ :bits => 64,
33
+ :cores => 4,
34
+ :disk => 0,
35
+ :ram => 8590,
36
+ :ebs_optimized_available => false,
37
+ :instance_store_volumes => 0
38
+ },
39
+ {
40
+ :id => 'a1.2xlarge',
41
+ :name => 'A1 Double Extra Large Instance',
42
+ :bits => 64,
43
+ :cores => 8,
44
+ :disk => 0,
45
+ :ram => 17180,
46
+ :ebs_optimized_available => false,
47
+ :instance_store_volumes => 0
48
+ },
49
+ {
50
+ :id => 'a1.4xlarge',
51
+ :name => 'A1 Quadruple Extra Large Instance',
52
+ :bits => 64,
53
+ :cores => 16,
54
+ :disk => 0,
55
+ :ram => 34360,
56
+ :ebs_optimized_available => false,
57
+ :instance_store_volumes => 0
58
+ },
59
+ {
60
+ :id => 'a1.metal',
61
+ :name => 'A1 Metal',
62
+ :bits => 64,
63
+ :cores => 16,
64
+ :disk => 0,
65
+ :ram => 34360,
66
+ :ebs_optimized_available => false,
67
+ :instance_store_volumes => 0
68
+ },
7
69
  {
8
70
  :id => 't1.micro',
9
- :name => 'Micro Instance',
71
+ :name => 'T1 Micro Instance',
10
72
  :bits => 32,
11
73
  :cores => 1,
12
74
  :disk => 0,
@@ -26,7 +88,7 @@ module Fog
26
88
  },
27
89
  {
28
90
  :id => 't2.micro',
29
- :name => 'Micro Instance',
91
+ :name => 'T2 Micro Instance',
30
92
  :bits => 64,
31
93
  :cores => 1,
32
94
  :disk => 0,
@@ -36,7 +98,7 @@ module Fog
36
98
  },
37
99
  {
38
100
  :id => 't2.small',
39
- :name => 'Micro Instance',
101
+ :name => 'T2 Small Instance',
40
102
  :bits => 64,
41
103
  :cores => 1,
42
104
  :disk => 0,
@@ -46,7 +108,7 @@ module Fog
46
108
  },
47
109
  {
48
110
  :id => 't2.medium',
49
- :name => 'Micro Instance',
111
+ :name => 'T2 Medium Instance',
50
112
  :bits => 64,
51
113
  :cores => 2,
52
114
  :disk => 0,
@@ -56,7 +118,7 @@ module Fog
56
118
  },
57
119
  {
58
120
  :id => 't2.large',
59
- :name => 'Micro Instance',
121
+ :name => 'T2 Large Instance',
60
122
  :bits => 64,
61
123
  :cores => 2,
62
124
  :disk => 0,
@@ -66,7 +128,7 @@ module Fog
66
128
  },
67
129
  {
68
130
  :id => 't2.xlarge',
69
- :name => 'Micro Instance',
131
+ :name => 'T2 Extra Large Instance',
70
132
  :bits => 64,
71
133
  :cores => 4,
72
134
  :disk => 0,
@@ -76,7 +138,7 @@ module Fog
76
138
  },
77
139
  {
78
140
  :id => 't2.2xlarge',
79
- :name => 'Micro Instance',
141
+ :name => 'T2 Double Extra Large Instance',
80
142
  :bits => 64,
81
143
  :cores => 8,
82
144
  :disk => 0,
@@ -154,9 +216,159 @@ module Fog
154
216
  :ebs_optimized_available => true,
155
217
  :instance_store_volumes => 0
156
218
  },
219
+ {
220
+ :id => 't3a.nano',
221
+ :name => 'T3a Nano',
222
+ :bits => 64,
223
+ :cores => 2,
224
+ :disk => 0,
225
+ :ram => 536,
226
+ :ebs_optimized_available => true,
227
+ :instance_store_volumes => 0
228
+ },
229
+ {
230
+ :id => 't3a.micro',
231
+ :name => 'T3a Micro',
232
+ :bits => 64,
233
+ :cores => 2,
234
+ :disk => 0,
235
+ :ram => 1073,
236
+ :ebs_optimized_available => true,
237
+ :instance_store_volumes => 0
238
+ },
239
+ {
240
+ :id => 't3a.small',
241
+ :name => 'T3a Small',
242
+ :bits => 64,
243
+ :cores => 2,
244
+ :disk => 0,
245
+ :ram => 2147,
246
+ :ebs_optimized_available => true,
247
+ :instance_store_volumes => 0
248
+ },
249
+ {
250
+ :id => 't3a.medium',
251
+ :name => 'T3a Medium',
252
+ :bits => 64,
253
+ :cores => 2,
254
+ :disk => 0,
255
+ :ram => 4294,
256
+ :ebs_optimized_available => true,
257
+ :instance_store_volumes => 0
258
+ },
259
+ {
260
+ :id => 't3a.large',
261
+ :name => 'T3a Large',
262
+ :bits => 64,
263
+ :cores => 2,
264
+ :disk => 0,
265
+ :ram => 8589,
266
+ :ebs_optimized_available => true,
267
+ :instance_store_volumes => 0
268
+ },
269
+ {
270
+ :id => 't3a.xlarge',
271
+ :name => 'T3a Extra Large',
272
+ :bits => 64,
273
+ :cores => 4,
274
+ :disk => 0,
275
+ :ram => 17179,
276
+ :ebs_optimized_available => true,
277
+ :instance_store_volumes => 0
278
+ },
279
+ {
280
+ :id => 't3a.2xlarge',
281
+ :name => 'T3a Double Extra Large',
282
+ :bits => 64,
283
+ :cores => 8,
284
+ :disk => 0,
285
+ :ram => 34359,
286
+ :ebs_optimized_available => true,
287
+ :instance_store_volumes => 0
288
+ },
289
+ {
290
+ :id => 'm6g.medium',
291
+ :name => 'M6G Medium',
292
+ :bits => 64,
293
+ :cores => 1,
294
+ :disk => 0,
295
+ :ram => 4295,
296
+ :ebs_optimized_available => true,
297
+ :instance_store_volumes => 0
298
+ },
299
+ {
300
+ :id => 'm6g.large',
301
+ :name => 'M6G Large',
302
+ :bits => 64,
303
+ :cores => 2,
304
+ :disk => 0,
305
+ :ram => 8590,
306
+ :ebs_optimized_available => true,
307
+ :instance_store_volumes => 0
308
+ },
309
+ {
310
+ :id => 'm6g.xlarge',
311
+ :name => 'M6G Extra Large',
312
+ :bits => 64,
313
+ :cores => 4,
314
+ :disk => 0,
315
+ :ram => 17180,
316
+ :ebs_optimized_available => true,
317
+ :instance_store_volumes => 0
318
+ },
319
+ {
320
+ :id => 'm6g.2xlarge',
321
+ :name => 'M6G Double Extra Large',
322
+ :bits => 64,
323
+ :cores => 8,
324
+ :disk => 0,
325
+ :ram => 34360,
326
+ :ebs_optimized_available => true,
327
+ :instance_store_volumes => 0
328
+ },
329
+ {
330
+ :id => 'm6g.4xlarge',
331
+ :name => 'M6G Quadruple Extra Large',
332
+ :bits => 64,
333
+ :cores => 16,
334
+ :disk => 0,
335
+ :ram => 68719,
336
+ :ebs_optimized_available => true,
337
+ :instance_store_volumes => 0
338
+ },
339
+ {
340
+ :id => 'm6g.8xlarge',
341
+ :name => 'M6G Octuple Extra Large',
342
+ :bits => 64,
343
+ :cores => 32,
344
+ :disk => 0,
345
+ :ram => 137439,
346
+ :ebs_optimized_available => true,
347
+ :instance_store_volumes => 0
348
+ },
349
+ {
350
+ :id => 'm6g.12xlarge',
351
+ :name => 'M6G Twelve Extra Large',
352
+ :bits => 64,
353
+ :cores => 48,
354
+ :disk => 0,
355
+ :ram => 206158,
356
+ :ebs_optimized_available => true,
357
+ :instance_store_volumes => 0
358
+ },
359
+ {
360
+ :id => 'm6g.16xlarge',
361
+ :name => 'M6G Sixteen Extra Large',
362
+ :bits => 64,
363
+ :cores => 64,
364
+ :disk => 0,
365
+ :ram => 274878,
366
+ :ebs_optimized_available => true,
367
+ :instance_store_volumes => 0
368
+ },
157
369
  {
158
370
  :id => 'm1.small',
159
- :name => 'Small Instance',
371
+ :name => 'M1 Small Instance',
160
372
  :bits => 32,
161
373
  :cores => 1,
162
374
  :disk => 160,
@@ -166,7 +378,7 @@ module Fog
166
378
  },
167
379
  {
168
380
  :id => 'm1.medium',
169
- :name => 'Medium Instance',
381
+ :name => 'M1 Medium Instance',
170
382
  :bits => 32,
171
383
  :cores => 1,
172
384
  :disk => 400,
@@ -176,7 +388,7 @@ module Fog
176
388
  },
177
389
  {
178
390
  :id => 'm1.large',
179
- :name => 'Large Instance',
391
+ :name => 'M1 Large Instance',
180
392
  :bits => 64,
181
393
  :cores => 2,
182
394
  :disk => 850,
@@ -186,7 +398,7 @@ module Fog
186
398
  },
187
399
  {
188
400
  :id => 'm1.xlarge',
189
- :name => 'Extra Large Instance',
401
+ :name => 'M1 Extra Large Instance',
190
402
  :bits => 64,
191
403
  :cores => 4,
192
404
  :disk => 1690,
@@ -364,6 +576,16 @@ module Fog
364
576
  :ebs_optimized_available => true,
365
577
  :instance_store_volumes => 0
366
578
  },
579
+ {
580
+ :id => 'c5.12xlarge',
581
+ :name => 'C5 Twelve Extra Large',
582
+ :bits => 64,
583
+ :cores => 48,
584
+ :disk => 0,
585
+ :ram => 103079,
586
+ :ebs_optimized_available => true,
587
+ :instance_store_volumes => 0
588
+ },
367
589
  {
368
590
  :id => 'c5.18xlarge',
369
591
  :name => 'C5 Eighteen Extra Large',
@@ -374,6 +596,26 @@ module Fog
374
596
  :ebs_optimized_available => true,
375
597
  :instance_store_volumes => 0
376
598
  },
599
+ {
600
+ :id => 'c5.24xlarge',
601
+ :name => 'C5 Twenty-Four Extra Large',
602
+ :bits => 64,
603
+ :cores => 96,
604
+ :disk => 0,
605
+ :ram => 206158,
606
+ :ebs_optimized_available => true,
607
+ :instance_store_volumes => 0
608
+ },
609
+ {
610
+ :id => 'c5.metal',
611
+ :name => 'C5 Metal',
612
+ :bits => 64,
613
+ :cores => 96,
614
+ :disk => 0,
615
+ :ram => 206158,
616
+ :ebs_optimized_available => true,
617
+ :instance_store_volumes => 0
618
+ },
377
619
  {
378
620
  :id => 'c5d.large',
379
621
  :name => 'C5d Large',
@@ -424,6 +666,16 @@ module Fog
424
666
  :ebs_optimized_available => true,
425
667
  :instance_store_volumes => 1
426
668
  },
669
+ {
670
+ :id => 'c5d.12xlarge',
671
+ :name => 'C5d Twelve Extra Large',
672
+ :bits => 64,
673
+ :cores => 48,
674
+ :disk => 1800,
675
+ :ram => 103079,
676
+ :ebs_optimized_available => true,
677
+ :instance_store_volumes => 2
678
+ },
427
679
  {
428
680
  :id => 'c5d.18xlarge',
429
681
  :name => 'C5d Eighteen Extra Large',
@@ -434,6 +686,96 @@ module Fog
434
686
  :ebs_optimized_available => true,
435
687
  :instance_store_volumes => 2
436
688
  },
689
+ {
690
+ :id => 'c5d.24xlarge',
691
+ :name => 'C5d Twenty-four Extra Large',
692
+ :bits => 64,
693
+ :cores => 96,
694
+ :disk => 3600,
695
+ :ram => 206158,
696
+ :ebs_optimized_available => true,
697
+ :instance_store_volumes => 4
698
+ },
699
+ {
700
+ :id => 'c5d.metal',
701
+ :name => 'C5d Metal',
702
+ :bits => 64,
703
+ :cores => 96,
704
+ :disk => 3600,
705
+ :ram => 206158,
706
+ :ebs_optimized_available => true,
707
+ :instance_store_volumes => 4
708
+ },
709
+ {
710
+ :id => 'c5n.large',
711
+ :name => 'C5n Large',
712
+ :bits => 64,
713
+ :cores => 2,
714
+ :disk => 0,
715
+ :ram => 5637,
716
+ :ebs_optimized_available => true,
717
+ :instance_store_volumes => 0
718
+ },
719
+ {
720
+ :id => 'c5n.xlarge',
721
+ :name => 'C5n Extra Large',
722
+ :bits => 64,
723
+ :cores => 4,
724
+ :disk => 0,
725
+ :ram => 11274,
726
+ :ebs_optimized_available => true,
727
+ :instance_store_volumes => 0
728
+ },
729
+ {
730
+ :id => 'c5n.2xlarge',
731
+ :name => 'C5n Double Extra Large',
732
+ :bits => 64,
733
+ :cores => 8,
734
+ :disk => 0,
735
+ :ram => 22549,
736
+ :ebs_optimized_available => true,
737
+ :instance_store_volumes => 0
738
+ },
739
+ {
740
+ :id => 'c5n.4xlarge',
741
+ :name => 'C5n Quadruple Extra Large',
742
+ :bits => 64,
743
+ :cores => 16,
744
+ :disk => 0,
745
+ :ram => 45097,
746
+ :ebs_optimized_available => true,
747
+ :instance_store_volumes => 0
748
+ },
749
+ {
750
+ :id => 'c5n.9xlarge',
751
+ :name => 'C5n Nine Extra Large',
752
+ :bits => 64,
753
+ :cores => 36,
754
+ :disk => 0,
755
+ :ram => 103079,
756
+ :ebs_optimized_available => true,
757
+ :instance_store_volumes => 0
758
+ },
759
+ {
760
+ :id => 'c5n.18xlarge',
761
+ :name => 'C5n Eighteen Extra Large',
762
+ :bits => 64,
763
+ :cores => 72,
764
+ :disk => 0,
765
+ :ram => 206158,
766
+ :ebs_optimized_available => true,
767
+ :instance_store_volumes => 0
768
+ },
769
+ {
770
+ :id => 'c5n.metal',
771
+ :name => 'C5n Metal',
772
+ :bits => 64,
773
+ :cores => 72,
774
+ :disk => 0,
775
+ :ram => 206158,
776
+ :ebs_optimized_available => true,
777
+ :instance_store_volumes => 0
778
+ },
437
779
  {
438
780
  :id => 'g2.2xlarge',
439
781
  :name => 'GPU Double Extra Large',
@@ -685,8 +1027,108 @@ module Fog
685
1027
  :instance_store_volumes => 8
686
1028
  },
687
1029
  {
688
- :id => "r3.large",
689
- :name => "R3 Large",
1030
+ :id => 'i3.metal',
1031
+ :name => 'I3 Metal',
1032
+ :bits => 64,
1033
+ :cores => 72,
1034
+ :disk => 15200,
1035
+ :ram => 549756,
1036
+ :ebs_optimized_available => true,
1037
+ :instance_store_volumes => 8
1038
+ },
1039
+ {
1040
+ :id => 'i3en.large',
1041
+ :name => 'I3en Large',
1042
+ :bits => 64,
1043
+ :cores => 2,
1044
+ :disk => 1250,
1045
+ :ram => 17180,
1046
+ :ebs_optimized_available => true,
1047
+ :instance_store_volumes => 1
1048
+ },
1049
+ {
1050
+ :id => 'i3en.xlarge',
1051
+ :name => 'I3en Extra Large',
1052
+ :bits => 64,
1053
+ :cores => 4,
1054
+ :disk => 2500,
1055
+ :ram => 34360,
1056
+ :ebs_optimized_available => true,
1057
+ :instance_store_volumes => 1
1058
+ },
1059
+ {
1060
+ :id => 'i3en.2xlarge',
1061
+ :name => 'I3en Double Extra Large',
1062
+ :bits => 64,
1063
+ :cores => 8,
1064
+ :disk => 5000,
1065
+ :ram => 68719,
1066
+ :ebs_optimized_available => true,
1067
+ :instance_store_volumes => 2
1068
+ },
1069
+ {
1070
+ :id => 'i3en.3xlarge',
1071
+ :name => 'I3en Triple Extra Large',
1072
+ :bits => 64,
1073
+ :cores => 8,
1074
+ :disk => 7500,
1075
+ :ram => 103079,
1076
+ :ebs_optimized_available => true,
1077
+ :instance_store_volumes => 1
1078
+ },
1079
+ {
1080
+ :id => 'i3en.6xlarge',
1081
+ :name => 'I3en Sextuple Extra Large',
1082
+ :bits => 64,
1083
+ :cores => 24,
1084
+ :disk => 15000,
1085
+ :ram => 206158,
1086
+ :ebs_optimized_available => true,
1087
+ :instance_store_volumes => 2
1088
+ },
1089
+ {
1090
+ :id => 'i3en.12xlarge',
1091
+ :name => 'I3en Twelve Extra Large',
1092
+ :bits => 64,
1093
+ :cores => 24,
1094
+ :disk => 15000,
1095
+ :ram => 206158,
1096
+ :ebs_optimized_available => true,
1097
+ :instance_store_volumes => 2
1098
+ },
1099
+ {
1100
+ :id => 'i3en.16xlarge',
1101
+ :name => 'I3en Sixteen Extra Large',
1102
+ :bits => 64,
1103
+ :cores => 48,
1104
+ :disk => 30000,
1105
+ :ram => 412317,
1106
+ :ebs_optimized_available => true,
1107
+ :instance_store_volumes => 4
1108
+ },
1109
+ {
1110
+ :id => 'i3en.24xlarge',
1111
+ :name => 'I3en Twenty-four Extra Large',
1112
+ :bits => 64,
1113
+ :cores => 96,
1114
+ :disk => 60000,
1115
+ :ram => 824634,
1116
+ :ebs_optimized_available => true,
1117
+ :instance_store_volumes => 8
1118
+ },
1119
+ {
1120
+ :id => 'i3en.metal',
1121
+ :name => 'I3en Metal',
1122
+ :bits => 64,
1123
+ :cores => 96,
1124
+ :disk => 60000,
1125
+ :ram => 824634,
1126
+ :ebs_optimized_available => true,
1127
+ :instance_store_volumes => 8
1128
+ },
1129
+ {
1130
+ :id => "r3.large",
1131
+ :name => "R3 Large",
690
1132
  :bits => 64,
691
1133
  :cores => 2,
692
1134
  :ram => 16374,
@@ -834,6 +1276,16 @@ module Fog
834
1276
  :ebs_optimized_available => true,
835
1277
  :instance_store_volumes => 0
836
1278
  },
1279
+ {
1280
+ :id => "r5.8xlarge",
1281
+ :name => "R5 Octuple Extra Large",
1282
+ :bits => 64,
1283
+ :cores => 32,
1284
+ :ram => 274878,
1285
+ :disk => 0,
1286
+ :ebs_optimized_available => true,
1287
+ :instance_store_volumes => 0
1288
+ },
837
1289
  {
838
1290
  :id => "r5.12xlarge",
839
1291
  :name => "R5 Twelve Extra Large",
@@ -844,6 +1296,16 @@ module Fog
844
1296
  :ebs_optimized_available => true,
845
1297
  :instance_store_volumes => 0
846
1298
  },
1299
+ {
1300
+ :id => "r5.16xlarge",
1301
+ :name => "R5 Sixteen Extra Large",
1302
+ :bits => 64,
1303
+ :cores => 64,
1304
+ :ram => 549756,
1305
+ :disk => 0,
1306
+ :ebs_optimized_available => true,
1307
+ :instance_store_volumes => 0
1308
+ },
847
1309
  {
848
1310
  :id => "r5.24xlarge",
849
1311
  :name => "R5 Twenty Four Extra Large",
@@ -854,6 +1316,16 @@ module Fog
854
1316
  :ebs_optimized_available => true,
855
1317
  :instance_store_volumes => 0
856
1318
  },
1319
+ {
1320
+ :id => "r5.metal",
1321
+ :name => "R5 Metal",
1322
+ :bits => 64,
1323
+ :cores => 96,
1324
+ :ram => 824633,
1325
+ :disk => 0,
1326
+ :ebs_optimized_available => true,
1327
+ :instance_store_volumes => 0
1328
+ },
857
1329
  {
858
1330
  :id => "r5d.large",
859
1331
  :name => "R5d Large",
@@ -894,6 +1366,16 @@ module Fog
894
1366
  :ebs_optimized_available => true,
895
1367
  :instance_store_volumes => 2
896
1368
  },
1369
+ {
1370
+ :id => "r5d.8xlarge",
1371
+ :name => "R5d Octuple Extra Large",
1372
+ :bits => 64,
1373
+ :cores => 16,
1374
+ :ram => 137438,
1375
+ :disk => 600,
1376
+ :ebs_optimized_available => true,
1377
+ :instance_store_volumes => 2
1378
+ },
897
1379
  {
898
1380
  :id => "r5d.12xlarge",
899
1381
  :name => "R5d Twelve Extra Large",
@@ -904,6 +1386,16 @@ module Fog
904
1386
  :ebs_optimized_available => true,
905
1387
  :instance_store_volumes => 2
906
1388
  },
1389
+ {
1390
+ :id => "r5d.16xlarge",
1391
+ :name => "R5d Sixteen Extra Large",
1392
+ :bits => 64,
1393
+ :cores => 64,
1394
+ :ram => 549756,
1395
+ :disk => 2400,
1396
+ :ebs_optimized_available => true,
1397
+ :instance_store_volumes => 4
1398
+ },
907
1399
  {
908
1400
  :id => "r5d.24xlarge",
909
1401
  :name => "R5d Twenty Four Extra Large",
@@ -914,6 +1406,16 @@ module Fog
914
1406
  :ebs_optimized_available => true,
915
1407
  :instance_store_volumes => 4
916
1408
  },
1409
+ {
1410
+ :id => "r5d.metal",
1411
+ :name => "R5d Metal",
1412
+ :bits => 64,
1413
+ :cores => 96,
1414
+ :ram => 824633,
1415
+ :disk => 3600,
1416
+ :ebs_optimized_available => true,
1417
+ :instance_store_volumes => 4
1418
+ },
917
1419
  {
918
1420
  :id => "r5a.large",
919
1421
  :name => "R5 (AMD) Large",
@@ -975,258 +1477,918 @@ module Fog
975
1477
  :instance_store_volumes => 0
976
1478
  },
977
1479
  {
978
- :id => "d2.xlarge",
979
- :name => "D2 Extra Large",
1480
+ :id => "r5ad.large",
1481
+ :name => "R5d (AMD) Large",
1482
+ :bits => 64,
1483
+ :cores => 2,
1484
+ :ram => 17179,
1485
+ :disk => 75,
1486
+ :ebs_optimized_available => true,
1487
+ :instance_store_volumes => 1
1488
+ },
1489
+ {
1490
+ :id => "r5ad.xlarge",
1491
+ :name => "R5d (AMD) Extra Large",
980
1492
  :bits => 64,
981
1493
  :cores => 4,
982
- :ram => 32749,
983
- :disk => 6000,
1494
+ :ram => 34359,
1495
+ :disk => 150,
984
1496
  :ebs_optimized_available => true,
985
- :instance_store_volumes => 3
1497
+ :instance_store_volumes => 1
986
1498
  },
987
1499
  {
988
- :id => "d2.2xlarge",
989
- :name => "D2 Double Extra Large",
1500
+ :id => "r5ad.2xlarge",
1501
+ :name => "R5d (AMD) Double Extra Large",
990
1502
  :bits => 64,
991
1503
  :cores => 8,
992
- :ram => 65498,
993
- :disk => 12000,
1504
+ :ram => 68719,
1505
+ :disk => 300,
994
1506
  :ebs_optimized_available => true,
995
- :instance_store_volumes => 6
1507
+ :instance_store_volumes => 1
996
1508
  },
997
1509
  {
998
- :id => "d2.4xlarge",
999
- :name => "D2 Quadruple Extra Large",
1510
+ :id => "r5ad.4xlarge",
1511
+ :name => "R5d (AMD) Quadruple Extra Large",
1000
1512
  :bits => 64,
1001
1513
  :cores => 16,
1002
- :ram => 130996,
1003
- :disk => 24000,
1514
+ :ram => 137438,
1515
+ :disk => 600,
1004
1516
  :ebs_optimized_available => true,
1005
- :instance_store_volumes => 12
1517
+ :instance_store_volumes => 2
1006
1518
  },
1007
1519
  {
1008
- :id => "d2.8xlarge",
1009
- :name => "D2 Eight Extra Large",
1520
+ :id => "r5ad.12xlarge",
1521
+ :name => "R5d (AMD) Twelve Extra Large",
1010
1522
  :bits => 64,
1011
- :cores => 36,
1012
- :ram => 261993,
1013
- :disk => 48000,
1523
+ :cores => 48,
1524
+ :ram => 412316,
1525
+ :disk => 1800,
1014
1526
  :ebs_optimized_available => true,
1015
- :instance_store_volumes => 24
1527
+ :instance_store_volumes => 2
1016
1528
  },
1017
1529
  {
1018
- :id => "m4.large",
1019
- :name => "M4 Large",
1530
+ :id => "r5ad.24xlarge",
1531
+ :name => "R5d (AMD) Twenty Four Extra Large",
1020
1532
  :bits => 64,
1021
- :cores => 2,
1022
- :ram => 8589,
1023
- :disk => 0,
1533
+ :cores => 96,
1534
+ :ram => 824633,
1535
+ :disk => 3600,
1024
1536
  :ebs_optimized_available => true,
1025
- :instance_store_volumes => 0
1537
+ :instance_store_volumes => 4
1026
1538
  },
1027
1539
  {
1028
- :id => "m4.xlarge",
1029
- :name => "M4 Extra Large",
1540
+ :id => "r5n.large",
1541
+ :name => "R5n Large",
1030
1542
  :bits => 64,
1031
- :cores => 4,
1543
+ :cores => 2,
1032
1544
  :ram => 17179,
1033
1545
  :disk => 0,
1034
1546
  :ebs_optimized_available => true,
1035
1547
  :instance_store_volumes => 0
1036
1548
  },
1037
1549
  {
1038
- :id => "m4.2xlarge",
1039
- :name => "M4 Double Extra Large",
1550
+ :id => "r5n.xlarge",
1551
+ :name => "R5n Extra Large",
1040
1552
  :bits => 64,
1041
- :cores => 8,
1553
+ :cores => 4,
1042
1554
  :ram => 34359,
1043
1555
  :disk => 0,
1044
1556
  :ebs_optimized_available => true,
1045
1557
  :instance_store_volumes => 0
1046
1558
  },
1047
1559
  {
1048
- :id => "m4.4xlarge",
1049
- :name => "M4 Quadruple Extra Large",
1560
+ :id => "r5n.2xlarge",
1561
+ :name => "R5n Double Extra Large",
1050
1562
  :bits => 64,
1051
- :cores => 16,
1563
+ :cores => 8,
1052
1564
  :ram => 68719,
1053
1565
  :disk => 0,
1054
1566
  :ebs_optimized_available => true,
1055
1567
  :instance_store_volumes => 0
1056
1568
  },
1057
1569
  {
1058
- :id => "m4.10xlarge",
1059
- :name => "M4 Ten Extra Large",
1060
- :bits => 64,
1061
- :cores => 40,
1062
- :ram => 171798,
1063
- :disk => 0,
1064
- :ebs_optimized_available => true,
1065
- :instance_store_volumes => 0
1066
- },
1067
- {
1068
- :id => "m4.16xlarge",
1069
- :name => "M4 Sixteen Extra Large",
1070
- :bits => 64,
1071
- :cores => 64,
1072
- :ram => 262144,
1073
- :disk => 0,
1074
- :ebs_optimized_available => true,
1075
- :instance_store_volumes => 0
1076
- },
1077
- {
1078
- :id => "m5.large",
1079
- :name => "M5 Large",
1080
- :bits => 64,
1081
- :cores => 2,
1082
- :ram => 8589,
1083
- :disk => 0,
1084
- :ebs_optimized_available => true,
1085
- :instance_store_volumes => 0
1086
- },
1087
- {
1088
- :id => "m5.xlarge",
1089
- :name => "M5 Extra Large",
1570
+ :id => "r5n.4xlarge",
1571
+ :name => "R5n Quadruple Extra Large",
1090
1572
  :bits => 64,
1091
- :cores => 4,
1092
- :ram => 17179,
1573
+ :cores => 16,
1574
+ :ram => 137438,
1093
1575
  :disk => 0,
1094
1576
  :ebs_optimized_available => true,
1095
1577
  :instance_store_volumes => 0
1096
1578
  },
1097
1579
  {
1098
- :id => "m5.2xlarge",
1099
- :name => "M5 Double Extra Large",
1580
+ :id => "r5n.8xlarge",
1581
+ :name => "R5n Octuple Extra Large",
1100
1582
  :bits => 64,
1101
- :cores => 8,
1102
- :ram => 34359,
1583
+ :cores => 32,
1584
+ :ram => 274878,
1103
1585
  :disk => 0,
1104
1586
  :ebs_optimized_available => true,
1105
1587
  :instance_store_volumes => 0
1106
1588
  },
1107
1589
  {
1108
- :id => "m5.4xlarge",
1109
- :name => "M5 Quadruple Extra Large",
1590
+ :id => "r5n.12xlarge",
1591
+ :name => "R5n Twelve Extra Large",
1110
1592
  :bits => 64,
1111
- :cores => 16,
1112
- :ram => 68719,
1593
+ :cores => 48,
1594
+ :ram => 412316,
1113
1595
  :disk => 0,
1114
1596
  :ebs_optimized_available => true,
1115
1597
  :instance_store_volumes => 0
1116
1598
  },
1117
1599
  {
1118
- :id => "m5.12xlarge",
1119
- :name => "M5 Twelve Extra Large",
1600
+ :id => "r5n.16xlarge",
1601
+ :name => "R5n Sixteen Extra Large",
1120
1602
  :bits => 64,
1121
- :cores => 48,
1122
- :ram => 206158,
1603
+ :cores => 64,
1604
+ :ram => 549756,
1123
1605
  :disk => 0,
1124
1606
  :ebs_optimized_available => true,
1125
1607
  :instance_store_volumes => 0
1126
1608
  },
1127
1609
  {
1128
- :id => "m5.24xlarge",
1129
- :name => "M5 Twenty Four Extra Large",
1610
+ :id => "r5n.24xlarge",
1611
+ :name => "R5n Twenty Four Extra Large",
1130
1612
  :bits => 64,
1131
1613
  :cores => 96,
1132
- :ram => 412316,
1614
+ :ram => 824633,
1133
1615
  :disk => 0,
1134
1616
  :ebs_optimized_available => true,
1135
1617
  :instance_store_volumes => 0
1136
1618
  },
1137
1619
  {
1138
- :id => "m5d.large",
1139
- :name => "M5d Large",
1620
+ :id => "r5dn.large",
1621
+ :name => "R5dn Large",
1140
1622
  :bits => 64,
1141
1623
  :cores => 2,
1142
- :ram => 8589,
1624
+ :ram => 17179,
1143
1625
  :disk => 75,
1144
1626
  :ebs_optimized_available => true,
1145
1627
  :instance_store_volumes => 1
1146
1628
  },
1147
1629
  {
1148
- :id => "m5d.xlarge",
1149
- :name => "M5d Extra Large",
1630
+ :id => "r5dn.xlarge",
1631
+ :name => "R5dn Extra Large",
1150
1632
  :bits => 64,
1151
1633
  :cores => 4,
1152
- :ram => 17179,
1634
+ :ram => 34359,
1153
1635
  :disk => 150,
1154
1636
  :ebs_optimized_available => true,
1155
1637
  :instance_store_volumes => 1
1156
1638
  },
1157
1639
  {
1158
- :id => "m5d.2xlarge",
1159
- :name => "M5d Double Extra Large",
1640
+ :id => "r5dn.2xlarge",
1641
+ :name => "R5dn Double Extra Large",
1160
1642
  :bits => 64,
1161
1643
  :cores => 8,
1162
- :ram => 34359,
1644
+ :ram => 68719,
1163
1645
  :disk => 300,
1164
1646
  :ebs_optimized_available => true,
1165
1647
  :instance_store_volumes => 1
1166
1648
  },
1167
1649
  {
1168
- :id => "m5d.4xlarge",
1169
- :name => "M5d Quadruple Extra Large",
1650
+ :id => "r5dn.4xlarge",
1651
+ :name => "R5dn Quadruple Extra Large",
1170
1652
  :bits => 64,
1171
1653
  :cores => 16,
1172
- :ram => 68719,
1654
+ :ram => 137438,
1173
1655
  :disk => 600,
1174
1656
  :ebs_optimized_available => true,
1175
1657
  :instance_store_volumes => 2
1176
1658
  },
1177
1659
  {
1178
- :id => "m5d.12xlarge",
1179
- :name => "M5d Twelve Extra Large",
1660
+ :id => "r5dn.8xlarge",
1661
+ :name => "R5dn Octuple Extra Large",
1180
1662
  :bits => 64,
1181
- :cores => 48,
1182
- :ram => 206158,
1183
- :disk => 1800,
1663
+ :cores => 32,
1664
+ :ram => 274878,
1665
+ :disk => 1200,
1184
1666
  :ebs_optimized_available => true,
1185
1667
  :instance_store_volumes => 2
1186
1668
  },
1187
1669
  {
1188
- :id => "m5d.24xlarge",
1189
- :name => "M5d Twenty Four Extra Large",
1670
+ :id => "r5dn.12xlarge",
1671
+ :name => "R5dn Twelve Extra Large",
1190
1672
  :bits => 64,
1191
- :cores => 96,
1673
+ :cores => 48,
1192
1674
  :ram => 412316,
1193
- :disk => 3600,
1675
+ :disk => 1800,
1676
+ :ebs_optimized_available => true,
1677
+ :instance_store_volumes => 2
1678
+ },
1679
+ {
1680
+ :id => "r5dn.16xlarge",
1681
+ :name => "R5dn Sixteen Extra Large",
1682
+ :bits => 64,
1683
+ :cores => 64,
1684
+ :ram => 549756,
1685
+ :disk => 2400,
1686
+ :ebs_optimized_available => true,
1687
+ :instance_store_volumes => 4
1688
+ },
1689
+ {
1690
+ :id => "r5dn.24xlarge",
1691
+ :name => "R5dn Twenty Four Extra Large",
1692
+ :bits => 64,
1693
+ :cores => 96,
1694
+ :ram => 824633,
1695
+ :disk => 3600,
1696
+ :ebs_optimized_available => true,
1697
+ :instance_store_volumes => 4
1698
+ },
1699
+ {
1700
+ :id => "x1.16xlarge",
1701
+ :name => "X1 Sixteen Extra Large",
1702
+ :bits => 64,
1703
+ :cores => 64,
1704
+ :ram => 1047972,
1705
+ :disk => 1920,
1706
+ :ebs_optimized_available => true,
1707
+ :instance_store_volumes => 1
1708
+ },
1709
+ {
1710
+ :id => "x1.32xlarge",
1711
+ :name => "X1 Thirty-two Extra Large",
1712
+ :bits => 64,
1713
+ :cores => 128,
1714
+ :ram => 2095944,
1715
+ :disk => 3840,
1716
+ :ebs_optimized_available => true,
1717
+ :instance_store_volumes => 2
1718
+ },
1719
+ {
1720
+ :id => "x1e.xlarge",
1721
+ :name => "X1e Extra Large",
1722
+ :bits => 64,
1723
+ :cores => 4,
1724
+ :ram => 130997,
1725
+ :disk => 120,
1726
+ :ebs_optimized_available => true,
1727
+ :instance_store_volumes => 1
1728
+ },
1729
+ {
1730
+ :id => "x1e.2xlarge",
1731
+ :name => "X1e Double Extra Large",
1732
+ :bits => 64,
1733
+ :cores => 8,
1734
+ :ram => 261993,
1735
+ :disk => 240,
1736
+ :ebs_optimized_available => true,
1737
+ :instance_store_volumes => 1
1738
+ },
1739
+ {
1740
+ :id => "x1e.4xlarge",
1741
+ :name => "X1e Quadruple Extra Large",
1742
+ :bits => 64,
1743
+ :cores => 16,
1744
+ :ram => 523986,
1745
+ :disk => 480,
1746
+ :ebs_optimized_available => true,
1747
+ :instance_store_volumes => 1
1748
+ },
1749
+ {
1750
+ :id => "x1e.8xlarge",
1751
+ :name => "X1e Octuple Extra Large",
1752
+ :bits => 64,
1753
+ :cores => 32,
1754
+ :ram => 1043677,
1755
+ :disk => 960,
1756
+ :ebs_optimized_available => true,
1757
+ :instance_store_volumes => 1
1758
+ },
1759
+ {
1760
+ :id => "x1e.16xlarge",
1761
+ :name => "X1e Sixteen Extra Large",
1762
+ :bits => 64,
1763
+ :cores => 64,
1764
+ :ram => 2095944,
1765
+ :disk => 1920,
1766
+ :ebs_optimized_available => true,
1767
+ :instance_store_volumes => 1
1768
+ },
1769
+ {
1770
+ :id => "x1e.32xlarge",
1771
+ :name => "X1e Thirty-two Extra Large",
1772
+ :bits => 64,
1773
+ :cores => 128,
1774
+ :ram => 3118147,
1775
+ :disk => 3840,
1776
+ :ebs_optimized_available => true,
1777
+ :instance_store_volumes => 2
1778
+ },
1779
+ {
1780
+ :id => "u-6tb1.metal",
1781
+ :name => "U 6TB Metal",
1782
+ :bits => 64,
1783
+ :cores => 448,
1784
+ :ram => 6597071,
1785
+ :disk => 0,
1786
+ :ebs_optimized_available => true,
1787
+ :instance_store_volumes => 0
1788
+ },
1789
+ {
1790
+ :id => "u-9tb1.metal",
1791
+ :name => "U 9 TB Metal",
1792
+ :bits => 64,
1793
+ :cores => 448,
1794
+ :ram => 9895606,
1795
+ :disk => 0,
1796
+ :ebs_optimized_available => true,
1797
+ :instance_store_volumes => 0
1798
+ },
1799
+ {
1800
+ :id => "u-12tb1.metal",
1801
+ :name => "U 12 TB Metal",
1802
+ :bits => 64,
1803
+ :cores => 448,
1804
+ :ram => 13194141,
1805
+ :disk => 0,
1806
+ :ebs_optimized_available => true,
1807
+ :instance_store_volumes => 0
1808
+ },
1809
+ {
1810
+ :id => "u-18tb1.metal",
1811
+ :name => "U 18 TB Metal",
1812
+ :bits => 64,
1813
+ :cores => 448,
1814
+ :ram => 19791212,
1815
+ :disk => 0,
1816
+ :ebs_optimized_available => true,
1817
+ :instance_store_volumes => 0
1818
+ },
1819
+ {
1820
+ :id => "u-24tb1.metal",
1821
+ :name => "U 24 TB Metal",
1822
+ :bits => 64,
1823
+ :cores => 448,
1824
+ :ram => 26388283,
1825
+ :disk => 0,
1826
+ :ebs_optimized_available => true,
1827
+ :instance_store_volumes => 0
1828
+ },
1829
+ {
1830
+ :id => "z1d.large",
1831
+ :name => "Z1d Large",
1832
+ :bits => 64,
1833
+ :cores => 2,
1834
+ :ram => 17180,
1835
+ :disk => 75,
1836
+ :ebs_optimized_available => true,
1837
+ :instance_store_volumes => 1
1838
+ },
1839
+ {
1840
+ :id => "z1d.xlarge",
1841
+ :name => "Z1d Extra Large",
1842
+ :bits => 64,
1843
+ :cores => 4,
1844
+ :ram => 34359,
1845
+ :disk => 150,
1846
+ :ebs_optimized_available => true,
1847
+ :instance_store_volumes => 1
1848
+ },
1849
+ {
1850
+ :id => "z1d.2xlarge",
1851
+ :name => "Z1d Double Extra Large",
1852
+ :bits => 64,
1853
+ :cores => 8,
1854
+ :ram => 68719,
1855
+ :disk => 300,
1856
+ :ebs_optimized_available => true,
1857
+ :instance_store_volumes => 1
1858
+ },
1859
+ {
1860
+ :id => "z1d.3xlarge",
1861
+ :name => "Z1d Triple Extra Large",
1862
+ :bits => 64,
1863
+ :cores => 12,
1864
+ :ram => 103079,
1865
+ :disk => 450,
1866
+ :ebs_optimized_available => true,
1867
+ :instance_store_volumes => 1
1868
+ },
1869
+ {
1870
+ :id => "z1d.6xlarge",
1871
+ :name => "Z1d Sextuple Large",
1872
+ :bits => 64,
1873
+ :cores => 24,
1874
+ :ram => 206158,
1875
+ :disk => 900,
1876
+ :ebs_optimized_available => true,
1877
+ :instance_store_volumes => 1
1878
+ },
1879
+ {
1880
+ :id => "z1d.12xlarge",
1881
+ :name => "Z1d Twelve Extra Large",
1882
+ :bits => 64,
1883
+ :cores => 48,
1884
+ :ram => 412316,
1885
+ :disk => 1800,
1886
+ :ebs_optimized_available => true,
1887
+ :instance_store_volumes => 2
1888
+ },
1889
+ {
1890
+ :id => "z1d.metal",
1891
+ :name => "Z1d Metal",
1892
+ :bits => 64,
1893
+ :cores => 48,
1894
+ :ram => 412316,
1895
+ :disk => 1800,
1896
+ :ebs_optimized_available => true,
1897
+ :instance_store_volumes => 2
1898
+ },
1899
+ {
1900
+ :id => "d2.xlarge",
1901
+ :name => "D2 Extra Large",
1902
+ :bits => 64,
1903
+ :cores => 4,
1904
+ :ram => 32749,
1905
+ :disk => 6000,
1906
+ :ebs_optimized_available => true,
1907
+ :instance_store_volumes => 3
1908
+ },
1909
+ {
1910
+ :id => "d2.2xlarge",
1911
+ :name => "D2 Double Extra Large",
1912
+ :bits => 64,
1913
+ :cores => 8,
1914
+ :ram => 65498,
1915
+ :disk => 12000,
1916
+ :ebs_optimized_available => true,
1917
+ :instance_store_volumes => 6
1918
+ },
1919
+ {
1920
+ :id => "d2.4xlarge",
1921
+ :name => "D2 Quadruple Extra Large",
1922
+ :bits => 64,
1923
+ :cores => 16,
1924
+ :ram => 130996,
1925
+ :disk => 24000,
1926
+ :ebs_optimized_available => true,
1927
+ :instance_store_volumes => 12
1928
+ },
1929
+ {
1930
+ :id => "d2.8xlarge",
1931
+ :name => "D2 Eight Extra Large",
1932
+ :bits => 64,
1933
+ :cores => 36,
1934
+ :ram => 261993,
1935
+ :disk => 48000,
1936
+ :ebs_optimized_available => true,
1937
+ :instance_store_volumes => 24
1938
+ },
1939
+ {
1940
+ :id => "h1.2xlarge",
1941
+ :name => "H1 Double Extra Large",
1942
+ :bits => 64,
1943
+ :cores => 8,
1944
+ :ram => 34360,
1945
+ :disk => 2000,
1946
+ :ebs_optimized_available => true,
1947
+ :instance_store_volumes => 1
1948
+ },
1949
+ {
1950
+ :id => "h1.4xlarge",
1951
+ :name => "H1 Quadruple Extra Large",
1952
+ :bits => 64,
1953
+ :cores => 16,
1954
+ :ram => 68719,
1955
+ :disk => 4000,
1956
+ :ebs_optimized_available => true,
1957
+ :instance_store_volumes => 2
1958
+ },
1959
+ {
1960
+ :id => "h1.8xlarge",
1961
+ :name => "H1 Octuple Extra Large",
1962
+ :bits => 64,
1963
+ :cores => 32,
1964
+ :ram => 137439,
1965
+ :disk => 8000,
1966
+ :ebs_optimized_available => true,
1967
+ :instance_store_volumes => 4
1968
+ },
1969
+ {
1970
+ :id => "h1.16xlarge",
1971
+ :name => "H1 Sixteen Extra Large",
1972
+ :bits => 64,
1973
+ :cores => 64,
1974
+ :ram => 274878,
1975
+ :disk => 16000,
1976
+ :ebs_optimized_available => true,
1977
+ :instance_store_volumes => 8
1978
+ },
1979
+ {
1980
+ :id => "m4.large",
1981
+ :name => "M4 Large",
1982
+ :bits => 64,
1983
+ :cores => 2,
1984
+ :ram => 8589,
1985
+ :disk => 0,
1986
+ :ebs_optimized_available => true,
1987
+ :instance_store_volumes => 0
1988
+ },
1989
+ {
1990
+ :id => "m4.xlarge",
1991
+ :name => "M4 Extra Large",
1992
+ :bits => 64,
1993
+ :cores => 4,
1994
+ :ram => 17179,
1995
+ :disk => 0,
1996
+ :ebs_optimized_available => true,
1997
+ :instance_store_volumes => 0
1998
+ },
1999
+ {
2000
+ :id => "m4.2xlarge",
2001
+ :name => "M4 Double Extra Large",
2002
+ :bits => 64,
2003
+ :cores => 8,
2004
+ :ram => 34359,
2005
+ :disk => 0,
2006
+ :ebs_optimized_available => true,
2007
+ :instance_store_volumes => 0
2008
+ },
2009
+ {
2010
+ :id => "m4.4xlarge",
2011
+ :name => "M4 Quadruple Extra Large",
2012
+ :bits => 64,
2013
+ :cores => 16,
2014
+ :ram => 68719,
2015
+ :disk => 0,
2016
+ :ebs_optimized_available => true,
2017
+ :instance_store_volumes => 0
2018
+ },
2019
+ {
2020
+ :id => "m4.10xlarge",
2021
+ :name => "M4 Ten Extra Large",
2022
+ :bits => 64,
2023
+ :cores => 40,
2024
+ :ram => 171798,
2025
+ :disk => 0,
2026
+ :ebs_optimized_available => true,
2027
+ :instance_store_volumes => 0
2028
+ },
2029
+ {
2030
+ :id => "m4.16xlarge",
2031
+ :name => "M4 Sixteen Extra Large",
2032
+ :bits => 64,
2033
+ :cores => 64,
2034
+ :ram => 262144,
2035
+ :disk => 0,
2036
+ :ebs_optimized_available => true,
2037
+ :instance_store_volumes => 0
2038
+ },
2039
+ {
2040
+ :id => "m5.large",
2041
+ :name => "M5 Large",
2042
+ :bits => 64,
2043
+ :cores => 2,
2044
+ :ram => 8589,
2045
+ :disk => 0,
2046
+ :ebs_optimized_available => true,
2047
+ :instance_store_volumes => 0
2048
+ },
2049
+ {
2050
+ :id => "m5.xlarge",
2051
+ :name => "M5 Extra Large",
2052
+ :bits => 64,
2053
+ :cores => 4,
2054
+ :ram => 17179,
2055
+ :disk => 0,
2056
+ :ebs_optimized_available => true,
2057
+ :instance_store_volumes => 0
2058
+ },
2059
+ {
2060
+ :id => "m5.2xlarge",
2061
+ :name => "M5 Double Extra Large",
2062
+ :bits => 64,
2063
+ :cores => 8,
2064
+ :ram => 34359,
2065
+ :disk => 0,
2066
+ :ebs_optimized_available => true,
2067
+ :instance_store_volumes => 0
2068
+ },
2069
+ {
2070
+ :id => "m5.4xlarge",
2071
+ :name => "M5 Quadruple Extra Large",
2072
+ :bits => 64,
2073
+ :cores => 16,
2074
+ :ram => 68719,
2075
+ :disk => 0,
2076
+ :ebs_optimized_available => true,
2077
+ :instance_store_volumes => 0
2078
+ },
2079
+ {
2080
+ :id => "m5.8xlarge",
2081
+ :name => "M5 Octuple Extra Large",
2082
+ :bits => 64,
2083
+ :cores => 32,
2084
+ :ram => 137439,
2085
+ :disk => 0,
2086
+ :ebs_optimized_available => true,
2087
+ :instance_store_volumes => 0
2088
+ },
2089
+ {
2090
+ :id => "m5.12xlarge",
2091
+ :name => "M5 Twelve Extra Large",
2092
+ :bits => 64,
2093
+ :cores => 48,
2094
+ :ram => 206158,
2095
+ :disk => 0,
2096
+ :ebs_optimized_available => true,
2097
+ :instance_store_volumes => 0
2098
+ },
2099
+ {
2100
+ :id => "m5.16xlarge",
2101
+ :name => "M5 Sixteen Extra Large",
2102
+ :bits => 64,
2103
+ :cores => 64,
2104
+ :ram => 274878,
2105
+ :disk => 0,
2106
+ :ebs_optimized_available => true,
2107
+ :instance_store_volumes => 0
2108
+ },
2109
+ {
2110
+ :id => "m5.24xlarge",
2111
+ :name => "M5 Twenty Four Extra Large",
2112
+ :bits => 64,
2113
+ :cores => 96,
2114
+ :ram => 412316,
2115
+ :disk => 0,
2116
+ :ebs_optimized_available => true,
2117
+ :instance_store_volumes => 0
2118
+ },
2119
+ {
2120
+ :id => "m5.metal",
2121
+ :name => "M5 Metal",
2122
+ :bits => 64,
2123
+ :cores => 96,
2124
+ :ram => 412316,
2125
+ :disk => 0,
2126
+ :ebs_optimized_available => true,
2127
+ :instance_store_volumes => 0
2128
+ },
2129
+ {
2130
+ :id => "m5d.large",
2131
+ :name => "M5d Large",
2132
+ :bits => 64,
2133
+ :cores => 2,
2134
+ :ram => 8589,
2135
+ :disk => 75,
2136
+ :ebs_optimized_available => true,
2137
+ :instance_store_volumes => 1
2138
+ },
2139
+ {
2140
+ :id => "m5d.xlarge",
2141
+ :name => "M5d Extra Large",
2142
+ :bits => 64,
2143
+ :cores => 4,
2144
+ :ram => 17179,
2145
+ :disk => 150,
2146
+ :ebs_optimized_available => true,
2147
+ :instance_store_volumes => 1
2148
+ },
2149
+ {
2150
+ :id => "m5d.2xlarge",
2151
+ :name => "M5d Double Extra Large",
2152
+ :bits => 64,
2153
+ :cores => 8,
2154
+ :ram => 34359,
2155
+ :disk => 300,
2156
+ :ebs_optimized_available => true,
2157
+ :instance_store_volumes => 1
2158
+ },
2159
+ {
2160
+ :id => "m5d.4xlarge",
2161
+ :name => "M5d Quadruple Extra Large",
2162
+ :bits => 64,
2163
+ :cores => 16,
2164
+ :ram => 68719,
2165
+ :disk => 600,
2166
+ :ebs_optimized_available => true,
2167
+ :instance_store_volumes => 2
2168
+ },
2169
+ {
2170
+ :id => "m5d.8xlarge",
2171
+ :name => "M5d Octuple Extra Large",
2172
+ :bits => 64,
2173
+ :cores => 32,
2174
+ :ram => 137439,
2175
+ :disk => 1200,
2176
+ :ebs_optimized_available => true,
2177
+ :instance_store_volumes => 2
2178
+ },
2179
+ {
2180
+ :id => "m5d.12xlarge",
2181
+ :name => "M5d Twelve Extra Large",
2182
+ :bits => 64,
2183
+ :cores => 48,
2184
+ :ram => 206158,
2185
+ :disk => 1800,
2186
+ :ebs_optimized_available => true,
2187
+ :instance_store_volumes => 2
2188
+ },
2189
+ {
2190
+ :id => "m5d.16xlarge",
2191
+ :name => "M5d Sixteen Extra Large",
2192
+ :bits => 64,
2193
+ :cores => 64,
2194
+ :ram => 274878,
2195
+ :disk => 2400,
2196
+ :ebs_optimized_available => true,
2197
+ :instance_store_volumes => 4
2198
+ },
2199
+ {
2200
+ :id => "m5d.24xlarge",
2201
+ :name => "M5d Twenty Four Extra Large",
2202
+ :bits => 64,
2203
+ :cores => 96,
2204
+ :ram => 412316,
2205
+ :disk => 3600,
2206
+ :ebs_optimized_available => true,
2207
+ :instance_store_volumes => 4
2208
+ },
2209
+ {
2210
+ :id => "m5d.metal",
2211
+ :name => "M5d Metal",
2212
+ :bits => 64,
2213
+ :cores => 96,
2214
+ :ram => 412316,
2215
+ :disk => 3600,
1194
2216
  :ebs_optimized_available => true,
1195
2217
  :instance_store_volumes => 4
1196
2218
  },
1197
2219
  {
1198
- :id => "m5a.large",
1199
- :name => "M5 (AMD) Large",
2220
+ :id => "m5a.large",
2221
+ :name => "M5 (AMD) Large",
2222
+ :bits => 64,
2223
+ :cores => 2,
2224
+ :ram => 8589,
2225
+ :disk => 0,
2226
+ :ebs_optimized_available => true,
2227
+ :instance_store_volumes => 0
2228
+ },
2229
+ {
2230
+ :id => "m5a.xlarge",
2231
+ :name => "M5 (AMD) Extra Large",
2232
+ :bits => 64,
2233
+ :cores => 4,
2234
+ :ram => 17179,
2235
+ :disk => 0,
2236
+ :ebs_optimized_available => true,
2237
+ :instance_store_volumes => 0
2238
+ },
2239
+ {
2240
+ :id => "m5a.2xlarge",
2241
+ :name => "M5 (AMD) Double Extra Large",
2242
+ :bits => 64,
2243
+ :cores => 8,
2244
+ :ram => 34359,
2245
+ :disk => 0,
2246
+ :ebs_optimized_available => true,
2247
+ :instance_store_volumes => 0
2248
+ },
2249
+ {
2250
+ :id => "m5a.4xlarge",
2251
+ :name => "M5 (AMD) Quadruple Extra Large",
2252
+ :bits => 64,
2253
+ :cores => 16,
2254
+ :ram => 68719,
2255
+ :disk => 0,
2256
+ :ebs_optimized_available => true,
2257
+ :instance_store_volumes => 0
2258
+ },
2259
+ {
2260
+ :id => "m5a.8xlarge",
2261
+ :name => "M5 (AMD) Eight Extra Large",
2262
+ :bits => 64,
2263
+ :cores => 32,
2264
+ :ram => 137438,
2265
+ :disk => 0,
2266
+ :ebs_optimized_available => true,
2267
+ :instance_store_volumes => 0
2268
+ },
2269
+ {
2270
+ :id => "m5a.12xlarge",
2271
+ :name => "M5 (AMD) Twelve Extra Large",
2272
+ :bits => 64,
2273
+ :cores => 48,
2274
+ :ram => 206158,
2275
+ :disk => 0,
2276
+ :ebs_optimized_available => true,
2277
+ :instance_store_volumes => 0
2278
+ },
2279
+ {
2280
+ :id => "m5a.16xlarge",
2281
+ :name => "M5 (AMD) Sixteen Extra Large",
2282
+ :bits => 64,
2283
+ :cores => 32,
2284
+ :ram => 274877,
2285
+ :disk => 0,
2286
+ :ebs_optimized_available => true,
2287
+ :instance_store_volumes => 0
2288
+ },
2289
+ {
2290
+ :id => "m5a.24xlarge",
2291
+ :name => "M5 (AMD) Twenty Four Extra Large",
2292
+ :bits => 64,
2293
+ :cores => 96,
2294
+ :ram => 412316,
2295
+ :disk => 0,
2296
+ :ebs_optimized_available => true,
2297
+ :instance_store_volumes => 0
2298
+ },
2299
+ {
2300
+ :id => "m5ad.large",
2301
+ :name => "M5ad (AMD) Large",
1200
2302
  :bits => 64,
1201
2303
  :cores => 2,
1202
2304
  :ram => 8589,
1203
- :disk => 0,
2305
+ :disk => 75,
1204
2306
  :ebs_optimized_available => true,
1205
2307
  :instance_store_volumes => 0
1206
2308
  },
1207
2309
  {
1208
- :id => "m5a.xlarge",
1209
- :name => "M5 (AMD) Extra Large",
2310
+ :id => "m5ad.xlarge",
2311
+ :name => "M5ad (AMD) Extra Large",
1210
2312
  :bits => 64,
1211
2313
  :cores => 4,
1212
2314
  :ram => 17179,
1213
- :disk => 0,
2315
+ :disk => 150,
1214
2316
  :ebs_optimized_available => true,
1215
2317
  :instance_store_volumes => 0
1216
2318
  },
1217
2319
  {
1218
- :id => "m5a.2xlarge",
1219
- :name => "M5 (AMD) Double Extra Large",
2320
+ :id => "m5ad.2xlarge",
2321
+ :name => "M5ad (AMD) Double Extra Large",
1220
2322
  :bits => 64,
1221
2323
  :cores => 8,
1222
2324
  :ram => 34359,
2325
+ :disk => 300,
2326
+ :ebs_optimized_available => true,
2327
+ :instance_store_volumes => 0
2328
+ },
2329
+ {
2330
+ :id => "m5ad.4xlarge",
2331
+ :name => "M5ad (AMD) Quadruple Extra Large",
2332
+ :bits => 64,
2333
+ :cores => 16,
2334
+ :ram => 68719,
2335
+ :disk => 600,
2336
+ :ebs_optimized_available => true,
2337
+ :instance_store_volumes => 0
2338
+ },
2339
+ {
2340
+ :id => "m5ad.12xlarge",
2341
+ :name => "M5ad (AMD) Twelve Extra Large",
2342
+ :bits => 64,
2343
+ :cores => 48,
2344
+ :ram => 206158,
2345
+ :disk => 1800,
2346
+ :ebs_optimized_available => true,
2347
+ :instance_store_volumes => 0
2348
+ },
2349
+ {
2350
+ :id => "m5ad.24xlarge",
2351
+ :name => "M5ad (AMD) Twenty-four Extra Large",
2352
+ :bits => 64,
2353
+ :cores => 96,
2354
+ :ram => 412316,
2355
+ :disk => 3600,
2356
+ :ebs_optimized_available => true,
2357
+ :instance_store_volumes => 0
2358
+ },
2359
+ {
2360
+ :id => "m5n.large",
2361
+ :name => "M5n Large",
2362
+ :bits => 64,
2363
+ :cores => 2,
2364
+ :ram => 8590,
1223
2365
  :disk => 0,
1224
2366
  :ebs_optimized_available => true,
1225
2367
  :instance_store_volumes => 0
1226
2368
  },
1227
2369
  {
1228
- :id => "m5a.4xlarge",
1229
- :name => "M5 (AMD) Quadruple Extra Large",
2370
+ :id => "m5n.xlarge",
2371
+ :name => "M5n Extra Large",
2372
+ :bits => 64,
2373
+ :cores => 4,
2374
+ :ram => 17180,
2375
+ :disk => 0,
2376
+ :ebs_optimized_available => true,
2377
+ :instance_store_volumes => 0
2378
+ },
2379
+ {
2380
+ :id => "m5n.2xlarge",
2381
+ :name => "M5n Double Extra Large",
2382
+ :bits => 64,
2383
+ :cores => 8,
2384
+ :ram => 34360,
2385
+ :disk => 0,
2386
+ :ebs_optimized_available => true,
2387
+ :instance_store_volumes => 0
2388
+ },
2389
+ {
2390
+ :id => "m5n.4xlarge",
2391
+ :name => "M5n Quadruple Extra Large",
1230
2392
  :bits => 64,
1231
2393
  :cores => 16,
1232
2394
  :ram => 68719,
@@ -1235,8 +2397,18 @@ module Fog
1235
2397
  :instance_store_volumes => 0
1236
2398
  },
1237
2399
  {
1238
- :id => "m5a.12xlarge",
1239
- :name => "M5 (AMD) Twelve Extra Large",
2400
+ :id => "m5n.8xlarge",
2401
+ :name => "M5n Octuple Extra Large",
2402
+ :bits => 64,
2403
+ :cores => 32,
2404
+ :ram => 137439,
2405
+ :disk => 0,
2406
+ :ebs_optimized_available => true,
2407
+ :instance_store_volumes => 0
2408
+ },
2409
+ {
2410
+ :id => "m5n.12xlarge",
2411
+ :name => "M5n Twelve Extra Large",
1240
2412
  :bits => 64,
1241
2413
  :cores => 48,
1242
2414
  :ram => 206158,
@@ -1245,15 +2417,105 @@ module Fog
1245
2417
  :instance_store_volumes => 0
1246
2418
  },
1247
2419
  {
1248
- :id => "m5a.24xlarge",
1249
- :name => "M5 (AMD) Twenty Four Extra Large",
2420
+ :id => "m5n.16xlarge",
2421
+ :name => "M5n Sixteen Extra Large",
2422
+ :bits => 64,
2423
+ :cores => 64,
2424
+ :ram => 274878,
2425
+ :disk => 0,
2426
+ :ebs_optimized_available => true,
2427
+ :instance_store_volumes => 0
2428
+ },
2429
+ {
2430
+ :id => "m5n.24xlarge",
2431
+ :name => "M5n Twenty-Four Extra Large",
1250
2432
  :bits => 64,
1251
2433
  :cores => 96,
1252
- :ram => 412316,
2434
+ :ram => 412317,
1253
2435
  :disk => 0,
1254
2436
  :ebs_optimized_available => true,
1255
2437
  :instance_store_volumes => 0
1256
2438
  },
2439
+ {
2440
+ :id => "m5dn.large",
2441
+ :name => "M5dn Large",
2442
+ :bits => 64,
2443
+ :cores => 2,
2444
+ :ram => 8590,
2445
+ :disk => 75,
2446
+ :ebs_optimized_available => true,
2447
+ :instance_store_volumes => 1
2448
+ },
2449
+ {
2450
+ :id => "m5dn.xlarge",
2451
+ :name => "M5dn Extra Large",
2452
+ :bits => 64,
2453
+ :cores => 4,
2454
+ :ram => 17180,
2455
+ :disk => 150,
2456
+ :ebs_optimized_available => true,
2457
+ :instance_store_volumes => 1
2458
+ },
2459
+ {
2460
+ :id => "m5dn.2xlarge",
2461
+ :name => "M5dn Double Extra Large",
2462
+ :bits => 64,
2463
+ :cores => 8,
2464
+ :ram => 34360,
2465
+ :disk => 300,
2466
+ :ebs_optimized_available => true,
2467
+ :instance_store_volumes => 1
2468
+ },
2469
+ {
2470
+ :id => "m5dn.4xlarge",
2471
+ :name => "M5dn Quadruple Extra Large",
2472
+ :bits => 64,
2473
+ :cores => 16,
2474
+ :ram => 68719,
2475
+ :disk => 600,
2476
+ :ebs_optimized_available => true,
2477
+ :instance_store_volumes => 2
2478
+ },
2479
+ {
2480
+ :id => "m5dn.8xlarge",
2481
+ :name => "M5dn Octuple Extra Large",
2482
+ :bits => 64,
2483
+ :cores => 32,
2484
+ :ram => 137439,
2485
+ :disk => 1200,
2486
+ :ebs_optimized_available => true,
2487
+ :instance_store_volumes => 2
2488
+ },
2489
+ {
2490
+ :id => "m5dn.12xlarge",
2491
+ :name => "M5dn Twelve Extra Large",
2492
+ :bits => 64,
2493
+ :cores => 48,
2494
+ :ram => 206158,
2495
+ :disk => 1800,
2496
+ :ebs_optimized_available => true,
2497
+ :instance_store_volumes => 2
2498
+ },
2499
+ {
2500
+ :id => "m5dn.16xlarge",
2501
+ :name => "M5dn Sixteen Extra Large",
2502
+ :bits => 64,
2503
+ :cores => 64,
2504
+ :ram => 274878,
2505
+ :disk => 2400,
2506
+ :ebs_optimized_available => true,
2507
+ :instance_store_volumes => 4
2508
+ },
2509
+ {
2510
+ :id => "m5dn.24xlarge",
2511
+ :name => "M5dn Twenty-Four Extra Large",
2512
+ :bits => 64,
2513
+ :cores => 96,
2514
+ :ram => 412317,
2515
+ :disk => 3600,
2516
+ :ebs_optimized_available => true,
2517
+ :instance_store_volumes => 4
2518
+ },
1257
2519
  {
1258
2520
  :id => "p2.xlarge",
1259
2521
  :name => "General Purpose GPU Extra Large",
@@ -1314,6 +2576,66 @@ module Fog
1314
2576
  :ebs_optimized_available => true,
1315
2577
  :instance_store_volumes => 0
1316
2578
  },
2579
+ {
2580
+ :id => "p3dn.24xlarge",
2581
+ :name => "Tesla GPU Twenty-four Extra Large",
2582
+ :bits => 64,
2583
+ :cores => 96,
2584
+ :ram => 824634,
2585
+ :disk => 1800,
2586
+ :ebs_optimized_available => true,
2587
+ :instance_store_volumes => 2
2588
+ },
2589
+ {
2590
+ :id => 'inf1.xlarge',
2591
+ :name => 'Inf1 Extra Large',
2592
+ :bits => 64,
2593
+ :cores => 4,
2594
+ :disk => 0,
2595
+ :ram => 8590,
2596
+ :ebs_optimized_available => true,
2597
+ :instance_store_volumes => 0
2598
+ },
2599
+ {
2600
+ :id => 'inf1.2xlarge',
2601
+ :name => 'Inf1 Double xtra Large',
2602
+ :bits => 64,
2603
+ :cores => 8,
2604
+ :disk => 0,
2605
+ :ram => 17180,
2606
+ :ebs_optimized_available => true,
2607
+ :instance_store_volumes => 0
2608
+ },
2609
+ {
2610
+ :id => 'inf1.6xlarge',
2611
+ :name => 'Inf1 Sextuple Extra Large',
2612
+ :bits => 64,
2613
+ :cores => 24,
2614
+ :disk => 0,
2615
+ :ram => 51540,
2616
+ :ebs_optimized_available => true,
2617
+ :instance_store_volumes => 0
2618
+ },
2619
+ {
2620
+ :id => 'inf1.24xlarge',
2621
+ :name => 'Inf1 Twenty-four Extra Large',
2622
+ :bits => 64,
2623
+ :cores => 96,
2624
+ :disk => 0,
2625
+ :ram => 206158,
2626
+ :ebs_optimized_available => true,
2627
+ :instance_store_volumes => 0
2628
+ },
2629
+ {
2630
+ :id => 'g3s.xlarge',
2631
+ :name => 'G3s Extra Large',
2632
+ :bits => 64,
2633
+ :cores => 4,
2634
+ :disk => 0,
2635
+ :ram => 32749,
2636
+ :ebs_optimized_available => true,
2637
+ :instance_store_volumes => 0
2638
+ },
1317
2639
  {
1318
2640
  :id => 'g3.4xlarge',
1319
2641
  :name => 'G3 Quadruple Extra Large',
@@ -1343,6 +2665,106 @@ module Fog
1343
2665
  :ram => 523986,
1344
2666
  :ebs_optimized_available => true,
1345
2667
  :instance_store_volumes => 0
2668
+ },
2669
+ {
2670
+ :id => 'g3dn.xlarge',
2671
+ :name => 'G3dn Extra Large',
2672
+ :bits => 64,
2673
+ :cores => 4,
2674
+ :disk => 125,
2675
+ :ram => 171780,
2676
+ :ebs_optimized_available => true,
2677
+ :instance_store_volumes => 1
2678
+ },
2679
+ {
2680
+ :id => 'g3dn.2xlarge',
2681
+ :name => 'G3dn Double Extra Large',
2682
+ :bits => 64,
2683
+ :cores => 8,
2684
+ :disk => 225,
2685
+ :ram => 34360,
2686
+ :ebs_optimized_available => true,
2687
+ :instance_store_volumes => 1
2688
+ },
2689
+ {
2690
+ :id => 'g3dn.4xlarge',
2691
+ :name => 'G3dn Quadruple Extra Large',
2692
+ :bits => 64,
2693
+ :cores => 16,
2694
+ :disk => 225,
2695
+ :ram => 68719,
2696
+ :ebs_optimized_available => true,
2697
+ :instance_store_volumes => 1
2698
+ },
2699
+ {
2700
+ :id => 'g3dn.8xlarge',
2701
+ :name => 'G3dn Octuple Extra Large',
2702
+ :bits => 64,
2703
+ :cores => 32,
2704
+ :disk => 900,
2705
+ :ram => 137439,
2706
+ :ebs_optimized_available => true,
2707
+ :instance_store_volumes => 1
2708
+ },
2709
+ {
2710
+ :id => 'g3dn.16xlarge',
2711
+ :name => 'G3dn Sixteen Extra Large',
2712
+ :bits => 64,
2713
+ :cores => 64,
2714
+ :disk => 900,
2715
+ :ram => 274878,
2716
+ :ebs_optimized_available => true,
2717
+ :instance_store_volumes => 1
2718
+ },
2719
+ {
2720
+ :id => 'g3dn.12xlarge',
2721
+ :name => 'G3dn Twelve Extra Large (4GPU)',
2722
+ :bits => 64,
2723
+ :cores => 48,
2724
+ :disk => 900,
2725
+ :ram => 206158,
2726
+ :ebs_optimized_available => true,
2727
+ :instance_store_volumes => 1
2728
+ },
2729
+ {
2730
+ :id => 'g3dn.metal',
2731
+ :name => 'G3dn Metal (8GPU)',
2732
+ :bits => 64,
2733
+ :cores => 96,
2734
+ :disk => 1800,
2735
+ :ram => 412317,
2736
+ :ebs_optimized_available => true,
2737
+ :instance_store_volumes => 2
2738
+ },
2739
+ {
2740
+ :id => 'f1.2xlarge',
2741
+ :name => 'F1 Double Extra Large',
2742
+ :bits => 64,
2743
+ :cores => 8,
2744
+ :disk => 470,
2745
+ :ram => 130997,
2746
+ :ebs_optimized_available => true,
2747
+ :instance_store_volumes => 1
2748
+ },
2749
+ {
2750
+ :id => 'f1.4xlarge',
2751
+ :name => 'F1 Quadruple Extra Large',
2752
+ :bits => 64,
2753
+ :cores => 16,
2754
+ :disk => 940,
2755
+ :ram => 261993,
2756
+ :ebs_optimized_available => true,
2757
+ :instance_store_volumes => 1
2758
+ },
2759
+ {
2760
+ :id => 'f1.16xlarge',
2761
+ :name => 'F1 Sixteen Extra Large',
2762
+ :bits => 64,
2763
+ :cores => 64,
2764
+ :disk => 3760,
2765
+ :ram => 1047972,
2766
+ :ebs_optimized_available => true,
2767
+ :instance_store_volumes => 4
1346
2768
  }
1347
2769
  ]
1348
2770