amazon-pricing 0.1.86 → 0.1.88

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b7cd664411047b2dbb4bb05fb9c58cc8c62ccbef
-  data.tar.gz: 0ba1f2b457120d634abfa29180d257bf366b6360
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2YyZmQ3OTMwN2Y2MzlmMzU3ODBkMjk2ZDk2ZGY0MTVhMmZkNThhZQ==
+  data.tar.gz: !binary |-
+    MWQxNGFjNDg2YmIyNTlhYmQ0NzA5MjFmNDc1ZTMwYzRiY2UzNzU3ZQ==
 SHA512:
-  metadata.gz: 09f0aa96c3721f16229c6029d82a858a122c8e269e60bf99a1f11b2349d3f161b08e75089a90738d8d266d1e44e06a1540dc628237cf01b08964cb257d7a04f6
-  data.tar.gz: 48a09737ce29b0870ad88640b4e90798658d21dd87ff3676514a6964efb5fdf3c22ef116eca7feed239a0a5dd2a600d6bd16f141e42614f5c5acd7c6159d46a3
+  metadata.gz: !binary |-
+    N2UzMGE4Yjk2NmMzYjdmZmJhNmRlZGZmMzczYTE3ODVjYTQ2YmI4ZmYwYWNl
+    MzZmZmUzNGMxNzY5NzA4Y2I4YjMzYzg3Nzg5ZGFlYmY0MjE2NjJkNDE3MjYx
+    MTQ5ZjA3MGM1NDRjOTYwZmUxMDQ3N2IyZTUwYjhkMzc0YmM5ZTk=
+  data.tar.gz: !binary |-
+    MjBjNWMxNzE0YzQyMzYxMThhZjcxNjQ4ZmJlNjMxMjg2NTc0NzMyMDQ4MWIy
+    MDllZTliMjlmZTgyOTBkZDM0OThjMWJjMzczMjQ3YmIzNDVjZWM5OTBkOWYy
+    YjhmM2FkMDFjYzFjNGE0NjA1MjU4YjQ5OGNiNTM4ZGQ0NGE1MDY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.86)
+    amazon-pricing (0.1.88)
 
 GEM
   remote: https://rubygems.org/

data/lib/amazon-pricing/common/ec2_common.rb

@@ -90,11 +90,16 @@ module AwsPricing
 # see if instance_type is missing; normally fetch_ec2_instance_pricing() adds instance_type and od-pricing;
 # but if there's AWS inconsistency, make sure we add instance_type now.
     def find_or_create_instance_type(region, api_name, operating_system)
+      instance_type = nil
       if not region.instance_type_available?(api_name, :ondemand, operating_system)
-        api_name, name = Ec2InstanceType.get_name("",       #unused
-                                                  api_name,
-                                                  false)    #!:ondemand
-        instance_type = region.add_or_update_ec2_instance_type(api_name, name)
+        begin
+          api_name, name = Ec2InstanceType.get_name("",       #unused
+                                                    api_name,
+                                                    false)    #!:ondemand
+          instance_type = region.add_or_update_ec2_instance_type(api_name, name)
+        rescue UnknownTypeError
+          $stderr.puts "[#{__method__}] WARNING: unknown Ec2InstanceType:#{api_name} ignored"
+        end
       elsif
         instance_type = region.get_ec2_instance_type(api_name)
       end
@@ -130,4 +135,4 @@ module AwsPricing
     end
 
   end
-end
+end

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

@@ -16,7 +16,9 @@ module AwsPricing
       :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year,
       :allupfront_prepay_1_year, :allupfront_prepay_3_year,
       :partialupfront_price_per_hour_1_year, :partialupfront_prepay_1_year, :partialupfront_price_per_hour_3_year, :partialupfront_prepay_3_year,
-      :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year
+      :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year, :convertible_allupfront_prepay_3_year,
+      :convertible_partialupfront_price_per_hour_3_year, :convertible_partialupfront_prepay_3_year,
+      :convertible_noupfront_price_per_hour_3_year
 
     def allupfront_effective_rate_1_year
       (allupfront_prepay_1_year / 365 / 24).round(4)
@@ -78,12 +80,16 @@ module AwsPricing
           @allupfront_prepay_1_year
         elsif term == :year3
           @allupfront_prepay_3_year
+        elsif term == :year3_convertible
+          @convertible_allupfront_prepay_3_year
         end
       when :partialupfront
         if term == :year1
           @partialupfront_prepay_1_year
         elsif term == :year3
           @partialupfront_prepay_3_year
+        elsif term == :year3_convertible
+          @convertible_partialupfront_prepay_3_year
         end
       end
     end
@@ -115,12 +121,16 @@ module AwsPricing
           @allupfront_prepay_1_year = price
         elsif term == :year3
           @allupfront_prepay_3_year = price
+        elsif term == :year3_convertible
+          @convertible_allupfront_prepay_3_year = price
         end
       when :partialupfront
         if term == :year1
           @partialupfront_prepay_1_year = price
         elsif term == :year3
           @partialupfront_prepay_3_year = price
+        elsif term == :year3_convertible
+          @convertible_partialupfront_prepay_3_year = price
         end
       else
         raise "Unable to set prepay for #{instance_type.api_name} : #{name} : #{type_of_instance} : #{term} to #{price}"
@@ -156,12 +166,16 @@ module AwsPricing
           @partialupfront_price_per_hour_1_year
         elsif term == :year3
           @partialupfront_price_per_hour_3_year
+        elsif term == :year3_convertible
+          @convertible_partialupfront_price_per_hour_3_year
         end
       when :noupfront
         if term == :year1
           @noupfront_price_per_hour_1_year
         elsif term == :year3
           @noupfront_price_per_hour_3_year
+        elsif term == :year3_convertible
+          @convertible_noupfront_price_per_hour_3_year
         end
       when :allupfront
         0
@@ -197,12 +211,16 @@ module AwsPricing
           @partialupfront_price_per_hour_1_year = price_per_hour
         elsif term == :year3
           @partialupfront_price_per_hour_3_year = price_per_hour
+        elsif term == :year3_convertible
+          @convertible_partialupfront_price_per_hour_3_year = price_per_hour
         end
       when :noupfront
         if term == :year1
           @noupfront_price_per_hour_1_year = price_per_hour
         elsif term == :year3
           @noupfront_price_per_hour_3_year = price_per_hour
+        elsif term == :year3_convertible
+          @convertible_noupfront_price_per_hour_3_year = price_per_hour
         end
       end
     end

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

@@ -33,8 +33,16 @@ module AwsPricing
       if type_of_instance == :ondemand
         os.set_price_per_hour(type_of_instance, nil, p)
       else
-        years = :year1 if term == "yrTerm1"
-        years = :year3 if term == "yrTerm3"
+        case term
+          when "yrTerm1", "yrTerm1Standard"
+            years = :year1
+          when "yrTerm3", "yrTerm3Standard"
+            years = :year3
+          when "yrTerm3Convertible"
+            years = :year3_convertible
+          else
+            $stderr.puts "[#{__method__}] WARNING: unknown term:#{term} os:#{operating_system},type:#{type_of_instance},prepay:#{is_prepay}"
+        end
         if is_prepay
           os.set_prepay(type_of_instance, years, p)
         else
@@ -65,14 +73,16 @@ module AwsPricing
           price = coerce_price(val['prices']['USD'])
 
           case val["name"]
-          when "yrTerm1"
+          when "yrTerm1", "yrTerm1Standard"
             os.set_prepay(type_of_instance, :year1, price)
-          when "yrTerm3"
+          when "yrTerm3", "yrTerm3Standard"
             os.set_prepay(type_of_instance, :year3, price)
           when "yrTerm1Hourly"
             os.set_price_per_hour(type_of_instance, :year1, price)
           when "yrTerm3Hourly"
             os.set_price_per_hour(type_of_instance, :year3, price)
+          else
+            $stderr.puts "[#{__method__}] WARNING: unknown term:#{val["name"]}"
           end
         end
       end
@@ -143,7 +153,8 @@ module AwsPricing
         :low_to_moderate => 250,
         :moderate => 500,
         :high => 1000,
-        :ten_gigabit => 10000
+        :ten_gigabit => 10000,
+        :twenty_gigabit => 20000,
     }
 
     @Network_Performance = {
@@ -241,11 +252,15 @@ module AwsPricing
       'm3.large' => :moderate,
       'm3.medium' => :moderate,
       'm3.xlarge' => :high,
+      'm4.16xlarge' => :twenty_gigabit,
       'm4.10xlarge' => :ten_gigabit,
       'm4.2xlarge' => :high,
       'm4.4xlarge' => :high,
       'm4.large' => :moderate,
       'm4.xlarge' => :high,
+      'p2.xlarge' =>   :high,
+      'p2.8xlarge' =>  :ten_gigabit,
+      'p2.16xlarge' => :twenty_gigabit,
       'r3.2xlarge' => :high,
       'r3.4xlarge' => :high,
       'r3.8xlarge' => :ten_gigabit,

data/lib/amazon-pricing/definitions/elasticache_node_type.rb

@@ -43,14 +43,16 @@ module AwsPricing
           price = coerce_price(val['prices']['USD'])
 
           case val['name']
-          when "yrTerm1"
+          when "yrTerm1", "yrTerm1Standard"
             cache.set_prepay(type_of_instance, :year1, price)
-          when "yrTerm3"
+          when "yrTerm3", "yrTerm3Standard"
             cache.set_prepay(type_of_instance, :year3, price)
           when "yearTerm1Hourly"
             cache.set_price_per_hour(type_of_instance, :year1, price)
           when "yearTerm3Hourly"
             cache.set_price_per_hour(type_of_instance, :year3, price)
+          else
+            $stderr.puts "[#{__method__}] WARNING: unknown term:#{val["name"]}"
           end
         end
       end

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

@@ -180,7 +180,9 @@ module AwsPricing
       'm1.small' => 'Standard Small', 'm1.medium' => 'Standard Medium', 'm1.large' => 'Standard Large', 'm1.xlarge' => 'Standard Extra Large',
       'm2.xlarge' => 'Hi-Memory Extra Large', 'm2.2xlarge' => 'Hi-Memory Double Extra Large', 'm2.4xlarge' => 'Hi-Memory Quadruple Extra Large',
       'm3.medium' => 'M3 Medium Instance', 'm3.large'=>'M3 Large Instance', 'm3.xlarge' => 'M3 Extra Large Instance', 'm3.2xlarge' => 'M3 Double Extra Large Instance',
-      'm4.large' => 'M4 Large Instance', 'm4.xlarge' => 'M4 Extra Large Instance', 'm4.2xlarge' => 'M4 Double Extra Large Instance', 'm4.4xlarge' => 'M4 Quadruple Extra Large Instance', 'm4.10xlarge' => 'M4 Decuple Extra Large Instance',
+      'm4.large' => 'M4 Large Instance', 'm4.xlarge' => 'M4 Extra Large Instance', 'm4.2xlarge' => 'M4 Double Extra Large Instance',
+      'm4.4xlarge' => 'M4 Quadruple Extra Large Instance', 'm4.10xlarge' => 'M4 Decuple Extra Large Instance',
+      'm4.16xlarge' => 'M4 Hextuple Extra Large Instance',
       'c1.medium' => 'High-CPU Medium', 'c1.xlarge' => 'High-CPU Extra Large',
       'hi1.4xlarge' => 'High I/O Quadruple Extra Large',
       'cg1.4xlarge' => 'Cluster GPU Quadruple Extra Large',
@@ -189,6 +191,7 @@ module AwsPricing
       'cr1.8xlarge' => 'High-Memory Cluster Eight Extra Large',
       'hs1.8xlarge' => 'High-Storage Eight Extra Large',
       'g2.2xlarge' => 'Cluster GPU Double Extra Large', 'g2.8xlarge' => 'Cluster GPU Eight Extra Large',
+      'p2.xlarge' => 'GPU Compute Extra Large', 'p2.8xlarge' => 'GPU Compute Eight Extra Large', 'p2.16xlarge' => 'GPU Compute Hextuple Extra Large',
       'c3.large' => 'High-Compute Large', 'c3.xlarge' => 'High-Compute Extra Large', 'c3.2xlarge' => 'High-Compute Double Extra Large', 'c3.4xlarge' => 'High-Compute Quadruple Extra Large', 'c3.8xlarge' => 'High-Compute Eight Extra Large',
       'i2.xlarge' => 'High I/O Extra Large', 'i2.2xlarge' => 'High I/O Double Extra Large', 'i2.4xlarge' => 'High I/O Quadruple Extra Large', 'i2.8xlarge' => 'High I/O Eight Extra Large',
       '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',
@@ -201,7 +204,7 @@ module AwsPricing
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
       'm2.xlarge' => 420, 'm2.2xlarge' => 850, 'm2.4xlarge' => 1690,
       'm3.medium' => 4, 'm3.large' => 32, 'm3.xlarge' => 80, 'm3.2xlarge' => 160,
-      'm4.large' => 0, 'm4.xlarge' => 0, 'm4.2xlarge' => 0, 'm4.4xlarge' => 0, 'm4.10xlarge' => 0,
+      'm4.large' => 0, 'm4.xlarge' => 0, 'm4.2xlarge' => 0, 'm4.4xlarge' => 0, 'm4.10xlarge' => 0, 'm4.16xlarge' => 0,
       'c1.medium' => 350, 'c1.xlarge' => 1690,
       'hi1.4xlarge' => 2048,
       'cg1.4xlarge' => 1690,
@@ -220,12 +223,13 @@ module AwsPricing
       't2.nano' => 0, 't2.micro' => 0, 't2.small' => 0, 't2.medium' => 0, 't2.large' => 0,
       'c4.large' => 0, 'c4.xlarge' => 0, 'c4.2xlarge' => 0, 'c4.4xlarge' => 0, 'c4.8xlarge' => 0,
       'x1.32xlarge' => 3840,
+      'p2.xlarge' => 0, 'p2.8xlarge' => 0, 'p2.16xlarge' => 0,
     }
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
       'm2.xlarge' => 64, 'm2.2xlarge' => 64, 'm2.4xlarge' => 64,
       'm3.medium' => 64, 'm3.large' => 64, 'm3.xlarge' => 64, 'm3.2xlarge' => 64,
-      'm4.large' => 64, 'm4.xlarge' => 64, 'm4.2xlarge' => 64, 'm4.4xlarge' => 64, 'm4.10xlarge' => 64,
+      'm4.large' => 64, 'm4.xlarge' => 64, 'm4.2xlarge' => 64, 'm4.4xlarge' => 64, 'm4.10xlarge' => 64, 'm4.16xlarge' => 64,
       'c1.medium' => 32, 'c1.xlarge' => 64,
       'hi1.4xlarge' => 64,
       'cg1.4xlarge' => 64,
@@ -244,12 +248,13 @@ module AwsPricing
       't2.nano' => 64, 't2.micro' => 64, 't2.small' => 64, 't2.medium' => 64, 't2.large' => 64,
       'c4.large' => 64, 'c4.xlarge' => 64, 'c4.2xlarge' => 64, 'c4.4xlarge' => 64, 'c4.8xlarge' => 64,
       'x1.32xlarge' => 64,
+      'p2.xlarge' => 64, 'p2.8xlarge' => 64, 'p2.16xlarge' => 64,
     }
     @@Disk_Type_Lookup = {
       'm1.small' => :ephemeral, 'm1.medium' => :ephemeral, 'm1.large' => :ephemeral, 'm1.xlarge' => :ephemeral,
       'm2.xlarge' => :ephemeral, 'm2.2xlarge' => :ephemeral, 'm2.4xlarge' => :ephemeral,
       'm3.medium' => :ssd, 'm3.large' => :ssd, 'm3.xlarge' => :ssd, 'm3.2xlarge' => :ssd,
-      'm4.large' => :ebs, 'm4.xlarge' => :ebs, 'm4.2xlarge' => :ebs, 'm4.4xlarge' => :ebs, 'm4.10xlarge' => :ebs,
+      'm4.large' => :ebs, 'm4.xlarge' => :ebs, 'm4.2xlarge' => :ebs, 'm4.4xlarge' => :ebs, 'm4.10xlarge' => :ebs, 'm4.16xlarge' => :ebs,
       'c1.medium' => :ephemeral, 'c1.xlarge' => :ephemeral,
       'hi1.4xlarge' => :ssd,
       'cg1.4xlarge' => :ephemeral,
@@ -269,6 +274,7 @@ module AwsPricing
       't2.nano' => :ebs, 't2.micro' => :ebs, 't2.small' => :ebs, 't2.medium' => :ebs, 't2.large' => :ebs,
       'c4.large' => :ebs, 'c4.xlarge' => :ebs, 'c4.2xlarge' => :ebs, 'c4.4xlarge' => :ebs, 'c4.8xlarge' => :ebs,
       'x1.32xlarge' => :ssd,
+      'p2.xlarge' => :ebs, 'p2.8xlarge' => :ebs, 'p2.16xlarge' => :ebs,
     }
 
     # NOTE: These are populated by "populate_lookups"

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

@@ -70,9 +70,9 @@ module AwsPricing
           price = coerce_price(val['prices']['USD'])
 
           case val["name"]
-          when "yrTerm1"
+          when "yrTerm1", "yrTerm1Standard"
             db.set_prepay(type_of_instance, :year1, price)
-          when "yrTerm3"
+          when "yrTerm3", "yrTerm3Standard"
             db.set_prepay(type_of_instance, :year3, price)
           when "yrTerm1Hourly"
             db.set_price_per_hour(type_of_instance, :year1, price)
@@ -82,6 +82,8 @@ module AwsPricing
             db.set_price_per_hour(type_of_instance, :year1, price)
           when "yearTerm3Hourly"
             db.set_price_per_hour(type_of_instance, :year3, price)
+          else
+            $stderr.puts "[#{__method__}] WARNING: unknown term:#{val["name"]}"
           end
         end
       end
@@ -112,9 +114,15 @@ module AwsPricing
 
       terms_to_years = {
           "yrTerm1" => :year1,
-          "yrTerm3" => :year3
+          "yrTerm3" => :year3,
+          "yrTerm1Standard" => :year1,
+          "yrTerm3Standard" => :year3
       }
       years = terms_to_years[term]
+      if years.nil?
+        $stderr.puts "[#{__method__}] WARNING: unknown term:#{val["name"]}"
+      end
+
       prices.each do |price|
         p = coerce_price(price['prices']['USD'])
         case price['name']

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

@@ -6,7 +6,7 @@ module AwsPricing
         'GeneralPurpose' => {
             'CurrentGen' => {
                 'M3' => ['m3.medium', 'm3.large', 'm3.xlarge', 'm3.2xlarge'],
-                'M4' => ['m4.large', 'm4.xlarge', 'm4.2xlarge', 'm4.4xlarge', 'm4.10xlarge']
+                'M4' => ['m4.large', 'm4.xlarge', 'm4.2xlarge', 'm4.4xlarge', 'm4.10xlarge', 'm4.16xlarge']
             },
             'PreviousGen' => {
                 'M1' => ['m1.small', 'm1.medium', 'm1.large', 'm1.xlarge']
@@ -48,8 +48,9 @@ module AwsPricing
             }
         },
         'GPUInstances' => {
-            'CurrentGen' => {
-                'G2'  => ['g2.2xlarge', 'g2.8xlarge']
+            'CurrentGen' => { # G2=GPU Graphics, P2=GPU Computes
+                'G2'  => ['g2.2xlarge', 'g2.8xlarge'],
+                'P2'  => ['p2.xlarge', 'p2.8xlarge', 'p2.16xlarge'],
             },
             'PreviousGen' => {
                 'CG1' => ['cg1.4xlarge']
@@ -173,6 +174,7 @@ module AwsPricing
           "4xlarge" => 32,
           "8xlarge" => 64,
           "10xlarge" => 80,
+          "16xlarge" => 128,
           "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.86'
+  VERSION = '0.1.88'
 end

data/test/ec2_instance_types_test.rb

@@ -52,6 +52,18 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     assert region.instance_type_available?('x1.32xlarge')   #test valid x1 available
   end
 
+  def test_available_m4_16xlarge
+    # Validate instance types in specific regions are available
+    region = @@ec2_pricing.get_region('us-east')
+    assert region.instance_type_available?('m4.16xlarge')   #test valid m4.16x available
+  end
+
+  def test_available_p2_16xlarge
+    # Validate instance types in specific regions are available
+    region = @@ec2_pricing.get_region('us-east')
+    assert region.instance_type_available?('p2.16xlarge')   #test valid p2.16x available
+  end
+
 
   def test_fetch_all_breakeven_months
     @@ec2_pricing.regions.each do |region|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.86
+  version: 0.1.88
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -65,21 +65,21 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - amazon-pricing documentation
-- "--line-numbers"
-- "--main"
+- --line-numbers
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -88,4 +88,12 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
-test_files: []
+test_files:
+- spec/lib/amazon-pricing/definitions/database-type_spec.rb
+- spec/lib/amazon-pricing/elasticache_pricing_spec.rb
+- spec/lib/amazon-pricing/helpers/instance-type-spec.rb
+- spec/lib/amazon-pricing/rds_pricing_spec.rb
+- spec/spec_helper.rb
+- spec/support/.gitignore
+- test/ec2_instance_types_test.rb
+- test/helper.rb