amazon-pricing 0.1.94 → 0.1.95

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzE2MTU4YzE3YmEzM2ExYjlmOWZmMDk5ZWRhNjA2NjllZjZlZDY5Zg==
+    NDk2N2NkZjYwYzAxOTAyYzk2ZWM4ZmNhNzFhZWRlMmQ0YTQzMmM3Zg==
   data.tar.gz: !binary |-
-    MzdjODUyZDg3NzI4OTY2ZDcxNzQwMmNiNThiMjY3NTBkOGNhZWI0OQ==
+    OTBkNWNkYzNlOWRkOTAyZmUwZjZmYjFhYjkzMWFlOGFmZmMyMGQ1Yw==
 SHA512:
   metadata.gz: !binary |-
-    MjBkYzJmZjgxMTc3MTFmMjdmNzM4YjMyMmIyMjVkNjRhN2VhODUyNTI5MDE0
-    ZjVlZjY0NTk0OWQ4ZjM0OTE1ODYwM2Y5YzMxZjZkMTcwYjczYmZlM2ZhYzYw
-    ZWU3MDJiMGFkZTM3YzdhNzU2ZGJiZDhlZjk4NDc4MDI3YzM4ZjE=
+    ZjExYTkzMjQ4ZWFkZmMzODMxZTIzYjUzNWM5YjlkNTI5ZjllOTlmYjEyYjg2
+    MmFiMDU0N2Q4MTljZDVmMTM2Y2RjN2Q2OGNmZDE3YTY0ZjllYzdhNWNkZWM3
+    ODMxYmYxYzBjMTNhYzVhZDhhOGJiOThlYjc5YjlhZDI1ZGRlOTg=
   data.tar.gz: !binary |-
-    MTFiOTgzNDRjYTE5YWMxMDc5NjBjM2MyOTkwM2YxYTUzNjA2NmY1MDEyMWI3
-    ZWI4ZWE0MmE4YjcyMDEwMTc1Zjk0MzFhMGJmODQ3YjNmYzM3Njc1OWY0Mjll
-    OTkwYTEzZmRmZGJlZGI1NjY1NzFkZDg4NjAxMGJjZjZjOTA0MTg=
+    NDZjOTRjMmZmMTc3MjEyOTQyNjJjN2RmYTlhNDE3NTllMTI1M2FjMzIxZWQ2
+    OTlhNTUzNTM3NWFkMjE0MTE2NjI3YWY2OWNiNDQ3MjExNDE3MGJiYjNkMGVh
+    YzVjYmY5NjI1Y2MyMTJjMGRkZTUxMDVlYzY5ODFmMjY0YWMzMDY=

data/Rakefile

@@ -34,6 +34,27 @@ task :print_ec2_price_list do
   print_ec2_table(pricing)
 end
 
+desc "Prints current EC2 DI pricing in CSV format"
+task :print_ec2_di_price_list do
+  require 'amazon-pricing'
+  pricing = AwsPricing::Ec2DiPriceList.new
+  print_ec2_table(pricing)
+end
+
+desc "Prints current EC2 Dedicated Host Instance pricing in CSV format"
+task :print_ec2_dhi_price_list do
+  require 'amazon-pricing'
+  pricing = AwsPricing::Ec2DedicatedHostInstancePriceList.new
+  print_ec2_table(pricing)
+end
+
+desc "Prints current EC2 Dedicated Host pricing in CSV format"
+task :print_ec2_dh_price_list do
+  require 'amazon-pricing'
+  pricing = AwsPricing::Ec2DedicatedHostPriceList.new
+  print_ec2_dh_table(pricing)
+end
+
 desc "Prints current RDS pricing in CSV format"
 task :print_rds_price_list do
   require 'amazon-pricing'
@@ -95,6 +116,35 @@ def print_ec2_table(pricing, target_region = nil)
   end
 end
 
+def print_ec2_dh_table(pricing, target_region = nil)
+  line = "Region,Instance Type,API Name,Memory (MB),Disk (GB),Compute Units,Virtual Cores,Disk Type,OD Linux PPH,OD Windows PPH,OD RHEL PPH,OD SLES PPH,OD MsWinSQL PPH,OD MsWinSQLWeb PPH,"
+  [:year1, :year3].each do |term|
+    [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
+      [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb].each do |os|
+        line += "#{term} #{res_type} #{os} Prepay,#{term} #{res_type} #{os} PPH,"
+      end
+    end
+  end
+  puts line.chop
+  pricing.regions.each do |region|
+    next if region.name != target_region if target_region
+    region.ec2_dh_types.each do |t|
+      line = "#{region.name},#{t.name},#{t.api_name},#{t.memory_in_mb},#{t.disk_in_gb},#{t.compute_units},#{t.virtual_cores},#{t.disk_type},"
+      [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb].each do |os|
+        line += "#{t.price_per_hour(os, :ondemand)},"
+      end
+      [:year1, :year3].each do |term|
+        [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
+          [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb].each do |os|
+            line += "#{t.prepay(os, res_type, term)},#{t.price_per_hour(os, res_type, term)},"
+          end
+        end
+      end
+      puts line.chop
+    end
+  end
+end
+
 def print_elasticache_table(pricing, target_region = nil)
   line = "Region,Node Type,API Name,Memmory (MB),Virtual Cores,Disk Type,OD PPH,"
   [:year1, :year3].each do |term|

data/lib/amazon-pricing.rb

@@ -8,6 +8,8 @@ require 'amazon-pricing/common/ec2_common'
 require 'amazon-pricing/aws-price-list'
 require 'amazon-pricing/ec2-price-list'
 require 'amazon-pricing/ec2-di-price-list'
+require 'amazon-pricing/ec2-dhi-price-list'
+require 'amazon-pricing/ec2-dh-price-list'
 require 'amazon-pricing/rds-price-list'
 require 'amazon-pricing/dynamo-db-price-list'
 require 'amazon-pricing/elasticache-price-list'

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

@@ -104,6 +104,7 @@ module AwsPricing
     ELASTICACHE_BASE_URL = "http://a0.awsstatic.com/pricing/1/elasticache/"
 
     DI_OD_BASE_URL = "http://a0.awsstatic.com/pricing/1/dedicated-instances/"
+    DH_OD_BASE_URL = "http://a0.awsstatic.com/pricing/1/dedicated-hosts/"
     RESERVED_DI_BASE_URL = "http://a0.awsstatic.com/pricing/1/ec2/ri-v2/"
     RESERVED_DI_PREV_GEN_BASE_URL = "http://a0.awsstatic.com/pricing/1/ec2/previous-generation/ri-v2/"
 

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

@@ -1,5 +1,7 @@
 module AwsPricing
+
   module Ec2Common
+
     # Retrieves the EC2 on-demand instance pricing.
     # type_of_instance = :ondemand, :light, :medium, :heavy
     def fetch_ec2_instance_pricing(url, type_of_instance, operating_system)

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

@@ -0,0 +1,36 @@
+require 'amazon-pricing/definitions/instance-type'
+
+module AwsPricing
+  class Ec2DedicatedHostType < InstanceType
+
+    def initialize(region, family_name)
+      @category_types = {}
+      @region = region
+      @name = ''
+      @api_name = family_name
+    end
+
+    def category_types
+      @category_types
+    end
+
+    def region
+      @region
+    end
+
+    def update_dh_pricing(operating_system, dhprice)
+      os = get_category_type(operating_system)
+      if os.nil?
+        os = OperatingSystem.new(self, operating_system)
+        @category_types[operating_system] = os
+      end
+
+      category = operating_system.to_s
+      values = { category => dhprice }
+      price = coerce_price(values[category])
+      os.set_price_per_hour(:ondemand, nil, price)
+    end
+
+  end
+
+end

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

@@ -88,6 +88,22 @@ module AwsPricing
       end
     end
 
+    # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
+    # dhprice is a string representing the price per hour for the Dedicated Host
+    # capacity is the number of this type of instancess supported on this Dedicated Host
+    def update_dhi_pricing(operating_system, dhprice, capacity)
+      os = get_category_type(operating_system)
+      if os.nil?
+        os = OperatingSystem.new(self, operating_system)
+        @category_types[operating_system] = os
+      end
+
+      category = operating_system.to_s
+      values = { category => dhprice }
+      price = coerce_price(values[category])
+      os.set_price_per_hour(:ondemand, nil, price/capacity)
+    end
+
     def update_pricing2(operating_system, res_type, ondemand_pph = nil, year1_prepay = nil, year3_prepay = nil, year1_pph = nil, year3_pph = nil)
 
       os = get_category_type(operating_system)

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

@@ -38,7 +38,7 @@ module AwsPricing
 
     # Keep this in for backwards compatibility within current major version of gem
     def disk_in_mb
-      @disk_in_gb * 1000
+      @disk_in_gb.nil? ? 0 : @disk_in_gb * 1000
     end
 
     def memory_in_gb

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

@@ -15,13 +15,14 @@ module AwsPricing
   # e.g. us-east, us-west
   #
   class Region
-    attr_accessor :name, :ebs_price, :ec2_instance_types, :rds_instance_types, :elasticache_node_types
+    attr_accessor :name, :ebs_price, :ec2_instance_types, :rds_instance_types, :elasticache_node_types, :ec2_dh_types
 
     def initialize(name)
       @name = name
       @ec2_instance_types     = {}
       @rds_instance_types     = {}
       @elasticache_node_types = {}
+      @ec2_dh_types           = {}
     end
 
     # Maintained for backward compatibility reasons (retrieves EC2 instance type)
@@ -41,6 +42,10 @@ module AwsPricing
       @elasticache_node_types.values
     end
 
+    def ec2_dh_types
+      @ec2_dh_types.values
+    end
+
     # Returns whether an instance_type is available. 
     # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
     # type_of_instance = :ondemand, :light, :medium, :heavy
@@ -78,6 +83,15 @@ module AwsPricing
       current
     end
 
+    def add_or_update_ec2_dh_type(family)
+      current = get_ec2_dh_type(family)
+      if current.nil?
+        current = Ec2DedicatedHostType.new(self, family)
+        @ec2_dh_types[family] = current
+      end
+      current
+    end
+
     # Maintained for backward compatibility reasons (retrieves EC2 instance type)
     def get_instance_type(api_name)
       get_ec2_instance_type(api_name)
@@ -95,6 +109,10 @@ module AwsPricing
       @elasticache_node_types[api_name]
     end
 
+    def get_ec2_dh_type(family)
+      @ec2_dh_types[family]
+    end
+
   end
 
 end

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

@@ -0,0 +1,52 @@
+module AwsPricing
+  class Ec2DedicatedHostPriceList < PriceList
+    include AwsPricing::Ec2Common
+
+    def initialize
+      super
+      InstanceType.populate_lookups
+      get_ec2_dh_od_pricing
+    end
+
+    def os_types
+      @@OS_TYPES
+    end
+
+    protected
+
+    @@OS_TYPES = [ 'linux', 'rhel', 'sles', 'mswin', 'mswinSQL', 'mswinSQLWeb', 'mswinSQLEnterprise' ]
+
+    def get_ec2_dh_od_pricing
+      @@OS_TYPES.each do |os|
+        fetch_ec2_dedicated_host_pricing(DH_OD_BASE_URL + "dh-od.min.js", os.to_sym)
+      end
+    end
+
+    def fetch_ec2_dedicated_host_pricing(url, operating_system)
+      res = PriceList.fetch_url(url)
+      begin
+        res['config']['regions'].each do |reg|
+          region_name = reg['region']
+          region = get_region(region_name)
+          if region.nil?
+            $stderr.puts "[fetch_ec2_dedicated_host_pricing] WARNING: unable to find region #{region_name}"
+            next
+          end
+          reg['types'].each do |type|
+            type_name = type['name']
+            tiers = type['tiers']
+            tiers.each do |tier|
+                family = tier['name']
+                api_name = family
+                dhprice = tier['prices']['USD']
+                dh_type = region.add_or_update_ec2_dh_type(family)
+                dh_type.update_dh_pricing(operating_system, dhprice)
+            end
+          end
+        end
+      rescue UnknownTypeError
+        $stderr.puts "[fetch_ec2_dedicated_host_pricing] WARNING: encountered #{$!.message}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+module AwsPricing
+  class Ec2DedicatedHostInstancePriceList < PriceList
+    include AwsPricing::Ec2Common
+
+    def initialize
+      super
+      InstanceType.populate_lookups
+      get_ec2_dhi_od_pricing
+    end
+
+    def os_types
+      @@OS_TYPES
+    end
+
+    protected
+
+    @@OS_TYPES = [ 'linux', 'rhel', 'sles', 'mswin', 'mswinSQL', 'mswinSQLWeb', 'mswinSQLEnterprise' ]
+
+    @@CAPACITY_HASH = {
+      'c3' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
+      'c4' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
+      'p2' => { "xlarge"=>16, "8xlarge"=>2, "16xlarge"=>1 },
+      'g2' => { "2xlarge"=>4, "8xlarge"=>1 },
+      'm3' => { "medium"=>32, "large"=>16, "xlarge"=>8, "2xlarge"=>4 },
+      'd2' => { "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
+      'r4' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
+      'r3' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
+      '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 }
+    }
+
+    def get_ec2_dhi_od_pricing
+      @@OS_TYPES.each do |os|
+        fetch_ec2_dedicated_host_instance_pricing(DH_OD_BASE_URL + "dh-od.min.js", os.to_sym)
+      end
+    end
+
+    def fetch_ec2_dedicated_host_instance_pricing(url, operating_system)
+      res = PriceList.fetch_url(url)
+      res['config']['regions'].each do |reg|
+        begin
+          region_name = reg['region']
+          region = get_region(region_name)
+          if region.nil?
+            $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: unable to find region #{region_name}"
+            next
+          end
+          reg['types'].each do |type|
+            type_name = type['name']
+            tiers = type['tiers']
+            tiers.each do |tier|
+              family = tier['name']
+
+              # hack for now until I can get capacity for fpga instances
+              next if family == 'f1'
+
+              dhprice = tier['prices']['USD']
+              @@CAPACITY_HASH[family].each do |inst_size,capacity|
+                api_name, name = Ec2InstanceType.get_name(family, "#{family}.#{inst_size}", false)
+                instance_type = region.add_or_update_ec2_instance_type(api_name, name)
+                instance_type.update_dhi_pricing(operating_system, dhprice, capacity)
+              end
+            end
+          end
+
+        rescue UnknownTypeError
+          $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: encountered #{$!.message}"
+        end
+      end
+    end
+  end
+end

data/lib/amazon-pricing/version.rb

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

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe AwsPricing::Ec2DedicatedHostPriceList do
+
+  before(:all) do
+    @pricing = AwsPricing::Ec2DedicatedHostPriceList.new
+  end
+
+  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
+  end
+
+  describe 'new' do
+    it 'Ec2DedicatedHostPriceList.new should return valid response' do
+      @pricing.regions.each do |region|
+        validate_price_in_region region
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe AwsPricing::Ec2DedicatedHostInstancePriceList do
+
+  before(:all) do
+    @pricing = AwsPricing::Ec2DedicatedHostInstancePriceList.new
+    @dh_pricing = AwsPricing::Ec2DedicatedHostPriceList.new
+  end
+
+  def validate_price_in_region region
+    # Result have valid node name
+    region.ec2_instance_types.each do |inst_type|
+      expect(inst_type.api_name).to match(/[[:alpha:]][[:alpha:]]./)
+      expect(inst_type.category_types).to have_exactly(@pricing.os_types.length).items
+      expect(inst_type.category_types[0].price_per_hour.class).to eq(Float)
+
+      family_name = inst_type.api_name.split('.').first
+      dh_region_arr = @dh_pricing.regions.select { |reg| reg.name == region.name }
+      expect(dh_region_arr).to have_exactly(1).items
+      dh_region = dh_region_arr[0]
+      dh_price_per_hour = dh_region.ec2_dh_types[0].price_per_hour(:linux, :ondemand)
+      dh_dh_type_arr = dh_region.ec2_dh_types.select { |type| type.api_name == family_name }
+      expect(dh_dh_type_arr).to have_exactly(1).items
+      dh_dh_type = dh_dh_type_arr[0]
+      expect(inst_type.category_types[0].price_per_hour).to be <= dh_dh_type.category_types[:linux].ondemand_price_per_hour
+    end
+  end
+
+  describe 'new' do
+    it 'Ec2DedicatedHostInstancePriceList.new should return valid response' do
+      @pricing.regions.each do |region|
+        validate_price_in_region region
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.94
+  version: 0.1.95
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -38,6 +38,7 @@ files:
 - lib/amazon-pricing/definitions/category-type.rb
 - lib/amazon-pricing/definitions/database-type.rb
 - lib/amazon-pricing/definitions/ebs-price.rb
+- lib/amazon-pricing/definitions/ec2-dh-type.rb
 - lib/amazon-pricing/definitions/ec2-instance-type.rb
 - lib/amazon-pricing/definitions/elasticache_node_type.rb
 - lib/amazon-pricing/definitions/instance-type.rb
@@ -45,6 +46,8 @@ files:
 - lib/amazon-pricing/definitions/rds-instance-type.rb
 - lib/amazon-pricing/definitions/region.rb
 - lib/amazon-pricing/dynamo-db-price-list.rb
+- lib/amazon-pricing/ec2-dh-price-list.rb
+- lib/amazon-pricing/ec2-dhi-price-list.rb
 - lib/amazon-pricing/ec2-di-price-list.rb
 - lib/amazon-pricing/ec2-price-list.rb
 - lib/amazon-pricing/elasticache-price-list.rb
@@ -52,6 +55,8 @@ files:
 - lib/amazon-pricing/rds-price-list.rb
 - lib/amazon-pricing/version.rb
 - 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
 - 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
@@ -90,6 +95,8 @@ specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
 test_files:
 - 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
 - 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