amazon-pricing 0.1.100 → 0.1.101

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc1ZDRhYTE5ZjIyZDNmNTZhODJjNDljNTE1ZjFhMDQzNWM5MjAwZg==
+    MTU2NDFjMzQyMmJiYWM1ODQ4ZDUyMTY3ODg2MTJiZWNhNmI4ZmM3ZA==
   data.tar.gz: !binary |-
-    NGE4MzQ4NjE2NDNhNWZmNTc5NWEyYTc3MDVhZDM1NzE4MWQ4ZTg5Yg==
+    OWNjODFmZGViN2Q5NjMwYjk3OGE3MWZmZDA4NDk3ZDJlZTJmODZjZA==
 SHA512:
   metadata.gz: !binary |-
-    N2ZlNWY5MTVkN2MyZGYyNDRhM2I2ZTM0NzY3OGZhZTg3ZDA2ODg1Zjk5Mzk0
-    Mjk5YzdhZjM5ZGJjNjIzNDE0ZWQzMzZkYWQ3NmEyZWUwMDk0ZmNkYjZiODFi
-    ZThhNTU0YWY2NjkyMzVhOWY5NjJjNjJmZmMzMzhlZGVhZjA4ZGU=
+    YTc2ODc0OTgyY2UyYjlkYjg1OWYyNDZmOTZmYjRjMmEzOGQwOWVmNjRmYWU4
+    NWQ0M2U5NWY5NmZmZTRiNDY0ODYzMWE1OGVhMzJhMDdjY2U1YmY0ZGMwNGYx
+    Mjk1NmE5MGI3YTg4ODZlNjQ4N2FjZTI4ODgxZTVjMzI1NTdlOWU=
   data.tar.gz: !binary |-
-    NTgzZDljNTVmYWFhMjJkYWZiOWM4MGIyZmQwZjkxY2FlMzk5NjhiNzY2YWY4
-    NzBkNjJjMTVkYmZjNTBhOWRiMzBhYmFlYjRiMjhiZDA5YzQyOGYzNTQ4Nzcw
-    NTA1OGZiMmU0YmQzNzNmMmYyMzExMmI2YjRhYjExYzBkMDljZGU=
+    MWFjZTE0ZTY4Mzk5NGY3YmY5MDJiODYwZDNjMjM2NjA0ODllZDA4YmZjZWVj
+    ZjY1N2EyOTRkN2MyY2NjNjhhZTQ5YTlmN2MzM2JkZDFmODE4Yjg0NGRiYWQ4
+    NjkzYzk5NjliZTBhOTI2NGFjNWY3YWI3YzE0MTEzYzgyOGQzNDE=

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

@@ -171,7 +171,7 @@ module AwsPricing
         :high => 1000,
         :ten_gigabit => 10000,
         :twenty_gigabit => 20000,
-        :twentyfive_gigabit => 25000,
+        :twentyfive_gigabit => 25000, # presumes ENA
     }
 
     # handy summary here: www.ec2instances.info
@@ -188,6 +188,12 @@ module AwsPricing
       'c4.8xlarge' => :ten_gigabit,
       'c4.large' => :moderate,
       'c4.xlarge' => :high,
+      'c5.18xlarge' => :twentyfive_gigabit,
+      'c5.2xlarge' => :ten_gigabit, # upto 10G
+      'c5.4xlarge' => :ten_gigabit, # upto 10G
+      'c5.9xlarge' => :ten_gigabit,
+      'c5.large' => :ten_gigabit,   # upto 10G
+      'c5.xlarge' => :ten_gigabit,  # upto 10G
       'cache.c1.xlarge' => :high,
       'cache.m1.large' => :moderate,
       'cache.m1.medium' => :moderate,

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

@@ -206,7 +206,10 @@ module AwsPricing
         'r4.8xlarge' => 'Memory Optimized Eight Extra Large Enterprise', 'r4.16xlarge' => 'Memory Optimized Hextuple Extra Large Enterprise',
       't2.nano' => 'Burstable Performance Instance Nano', 't2.micro' => 'Burstable Performance Instance Micro', 't2.small' => 'Burstable Performance Instance Small', 't2.medium' => 'Burstable Performance Instance Medium', 't2.large' => 'Burstable Performance Instance Large',
         't2.xlarge' => 'Burstable Performance Instance Extra Large', 't2.2xlarge' => 'Burstable Performance Instance Double Extra Large',
