amazon-pricing 0.1.88 → 0.1.89

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2YyZmQ3OTMwN2Y2MzlmMzU3ODBkMjk2ZDk2ZGY0MTVhMmZkNThhZQ==
+    M2NjZThjMWM2ODU4MmE1YjBjNDM1OWU5MWFlODBhMzUzNGU1Y2FhZg==
   data.tar.gz: !binary |-
-    MWQxNGFjNDg2YmIyNTlhYmQ0NzA5MjFmNDc1ZTMwYzRiY2UzNzU3ZQ==
+    YjQ5MjBiNzk2Yzk1Yjg1Y2RiZTEyYTBkNWE3NmRkNWY2ZjBjNTkyOQ==
 SHA512:
   metadata.gz: !binary |-
-    N2UzMGE4Yjk2NmMzYjdmZmJhNmRlZGZmMzczYTE3ODVjYTQ2YmI4ZmYwYWNl
-    MzZmZmUzNGMxNzY5NzA4Y2I4YjMzYzg3Nzg5ZGFlYmY0MjE2NjJkNDE3MjYx
-    MTQ5ZjA3MGM1NDRjOTYwZmUxMDQ3N2IyZTUwYjhkMzc0YmM5ZTk=
+    MWMwZDQxNGM0OWRjMzk4ZWY5Mzc5Njg5YWY5MGU4MTQ1MjkxMGYwNTdkZGYx
+    YTA2ZTRmZDg2MDllODM0Njk0MDYzN2MzZDBmZTVhYWVjMTBlNGJkODBlNjY2
+    NjgzMDg4N2NiODRiNjVlNTM4YTg3MDNmNWEzNDJmY2M4NDkyOTE=
   data.tar.gz: !binary |-
-    MjBjNWMxNzE0YzQyMzYxMThhZjcxNjQ4ZmJlNjMxMjg2NTc0NzMyMDQ4MWIy
-    MDllZTliMjlmZTgyOTBkZDM0OThjMWJjMzczMjQ3YmIzNDVjZWM5OTBkOWYy
-    YjhmM2FkMDFjYzFjNGE0NjA1MjU4YjQ5OGNiNTM4ZGQ0NGE1MDY=
+    NTIyMTA2OTcyMzg4N2VhZDM4NzI1M2ZmOTc1ZWQ4Y2E4MmU1MDkwZmY0NDA0
+    ZjI4MjUxZjMxMjc3ZGY5NDE5NDg2ZjNmYzVlNGM2NjE3YzhmMjY0Y2Y4NzU1
+    ZjhiYjViZGEyMGRjNDRmN2RkYjBkZTc3NjAyZmI0OGU0NWRiYTY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.88)
+    amazon-pricing (0.1.89)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,10 @@ GEM
     diff-lcs (1.1.3)
     method_source (0.8.2)
     power_assert (0.3.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (11.1.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -28,6 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   amazon-pricing!
+  pry
   rake
   rspec (~> 2.11.0)
   test-unit

data/lib/amazon-pricing/aws-price-list.rb

@@ -21,7 +21,7 @@ module AwsPricing
 
       # Creating regions upfront since different json files all use different naming conventions. No more ad-hoc creation.
       regions = ["eu-west-1", "sa-east-1", "us-east-1", "ap-northeast-1", "us-west-2", "us-west-1", "ap-southeast-1", "ap-southeast-2", 
-		 "eu-central-1", "us-gov-west-1", "ap-northeast-2", "ap-south-1"]
+		 "eu-central-1", "us-gov-west-1", "ap-northeast-2", "ap-south-1", "us-east-2"]
 
       regions.each do |name|
         @_regions[name] = Region.new(name)

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

@@ -192,6 +192,7 @@ module AwsPricing
       'cache.r3.8xlarge' => :ten_gigabit,
       'cache.r3.large' => :moderate,
       'cache.r3.xlarge' => :moderate,
+      'cache.x1.16xlarge' => :ten_gigabit,
       'cache.x1.32xlarge' => :ten_gigabit,
       'cache.t1.micro' => :very_low,
       'cache.t2.medium' => :low_to_moderate,
@@ -232,6 +233,7 @@ module AwsPricing
       'db.t2.medium' => :low_to_moderate,
       'db.t2.micro' => :low,
       'db.t2.small' => :low_to_moderate,
+      'db.x1.16xlarge' => :ten_gigabit,
       'db.x1.32xlarge' => :ten_gigabit,
       'g2.2xlarge' => :high,
       'g2.8xlarge' => :ten_gigabit,
@@ -272,6 +274,7 @@ module AwsPricing
       't2.micro' => :low_to_moderate,
       't2.nano' => :low,
       't2.small' => :low_to_moderate,
+      'x1.16xlarge' => :ten_gigabit,
       'x1.32xlarge' => :ten_gigabit,
     }
 

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

@@ -198,6 +198,7 @@ module AwsPricing
       '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',
       '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',
       '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',
+      'x1.16xlarge' => 'Memory Optimized Hextuple Large-scale Enterprise-class',
       'x1.32xlarge' => 'Memory Optimized Large-scale Enterprise-class',
     }
     @@Disk_Lookup = {
@@ -222,7 +223,7 @@ module AwsPricing
       'r3.large' => 32, 'r3.xlarge' => 80, 'r3.2xlarge' => 160, 'r3.4xlarge' => 320, 'r3.8xlarge' => 640,
       '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,
+      'x1.16xlarge' => 3840, 'x1.32xlarge' => 3840,
       'p2.xlarge' => 0, 'p2.8xlarge' => 0, 'p2.16xlarge' => 0,
     }
     @@Platform_Lookup = {
@@ -247,7 +248,7 @@ module AwsPricing
       'r3.large' => 64, 'r3.xlarge' => 64, 'r3.2xlarge' => 64, 'r3.4xlarge' => 64, 'r3.8xlarge' => 64,
       '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,
+      'x1.16xlarge' => 64, 'x1.32xlarge' => 64,
       'p2.xlarge' => 64, 'p2.8xlarge' => 64, 'p2.16xlarge' => 64,
     }
     @@Disk_Type_Lookup = {
@@ -273,7 +274,7 @@ module AwsPricing
       'r3.large' => :ssd, 'r3.xlarge' => :ssd, 'r3.2xlarge' => :ssd, 'r3.4xlarge' => :ssd, 'r3.8xlarge' => :ssd,
       '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,
+      'x1.16xlarge' => :ssd, 'x1.32xlarge' => :ssd,
       'p2.xlarge' => :ebs, 'p2.8xlarge' => :ebs, 'p2.16xlarge' => :ebs,
     }
 
@@ -407,6 +408,7 @@ module AwsPricing
       # t2.micro is EBS-only
       # t2.nano is EBS-only
       # t2.small is EBS-only
+      'x1.16xlarge' => [940, 105123],
       'x1.32xlarge' => [940, 105123],
     }
   end

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

@@ -30,7 +30,7 @@ module AwsPricing
         'MemoryOptimized' => {
             'CurrentGen' => {
                 'R3'  => ['r3.large', 'r3.xlarge', 'r3.2xlarge', 'r3.4xlarge', 'r3.8xlarge'],
-                'X1'  => ['x1.32xlarge']
+                'X1'  => ['x1.16xlarge', 'x1.32xlarge']
             },
             'PreviousGen' => {
                 'M2'  => ['m2.xlarge', 'm2.2xlarge', 'm2.4xlarge'],

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.1.88'
+  VERSION = '0.1.89'
 end

data/test/ec2_instance_types_test.rb

@@ -49,6 +49,7 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     # Validate instance types in specific regions are available
     region = @@ec2_pricing.get_region('us-east')
     assert !region.instance_type_available?('x1.99xlarge')  #bogus x1
+    assert region.instance_type_available?('x1.16xlarge')   #test valid x1 available
     assert region.instance_type_available?('x1.32xlarge')   #test valid x1 available
   end
 

metadata

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