amazon-pricing 0.1.97 → 0.1.98

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGMwNWE5YzkwMzYwYmRhYzFkYzYyNjQyY2MyNmQwMGE2MDgxZTg3Mg==
+    ZTczM2E3YTRhYmRjNTZjZjQzMTMzYjk4YzY5MzQ2OWNlYTFkODA2Mw==
   data.tar.gz: !binary |-
-    Y2JkNmQyMDU4NmFmYTRkZDM4OGNiZDc2ZDUzMTlmMjYxNzhiN2JlMg==
+    NTI3NDM1MTM4MTI4M2Y4OWZmNjY3MzM1ZDk4OWEzZTlhMGFlZDBlYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTg1NTBlMzIxMmJkZDBkMTI5OTcxMjIzNDhlZGE2NmIzZDEyM2Y0ZmVmMzhh
-    ZjRlZGM4YTBlNDczNDQ5N2E4ODVlOGJkZjIxODI4NWNiMTM3ODlhYTBmNTEw
-    ZGUzNzMxZGE3MDFhMmVhNjlmNmMzMTgyZWUwMmVmYjEwMmVhYzM=
+    ZDk5MjczY2ZmZmM5NzBhZjExYTI3ZWI0MjIyMmMxYTk0MWYyNDQwOGRiZTY4
+    NDZkOWQ5ZThhYTc1NDFkYzU5YTAxYTgwNzRlMWI4MDdhODQ1ZWQ1ZDU5NzYz
+    NDkyN2E1ZTUwNjE0YmRjMmY0MjFlNzQwNGUxOTFkZjRjZjllNDk=
   data.tar.gz: !binary |-
-    YTU2MDQ2OWZiOTExMmVmZWQzNmJjMzdiOWI2OTdhZWI0ZTBlMGQzNzk4Njc1
-    MmFhMGI5ZjkwOWY4MzI3MjhlNWVhZWYyYjczOTY3NjI5ZTBlMDRjNmZlNzdm
-    NmRmMTA4Mzk5MjQwYzljMmUwOTAzYjUwNzRiNDIwM2U5YWQ4ZjM=
+    MTRkYjc2MDY5MDM3M2E2OGNjM2UyNzU4OTA2N2UwMWNiYzFiY2M3NjUwOGQy
+    NGY3NTlmYzc2NTU4OGFkNDQwZWVmYmIzZTU4NTE4OGM0MzA0NmRiOWRlMDYz
+    MGJkOGE3NjI0YzRmNzE4MjRkNmM3MGQ2MzUyYTgzOGRkODdmOGM=

data/Gemfile

@@ -10,4 +10,5 @@ group :test do
   gem 'rake'
   gem 'test-unit'
   gem 'rspec', '~> 2.11.0'
+  gem 'simplecov', require: false
 end

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

@@ -311,7 +311,8 @@ module AwsPricing
       't2.xlarge' => :high,   # same as c4.2xlarge, cf:https://aws.amazon.com/blogs/aws/new-t2-xlarge-and-t2-2xlarge-instances/
       't2.2xlarge' => :high,  # same as m4.xlarge,  cf:https://aws.amazon.com/blogs/aws/new-t2-xlarge-and-t2-2xlarge-instances/
       'x1.16xlarge' => :ten_gigabit,
-      'x1.32xlarge' => :ten_gigabit,
+      'x1.32xlarge' => :twenty_gigabit,
+      'x1e.32xlarge' => :twenty_gigabit,
     }
 
   end

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

@@ -208,6 +208,7 @@ module AwsPricing
       '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',
+      'x1e.32xlarge' => 'Memory Optimized Extended Large-scale Enterprise-class',
       'f1.2xlarge' => 'FPGA Hardware Acceleration Double Extra Large', 'f1.16xlarge' => 'FPGA Hardware Acceleration Hextuple Extra Large'
     }
     @@Disk_Lookup = {
@@ -235,7 +236,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,
-      'x1.16xlarge' => 3840, 'x1.32xlarge' => 3840,
+      'x1.16xlarge' => 1920, 'x1.32xlarge' => 3840, 'x1e.32xlarge' => 3840,
       'p2.xlarge' => 0, 'p2.8xlarge' => 0, 'p2.16xlarge' => 0,
       'f1.2xlarge' => 470, 'f1.16xlarge' => 3760,
     }
@@ -264,7 +265,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,
-      'x1.16xlarge' => 64, 'x1.32xlarge' => 64,
+      'x1.16xlarge' => 64, 'x1.32xlarge' => 64, 'x1e.32xlarge' => 64,
       'p2.xlarge' => 64, 'p2.8xlarge' => 64, 'p2.16xlarge' => 64,
     }
     @@Disk_Type_Lookup = {
@@ -293,7 +294,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,
-      'x1.16xlarge' => :ssd, 'x1.32xlarge' => :ssd,
+      'x1.16xlarge' => :ssd, 'x1.32xlarge' => :ssd, 'x1e.32xlarge' => :ssd,
       'p2.xlarge' => :ebs, 'p2.8xlarge' => :ebs, 'p2.16xlarge' => :ebs,
       'f1.2xlarge' => :ssd, 'f1.16xlarge' => :ssd,
     }
@@ -447,8 +448,9 @@ module AwsPricing
       # t2.small is EBS-only
       # t2.xlarge is EBS-only
       # t2.2xlarge is EBS-only
-      'x1.16xlarge' => [940, 105123],
-      'x1.32xlarge' => [940, 105123],
+      'x1.16xlarge' => [7000, 105123],   # dedicated EBS bw 7000 Gbps
+      'x1.32xlarge' => [14000, 210246],  # dedicated EBS bw 14000 Gbps
+      'x1e.32xlarge' => [14000, 210246], # dedicated EBS bw 14000 Gbps
     }
   end
 

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

@@ -29,7 +29,8 @@ module AwsPricing
       'm4' => { "large"=>22, "xlarge"=>11, "2xlarge"=>5, "4xlarge"=>4, "10xlarge"=>1, "16xlarge"=>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 },
-      'x1' => { "16xlarge"=>2, "32xlarge"=>1 }
+      'x1' => { "16xlarge"=>2, "32xlarge"=>1 },
+      'x1e' => { "32xlarge"=>1 },
     }
 
     def get_ec2_dhi_od_pricing
@@ -57,6 +58,10 @@ module AwsPricing
 
               # hack for now until I can get capacity for fpga instances
               next if family == 'f1'
+              if @@CAPACITY_HASH[family].nil?
+                $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: unable to find CAPACITY_HASH for #{family}"
+                next
+              end
 
               dhprice = tier['prices']['USD']
               @@CAPACITY_HASH[family].each do |inst_size,capacity|

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

@@ -31,7 +31,8 @@ module AwsPricing
             'CurrentGen' => {
                 'R3'  => ['r3.large', 'r3.xlarge', 'r3.2xlarge', 'r3.4xlarge', 'r3.8xlarge'],
                 'R4'  => ['r4.large', 'r4.xlarge', 'r4.2xlarge', 'r4.4xlarge', 'r4.8xlarge', 'r4.16xlarge'],
-                'X1'  => ['x1.16xlarge', 'x1.32xlarge']
+                'X1'  => ['x1.16xlarge', 'x1.32xlarge'],
+                'X1E'  => ['x1e.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.97'
+VERSION = '0.1.98'
 end

data/solano.yml

@@ -0,0 +1,4 @@
+---
+coverage:
+  version: 2
+  enabled: true

data/spec/lib/amazon-pricing/ec2_dh_pricing_spec.rb

@@ -9,7 +9,6 @@ describe AwsPricing::Ec2DedicatedHostPriceList do
   def validate_price_in_region region
     # Result have valid node name
     region.ec2_dh_types.each do |dh_type|
-      expect(dh_type.api_name).to have(2).characters
       expect(dh_type.region.ec2_dh_types[0].category_types[:linux].name).to eq(:linux)
       expect(dh_type.region.ec2_dh_types[0].category_types[:linux].ondemand_price_per_hour.class).to eq(Float)
     end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 #BROKEN IN TDDIUM: Dir.glob('spec/support/**/*.rb').sort.each {|f| require f}
 
+require 'simplecov'
+SimpleCov.start 'rails'
+
 RSpec.configure do |c|
   c.filter_run_excluding broken: true
 end

data/test/ec2_instance_types_test.rb

@@ -105,12 +105,13 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     # next two prices are no longer provided by aws (May 09, 2016)
     assert region.ebs_price.standard_per_gb == 0.05
     assert region.ebs_price.standard_per_million_io == 0.05
-    assert region.ebs_price.preferred_per_gb == 0.125
-    assert region.ebs_price.preferred_per_iops == 0.065
+    # preferred_per_gb,preferred_per_ios,ssd_per_gb,ebs_optimized_hdd_per_gb,ebs_cold_hdd_per_gb not always provided by aws (2017-09-17)
+    assert region.ebs_price.preferred_per_gb == 0.125 if region.ebs_price.preferred_per_gb
+    assert region.ebs_price.preferred_per_iops == 0.065 if region.ebs_price.preferred_per_iops
     assert region.ebs_price.s3_snaps_per_gb == 0.05
     # next two prices were added by aws (May 09, 2016)
-    assert region.ebs_price.ebs_optimized_hdd_per_gb == 0.045
-    assert region.ebs_price.ebs_cold_hdd_per_gb == 0.025
+    assert region.ebs_price.ebs_optimized_hdd_per_gb == 0.045 if region.ebs_price.ebs_optimized_hdd_per_gb
+    assert region.ebs_price.ebs_cold_hdd_per_gb == 0.025  if region.ebs_price.ebs_cold_hdd_per_gb
 
   end
 
@@ -120,10 +121,11 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
       # next two prices are no longer provided by aws (May 09, 2016) 
       assert_not_nil region.ebs_price.standard_per_gb
       assert_not_nil region.ebs_price.standard_per_million_io
-      assert_not_nil region.ebs_price.preferred_per_gb
-      assert_not_nil region.ebs_price.preferred_per_iops
-      assert_not_nil region.ebs_price.ebs_optimized_hdd_per_gb
-      assert_not_nil region.ebs_price.ebs_cold_hdd_per_gb
+      # preferred_per_gb,preferred_per_ios,ssd_per_gb,ebs_optimized_hdd_per_gb,ebs_cold_hdd_per_gb not always provided by aws (2017-09-17)
+      assert_not_nil region.ebs_price.preferred_per_gb  if region.ebs_price.preferred_per_gb
+      assert_not_nil region.ebs_price.preferred_per_iops  if region.ebs_price.preferred_per_iops
+      assert_not_nil region.ebs_price.ebs_optimized_hdd_per_gb if region.ebs_price.ebs_optimized_hdd_per_gb
+      assert_not_nil region.ebs_price.ebs_cold_hdd_per_gb if region.ebs_price.ebs_cold_hdd_per_gb
       assert_not_nil region.ebs_price.s3_snaps_per_gb
     end
   end
@@ -199,13 +201,14 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     region = @@ec2_pricing.get_region('us-gov-west-1')
     # next two prices are no longer provided by aws (May 09, 2016)
     assert region.ebs_price.standard_per_gb == 0.065
-	assert region.ebs_price.standard_per_million_io == 0.065
-    assert region.ebs_price.preferred_per_gb == 0.15
-    assert region.ebs_price.preferred_per_iops == 0.078
+	  assert region.ebs_price.standard_per_million_io == 0.065
+    # preferred_per_gb,preferred_per_ios,ssd_per_gb,ebs_optimized_hdd_per_gb,ebs_cold_hdd_per_gb not always provided by aws (2017-09-17)
+    assert region.ebs_price.preferred_per_gb == 0.15  if region.ebs_price.preferred_per_gb
+    assert region.ebs_price.preferred_per_iops == 0.078 if region.ebs_price.preferred_per_iops
     assert region.ebs_price.s3_snaps_per_gb == 0.066
     # next two prices were added by aws (May 09, 2016)
-    assert region.ebs_price.ebs_optimized_hdd_per_gb == 0.054
-    assert region.ebs_price.ebs_cold_hdd_per_gb == 0.03
+    assert region.ebs_price.ebs_optimized_hdd_per_gb == 0.054 if region.ebs_price.ebs_optimized_hdd_per_gb
+    assert region.ebs_price.ebs_cold_hdd_per_gb == 0.03 if region.ebs_price.ebs_cold_hdd_per_gb
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.97
+  version: 0.1.98
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -54,6 +54,7 @@ files:
 - lib/amazon-pricing/helpers/instance-type.rb
 - lib/amazon-pricing/rds-price-list.rb
 - lib/amazon-pricing/version.rb
+- solano.yml
 - spec/lib/amazon-pricing/definitions/database-type_spec.rb
 - spec/lib/amazon-pricing/ec2_dh_pricing_spec.rb
 - spec/lib/amazon-pricing/ec2_dhi_pricing_spec.rb