-      'c4.large' => 'Compute Optimized Large', 'c4.xlarge' => 'Compute Optimized Extra Large', 'c4.2xlarge' => 'Compute Optimized Double Extra Large', 'c4.4xlarge' => 'Compute Optimized Quadruple Extra Large', 'c4.8xlarge' => 'Compute Optimized Eight Extra Large',
+      'c4.large' => 'Compute Optimized Large', 'c4.xlarge' => 'Compute Optimized Extra Large', 'c4.2xlarge' => 'Compute Optimized Double Extra Large', 'c4.4xlarge' => 'Compute Optimized Quadruple Extra Large',
+        'c4.8xlarge' => 'Compute Optimized Eight Extra Large',
+      'c5.large' => 'Compute Optimized C5 Large', 'c5.xlarge' => 'Compute Optimized C5 Extra Large', 'c5.2xlarge' => 'Compute Optimized C5 Double Extra Large', 'c5.4xlarge' => 'Compute Optimized C5 Quadruple Extra Large',
+        'c5.9xlarge' => 'Compute Optimized C5 Nine Extra Large', 'c5.18xlarge' => 'Compute Optimized C5 Eighteen Extra Large',
       'x1.16xlarge' => 'Memory Optimized Hextuple Large-scale Enterprise-class',
       'x1.32xlarge' => 'Memory Optimized Large-scale Enterprise-class',
       'x1e.32xlarge' => 'Memory Optimized Extended Large-scale Enterprise-class',
@@ -237,6 +240,7 @@ module AwsPricing
       'r4.large' => 0, 'r4.xlarge' => 0, 'r4.2xlarge' => 0, 'r4.4xlarge' => 0, 'r4.8xlarge' => 0, 'r4.16xlarge' => 0,
       't2.nano' => 0, 't2.micro' => 0, 't2.small' => 0, 't2.medium' => 0, 't2.large' => 0, 't2.xlarge' => 0, 't2.2xlarge' => 0,
       'c4.large' => 0, 'c4.xlarge' => 0, 'c4.2xlarge' => 0, 'c4.4xlarge' => 0, 'c4.8xlarge' => 0,
+      'c5.large' => 0, 'c5.xlarge' => 0, 'c5.2xlarge' => 0, 'c5.4xlarge' => 0, 'c5.9xlarge' => 0, 'c5.18xlarge' => 0, # ebs-optimized
       'x1.16xlarge' => 1920, 'x1.32xlarge' => 3840, 'x1e.32xlarge' => 3840,
       'p2.xlarge' => 0, 'p2.8xlarge' => 0, 'p2.16xlarge' => 0,  # ebs-optimized
       'p3.2xlarge' => 0, 'p3.8xlarge' => 0, 'p3.16xlarge' => 0, # ebs-optimized
@@ -267,6 +271,7 @@ module AwsPricing
       'r4.large' => 64, 'r4.xlarge' => 64, 'r4.2xlarge' => 64, 'r4.4xlarge' => 64, 'r4.8xlarge' => 64, 'r4.16xlarge' => 64,
       't2.nano' => 64, 't2.micro' => 64, 't2.small' => 64, 't2.medium' => 64, 't2.large' => 64, 't2.xlarge' => 64, 't2.2xlarge' => 64,
       'c4.large' => 64, 'c4.xlarge' => 64, 'c4.2xlarge' => 64, 'c4.4xlarge' => 64, 'c4.8xlarge' => 64,
+      'c5.large' => 64, 'c5.xlarge' => 64, 'c5.2xlarge' => 64, 'c5.4xlarge' => 64, 'c5.9xlarge' => 64, 'c5.18xlarge' => 64,
       'x1.16xlarge' => 64, 'x1.32xlarge' => 64, 'x1e.32xlarge' => 64,
       'p2.xlarge' => 64, 'p2.8xlarge' => 64, 'p2.16xlarge' => 64,
       'p3.2xlarge' => 64, 'p3.8xlarge' => 64, 'p3.16xlarge' => 64,
@@ -297,6 +302,7 @@ module AwsPricing
       'r4.large' => :ebs, 'r4.xlarge' => :ebs, 'r4.2xlarge' => :ebs, 'r4.4xlarge' => :ebs, 'r4.8xlarge' => :ebs, 'r4.16xlarge' => :ebs,
       't2.nano' => :ebs, 't2.micro' => :ebs, 't2.small' => :ebs, 't2.medium' => :ebs, 't2.large' => :ebs, 't2.xlarge' => :ebs, 't2.2xlarge' => :ebs,
       'c4.large' => :ebs, 'c4.xlarge' => :ebs, 'c4.2xlarge' => :ebs, 'c4.4xlarge' => :ebs, 'c4.8xlarge' => :ebs,
+      'c5.large' => :ebs, 'c5.xlarge' => :ebs, 'c5.2xlarge' => :ebs, 'c5.4xlarge' => :ebs, 'c5.9xlarge' => :ebs, 'c5.18xlarge' => :ebs,
       'x1.16xlarge' => :ssd, 'x1.32xlarge' => :ssd, 'x1e.32xlarge' => :ssd,
       'p2.xlarge' => :ebs, 'p2.8xlarge' => :ebs, 'p2.16xlarge' => :ebs,
       'p3.2xlarge' => :ebs, 'p3.8xlarge' => :ebs, 'p3.16xlarge' => :ebs,
@@ -344,6 +350,12 @@ module AwsPricing
       # c4.8xlarge is EBS-only
       # c4.large is EBS-only
       # c4.xlarge is EBS-only
+      # c5.18xlarge is EBS-only 9 Gbps
+      # c5.2xlarge is EBS-only Up to 2.25 Gbps
+      # c5.4xlarge is EBS-only 2.25 Gbps
+      # c5.9xlarge is EBS-only 4.5 Gbps
+      # c5.large is EBS-only Up to 2.25 Gbps
+      # c5.xlarge is EBS-only Up to 2.25 Gbps
       # cache.c1.xlarge is not picked up by CloudWatch
       # cache.m1.large is not picked up by CloudWatch
       # cache.m1.medium is not picked up by CloudWatch

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

@@ -60,6 +60,7 @@ module AwsPricing
               # hack for now until I can get capacity for fpga instances
               next if family == 'f1'
               if @@CAPACITY_HASH[family].nil?
+                # 2017-11-08 family == 'c5' not supported for DH
                 $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: unable to find CAPACITY_HASH for #{family}"
                 next
               end

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

@@ -20,7 +20,8 @@ module AwsPricing
         'ComputeOptimized' => {
             'CurrentGen' => {
                 'C3' => ['c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge'],
-                'C4' => ['c4.large', 'c4.xlarge', 'c4.2xlarge', 'c4.4xlarge', 'c4.8xlarge']
+                'C4' => ['c4.large', 'c4.xlarge', 'c4.2xlarge', 'c4.4xlarge', 'c4.8xlarge'],
+                'C5' => ['c5.large', 'c5.xlarge', 'c5.2xlarge', 'c5.4xlarge', 'c5.9xlarge', 'c5.18xlarge'],
             },
             'PreviousGen' => {
                 'C1' => ['c1.medium', 'c1.xlarge', 'cc1.4xlarge'],
@@ -154,10 +155,23 @@ module AwsPricing
         size_to_nf[name.split('.').last]
       end
 
+      # note: the next smaller type may _not_ be supported for a given family
+      #  so this returns the next logical/possible smaller type, but not necessarily
+      #  the next valid type
       def next_smaller_type(name)
         fam,type = name.split('.')
-        nf= size_to_nf[type] / 2.0
-        new_type = NF_TO_SIZE_TABLE[nf] || NF_TO_SIZE_TABLE[nf.to_i] # 2.0 and 2 are no same when used as hash keys.
+        orig_nf = size_to_nf[type]
+        return nil unless orig_nf
+        # paranoia: assumes size_to_nf may not be sorted, which we need to step down
+        sorted_size_to_nf = {}
+        size_to_nf.sort_by(&:last).each do |(size,nf)|
+          sorted_size_to_nf[size] = nf
+        end
+        size_keys = sorted_size_to_nf.keys
+        idx = size_keys.index(type)
+        idx = idx -1  if (idx > 0)  # don't go smaller, than smallest
+        nf = sorted_size_to_nf[new_type = size_keys.at(idx)]
+
         ["#{fam}.#{new_type}" , nf]
       end
 
@@ -179,9 +193,11 @@ module AwsPricing
           "2xlarge" => 16,
           "4xlarge" => 32,
           "8xlarge" => 64,
+          "9xlarge" => 72,
           "10xlarge" => 80,
           "16xlarge" => 128,
-          "32xlarge" => 256
+          "18xlarge" => 144,
+          "32xlarge" => 256,
       }
       NF_TO_SIZE_TABLE = SIZE_TO_NF_TABLE.invert
 

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-VERSION = '0.1.100'
+VERSION = '0.1.101' # [major,minor.fix]: c5 instance type returned
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.100
+  version: 0.1.101
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: