amazon-pricing 0.1.111 → 0.1.112

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzkwN2IyYWEyZWNiMWI5Yjc5OTQ1NWU1ZDdiOWFiODRjYWM4MzU2Ng==
+    NWMwMzgzNThlNDc4N2I3M2M2NDg0Y2M5MWNmZDFiNWNlYjA1ZmIwMw==
   data.tar.gz: !binary |-
-    NmQ0YmQyY2RiMTkyYjcyY2IyMGFiOTFmNDJmNjk2MjQwYzQ1Yzk1OA==
+    YTFjYjM4NWFkMWFjZTkzMzViNThjMzdjMjE0NDkzM2Y0MjE2NmQ2Nw==
 SHA512:
   metadata.gz: !binary |-
-    MWYwZTUwMDNjOTFlNDQzYTcwMzFlZjE2ODM2MjVmNWQwN2IzMzJjMDlhMmUw
-    NDg1YTM3ZDU3NmUzYjBiZGZmYTFiOGJkOGE3Yzk4NDk5YWU1MjI5ZjZmZjU3
-    YzViODJkNGJmZjNhMmQwY2U0Y2I5NTcwNjI4ZWE4Nzk0MTBjZmU=
+    NWY5ZDE5ZGIzM2M3MjIyOTA5MzBmMDBiYmJjNDgxYzdlNzQwYmNkZWJmNWQ1
+    YzYxNWVjMzZhMDE0OGUyMzc0MWMzOWVkZGFkMWQwNGE1Zjc5MzA5OTE3MmY0
+    NzgyNDczZGYyYTk1ODRlOTZjZjEzNjlkYTRjNGZiZDA2NmQ4MDY=
   data.tar.gz: !binary |-
-    ZmRmY2NmMmEyNmY4Mzk2YWY5YjEwMGYxZDljMWVhNDliMWZjZmE1OWJjNDgy
-    ZjZjMTU4MGJjMTc5OTFhZTU5ZjBlMTRkZTkxYTI3YjcxMWI3ZjUzMzRkYWQ0
-    ZTU1NGNiYjU3NmIwNTVjMThiNWFkYmQ3NDczYjQxNTEzM2U1ZGY=
+    NDg0ODcwNDFiODQ0MTNmNTcwMzk2N2U1YjQ1ZWU4YWRjOTZkM2NiNWY1NTEw
+    NGZjYzJhMzZkZDNhNTA5MmZlNTUzZWI0NjBhNGMzYTEzYzY3NzYzMjUzOTkz
+    MTc5YmFhNDg4YjNhYTk4M2Y0NDQwMmUzY2I0ZWMyYTRjOTcwYTA=

data/lib/amazon-pricing/definitions/ec2-instance-type.rb

@@ -304,6 +304,7 @@ module AwsPricing
       'i3.4xlarge' => :ten_gigabit,
       'i3.8xlarge' => :ten_gigabit,
       'i3.large' => :ten_gigabit,
+      'i3.metal' => :twentyfive_gigabit,
       'i3.xlarge' => :ten_gigabit,
       'm1.large' => :moderate,
       'm1.medium' => :moderate,

data/lib/amazon-pricing/definitions/instance-type.rb

@@ -207,6 +207,7 @@ module AwsPricing
       'i3.xlarge' => 'Storage Optimized High I/O Extra Large', 'i3.2xlarge' => 'Storage Optimized High I/O Double Extra Large',
       'i3.4xlarge' => 'Storage Optimized High I/O Quadruple Extra Large', 'i3.8xlarge' => 'Storage Optimized High I/O Extra Large',
       'i3.16xlarge' => 'Storage Optimized High I/O Hextuple Extra Large',
+      'i3.metal' => 'Storage Optimized High I/O Metal',
       'd2.xlarge' => 'Dense Storage Extra Large', 'd2.2xlarge' => 'Dense Storage Double Extra Large', 'd2.4xlarge' => 'Dense Storage Quadruple Extra Large', 'd2.8xlarge' => 'Dense Storage Eight Extra Large',
       'h1.2xlarge' => 'Dense Storage H1 Double Extra Large', 'h1.4xlarge' => 'Dense Storage H1 Quadruple Extra Large', 'h1.8xlarge' => 'Dense Storage H1 Eight Extra Large', 'h1.16xlarge' => 'Dense Storage H1 Hextuple Extra Large',
       'r3.large' => 'Memory Optimized Large', 'r3.xlarge' => 'Memory Optimized Extra Large', 'r3.2xlarge' => 'Memory Optimized Double Extra Large', 'r3.4xlarge' => 'Memory Optimized Quadruple Extra Large', 'r3.8xlarge' => 'Memory Optimized Eight Extra Large',
@@ -250,7 +251,7 @@ module AwsPricing
       'db.t1.micro' => 160,
       'c3.large' => 32, 'c3.xlarge' => 80, 'c3.2xlarge' => 160, 'c3.4xlarge' => 320, 'c3.8xlarge' => 640,
       'i2.xlarge' => 800, 'i2.2xlarge' => 1600, 'i2.4xlarge' => 3200, 'i2.8xlarge' => 6400,
-      'i3.large' => 475, 'i3.xlarge' => 950, 'i3.2xlarge' => 1900, 'i3.4xlarge' => 3800, 'i3.8xlarge' => 7600, 'i3.16xlarge' => 15200,
+      'i3.large' => 475, 'i3.xlarge' => 950, 'i3.2xlarge' => 1900, 'i3.4xlarge' => 3800, 'i3.8xlarge' => 7600, 'i3.16xlarge' => 15200, 'i3.metal' => 15200,
       'd2.xlarge' => 6000, 'd2.2xlarge' => 12000, 'd2.4xlarge' => 24000, 'd2.8xlarge' => 48000,
       'h1.2xlarge' => 2000, 'h1.4xlarge' => 4000, 'h1.8xlarge' => 8000, 'h1.16xlarge' => 16000,
       'r3.large' => 32, 'r3.xlarge' => 80, 'r3.2xlarge' => 160, 'r3.4xlarge' => 320, 'r3.8xlarge' => 640,
@@ -285,7 +286,7 @@ module AwsPricing
       'db.t1.micro' => 64,
       'c3.large' => 64, 'c3.xlarge' => 64, 'c3.2xlarge' => 64, 'c3.4xlarge' => 64, 'c3.8xlarge' => 64,
       'i2.large' => 64, 'i2.xlarge' => 64, 'i2.2xlarge' => 64, 'i2.4xlarge' => 64, 'i2.8xlarge' => 64,
-      'i3.large' => 64, 'i3.xlarge' => 64, 'i3.2xlarge' => 64, 'i3.4xlarge' => 64, 'i3.8xlarge' => 64, 'i3.16xlarge' => 64,
+      'i3.large' => 64, 'i3.xlarge' => 64, 'i3.2xlarge' => 64, 'i3.4xlarge' => 64, 'i3.8xlarge' => 64, 'i3.16xlarge' => 64, 'i3.metal' => 64,
       'd2.xlarge' => 64, 'd2.2xlarge' => 64, 'd2.4xlarge' => 64, 'd2.8xlarge' => 64,
       'h1.2xlarge' => 64, 'h1.4xlarge' => 64, 'h1.8xlarge' => 64, 'h1.16xlarge' => 64,
       'r3.large' => 64, 'r3.xlarge' => 64, 'r3.2xlarge' => 64, 'r3.4xlarge' => 64, 'r3.8xlarge' => 64,
@@ -320,7 +321,7 @@ module AwsPricing
       'db.t1.micro' => :ebs,
       'c3.large' => :ssd, 'c3.xlarge' => :ssd, 'c3.2xlarge' => :ssd, 'c3.4xlarge' => :ssd, 'c3.8xlarge' => :ssd,
       'i2.large' => :ssd, 'i2.xlarge' => :ssd, 'i2.2xlarge' => :ssd, 'i2.4xlarge' => :ssd, 'i2.8xlarge' => :ssd,
-      'i3.large' => :ssd, 'i3.xlarge' => :ssd, 'i3.2xlarge' => :ssd, 'i3.4xlarge' => :ssd, 'i3.8xlarge' => :ssd, 'i3.16xlarge' => :ssd,
+      'i3.large' => :ssd, 'i3.xlarge' => :ssd, 'i3.2xlarge' => :ssd, 'i3.4xlarge' => :ssd, 'i3.8xlarge' => :ssd, 'i3.16xlarge' => :ssd, 'i3.metal' => :ssd,
       'd2.xlarge' => :ephemeral, 'd2.2xlarge' => :ephemeral, 'd2.4xlarge' => :ephemeral, 'd2.8xlarge' => :ephemeral,
       'h1.2xlarge' => :ephemeral, 'h1.4xlarge' => :ephemeral, 'h1.8xlarge' => :ephemeral, 'h1.16xlarge' => :ephemeral,
       'r3.large' => :ssd, 'r3.xlarge' => :ssd, 'r3.2xlarge' => :ssd, 'r3.4xlarge' => :ssd, 'r3.8xlarge' => :ssd,
@@ -471,6 +472,7 @@ module AwsPricing
       'i3.4xlarge'  => [ 437, 16000], # EBSOptimized
       'i3.8xlarge'  => [ 875, 32500], # EBSOptimized
       'i3.16xlarge' => [1750, 65000],	# EBSOptimized
+      'i3.metal'    => [1250, 64000], # EBSOptimized
       'm1.large'  => [ 62, 4000], # EBSOptimized
       'm1.xlarge' => [125, 8000], # EBSOptimized
       'm2.2xlarge' => [ 62, 4000], # EBSOptimized

data/lib/amazon-pricing/ec2-dhi-price-list.rb

@@ -14,7 +14,10 @@ module AwsPricing
 
     protected
 
-    @@OS_TYPES = [ 'linux', 'rhel', 'sles', 'mswin', 'mswinSQL', 'mswinSQLWeb', 'mswinSQLEnterprise' ]
+    @@OS_TYPES = [ 'linux', 'rhel', 'sles', 'mswin', 
+                   'mswinSQL', 'mswinSQLWeb', 'mswinSQLEnterprise',
+                   'linuxSQL', 'linuxSQLWeb', 'linuxSQLEnterprise',
+                 ]
 
     @@CAPACITY_HASH = {
       'c3' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
@@ -33,7 +36,7 @@ module AwsPricing
       'm4' => { "large"=>22, "xlarge"=>11, "2xlarge"=>5, "4xlarge"=>4, "10xlarge"=>1, "16xlarge"=>1 },
       'm5' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1 },
       'i2' => { "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1, "16xlarge"=>1 },
-      'i3' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
+      'i3' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1, "metal"=>1 },
       'x1' => { "16xlarge"=>2, "32xlarge"=>1 },
       'x1e' =>{ "xlarge"=>32, "2xlarge"=>16, "4xlarge"=>8, "8xlarge"=>4, "16xlarge"=>2, "32xlarge"=>1 },
     }

data/lib/amazon-pricing/ec2-di-price-list.rb

@@ -20,7 +20,10 @@ module AwsPricing
         ['mswin', 'windows'],
         ['mswinSQL', 'windows-with-sql-server-standard'],
         ['mswinSQLWeb', 'windows-with-sql-server-web'],
-        ['mswinSQLEnterprise', 'windows-with-sql-server-enterprise']
+        ['mswinSQLEnterprise', 'windows-with-sql-server-enterprise'],
+        ['linuxSQL', 'linux-with-sql-server-standard'],
+        ['linuxSQLWeb', 'linux-with-sql-server-web'],
+        ['linuxSQLEnterprise', 'linux-with-sql-server-enterprise']
     ]
 
     OS_INDEX = 0

data/lib/amazon-pricing/helpers/instance-type.rb

@@ -2,6 +2,8 @@ module AwsPricing
   module Helper
     module InstanceType
 
+      METAL = 'metal'.freeze
+      # the following family sizes should be kept in size order, see #api_name_to_nf below
       @@INSTANCE_TYPES_BY_CLASSIFICATION = {
         'GeneralPurpose' => {
             'CurrentGen' => {
@@ -46,7 +48,7 @@ module AwsPricing
             'CurrentGen' => {
                 'HS1' => ['hs1.8xlarge'],
                 'I2'  => ['i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge'],
-                'I3'  => ['i3.large', 'i3.xlarge', 'i3.2xlarge', 'i3.4xlarge', 'i3.8xlarge', 'i3.16xlarge'],
+                'I3'  => ['i3.large', 'i3.xlarge', 'i3.2xlarge', 'i3.4xlarge', 'i3.8xlarge', 'i3.16xlarge', 'i3.metal'],
                 'D2'  => ['d2.xlarge', 'd2.2xlarge', 'd2.4xlarge', 'd2.8xlarge'],
                 'H1'  => ['h1.2xlarge', 'h1.4xlarge', 'h1.8xlarge', 'h1.16xlarge'],
             },
@@ -155,7 +157,17 @@ module AwsPricing
 
 
       def api_name_to_nf(name)
-        size_to_nf[name.split('.').last]
+        type = name.split('.').last
+        if (type == METAL)
+          # try to get largest size supported for family: presumes METAL is *not* in size_to_nf hash
+          # assumes family_members are sorted by size
+          sizes = family_members(name)
+          type = sizes[-1].split('.').last        # 'metal' defaults to largest size
+          if sizes[-1].split('.').last == METAL
+            type = sizes[-2].split('.').last      # 'metal' already largest, so 2nd largest      
+          end
+        end
+        size_to_nf[type]
       end
 
       # note: the next smaller type may _not_ be supported for a given family
@@ -186,6 +198,7 @@ module AwsPricing
         NF_TO_SIZE_TABLE
       end
 
+      # NB: 'metal' is not in this table (since it's family specific), see #api_name_to_nf
       SIZE_TO_NF_TABLE = {
           "nano"    => 0.25,
           "micro"   => 0.5,
@@ -200,6 +213,7 @@ module AwsPricing
           "10xlarge" => 80,
           "12xlarge" => 96,
           "16xlarge" => 128,
+          "metal"    => 128, # temporary (for _direct_ users of this hash), as only applies to i3.metal
           "18xlarge" => 144,
           "24xlarge" => 192,
           "32xlarge" => 256,

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-VERSION = '0.1.111' # [major,minor.fix]: adding c5d
+VERSION = '0.1.112' # [major,minor.fix]: adding i3.metal, and linuxsql dedicated variants
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.111
+  version: 0.1.112
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: