amazon-pricing 0.1.65 → 0.1.66

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQ4OGZhYmU5NmE2NzZiNGQzZjIxNTBhNGYzYzA1ZjgyYzM5ZTQ5Mw==
+    NDFiYTIxOTk0ZDIyMTJiNDhlZGIzYTMyY2NhYmZkMTIzYTQyNTk4Yw==
   data.tar.gz: !binary |-
-    ZGMzZTc4NWEwMzM3ZDhiYzMwMjI2OWQ5YmUyODBlY2JkYTcyMzQxNQ==
+    NjVhMTVjNDEyNDRlZTM0ZjhhY2Q5YWZjNzNmMTJmOTkxODE3NTI3MA==
 SHA512:
   metadata.gz: !binary |-
-    YWUyZjA3N2QzNTllMjRmZmE3YmU2MGEwMzkxNTBjOWNhMWZiMWY2OTg3ZTRj
-    OTE5OWRmNTM1Yjg1MTM2NjdkNTU3MDg4OGJjZDZlYTViZjViNzk2YzFlOTI3
-    YjY5ZTc2OTFiY2E1ODFiMDMxNjRiOTNjMzQ1ZmM3M2VhMzk1ZGQ=
+    YTJkMzAyMWJiNDI0ZTUzMWI2N2JiMzRhNDEwYzc4OGNkMGU4MDExYTg3MGVi
+    ZDk2MjJhODFkOWEwN2FkZWRlNzM3N2NhNmEyZTgxODQ0MDdlYjNiZTJmOTFm
+    Mzg4MGYwNTE1ZjE3ZGYyOWYyMTJmY2FiN2JiZDQ2YjI3NWNmYzQ=
   data.tar.gz: !binary |-
-    OTVmNGIyZWU1MmExNTFmYzJlZDM3ZmFkODU1NmYyNDY0YTI3ZjM2NjVjY2Q4
-    OWVmOTQ5ODliMWU1ODkzNGRkN2FmOGZmYTI1NDkyODRkNjQ1ZGQ5NDM0YjQw
-    OGUzZGVlNTcxNjIzZDMwMTBjZGIyNWViNjU3NDIxYmQ1NWQwZDI=
+    MDNkZjI5MGU5Mjk4MDYzMTVhMjIwZTk1NTQ1NTRjNzQwZTM2ZTNhMjQxMjQ3
+    NDhkOGYxMzFkNWE5MGExNTNmZGViYWYzOTIyYTg3ODhjMzMwYjQyMzc0NjA2
+    OTM4ODNjZWIyZDVlOTE0NGFiYmI5MzE3NGY1NWYzMGI2ZDEzOTA=

data/Gemfile.lock

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

data/Rakefile

@@ -41,6 +41,13 @@ task :print_rds_price_list do
   print_rds_table(pricing) 
 end
 
+desc "Prints current ElastiCache pricing to CSV format"
+task :print_elasticache_price_list do
+  require 'amazon-pricing'
+  pricing = AwsPricing::ElastiCachePriceList.new
+  print_elasticache_table(pricing)
+end
+
 desc "Prints current GovCloud EC2 pricing in CSV format"
 task :print_govcloud_ec2_price_list do
   require 'amazon-pricing'
@@ -88,6 +95,35 @@ def print_ec2_table(pricing, target_region = nil)
   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|
+    [:partialupfront].each do |res_type|
+      [:memcached].each do |cache|
+        line += "#{term} #{res_type} #{cache} Prepay,#{term} #{res_type} #{cache} PPH,"
+      end
+    end
+  end
+  puts line.chop
+  pricing.regions.each do |region|
+    next if region.name != target_orgion if target_region
+    region.elasticache_node_types.each do |t|
+      line = "#{region.name},#{t.name},#{t.api_name},#{t.memory_in_mb},#{t.virtual_cores},"
+      [:memcached].each do |cache|
+        line += "#{t.price_per_hour(cache, :ondemand)},"
+      end
+      [:year1, :year3].each do |term|
+        [:partialupfront].each do |res_type|
+          [:memcached].each do |cache|
+            line += "#{t.prepay(cache, res_type, term)},#{t.price_per_hour(cache, res_type, term)},"
+          end
+        end
+      end
+      puts line.chop
+    end
+  end
+end
+
 def print_rds_table(pricing, target_region = nil)
   line = "Region,Instance Type,API Name,Memory (MB),Disk (GB),Compute Units,Virtual Cores,Disk Type,"
 

data/lib/amazon-pricing.rb

@@ -10,3 +10,4 @@ require 'amazon-pricing/ec2-price-list'
 require 'amazon-pricing/ec2-di-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

@@ -97,9 +97,10 @@ module AwsPricing
     #  region
     #end
 
-    EC2_BASE_URL = "http://a0.awsstatic.com/pricing/1/ec2/"
-    EBS_BASE_URL = "http://a0.awsstatic.com/pricing/1/ebs/"
-    RDS_BASE_URL = "http://a0.awsstatic.com/pricing/1/rds/"
+    EC2_BASE_URL         = "http://a0.awsstatic.com/pricing/1/ec2/"
+    EBS_BASE_URL         = "http://a0.awsstatic.com/pricing/1/ebs/"
+    RDS_BASE_URL         = "http://a0.awsstatic.com/pricing/1/rds/"
+    ELASTICACHE_BASE_URL = "http://a0.awsstatic.com/pricing/1/elasticache/"
 
     DI_OD_BASE_URL = "http://a0.awsstatic.com/pricing/1/dedicated-instances/"
     RESERVED_DI_BASE_URL = "http://a0.awsstatic.com/pricing/1/ec2/ri-v2/"
@@ -129,4 +130,4 @@ module AwsPricing
   end
 
 
-end
+end

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

@@ -0,0 +1,16 @@
+#--
+# Amazon Web Services Pricing Ruby library
+#
+# Ruby Gem Name::  amazon-pricing
+# Author::    Joe Kinsella (mailto:joe.kinsella@gmail.com)
+# Copyright:: Copyright (c) 2011-2013 CloudHealth
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/CloudHealth/amazon-pricing
+#++
+
+require 'amazon-pricing/definitions/category-type'
+
+module AwsPricing
+  class Cache < CategoryType
+  end
+end

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

@@ -0,0 +1,74 @@
+require 'amazon-pricing/definitions/instance-type'
+
+module AwsPricing
+  class ElastiCacheNodeType < InstanceType
+
+    def initialize(region, api_name, name)
+      @category_types = {}
+      
+      @region   = region
+      @name     = name
+      @api_name = api_name
+
+      api_name_for_lookup = api_name.sub("cache.", "")
+      
+      @memory_in_mb  = InstanceType.get_memory(api_name)
+      @virtual_cores = InstanceType.get_virtual_cores(api_name_for_lookup)
+    end
+
+    def available?(cache_type = :memcached, type_of_instance = :ondemand)
+      cache = get_category_type(cache_type)
+      return false if cache.nil?
+      cache.available?(type_of_instance)
+    end
+
+    def update_pricing(cache_type, type_of_instance, json)
+      cache = get_category_type(cache_type)
+      if cache.nil?
+        cache = Cache.new(self, cache_type)
+        @category_types[cache_type] = cache
+      end
+      
+      if type_of_instance == :ondemand
+        values = ElastiCacheNodeType::get_values(json, cache_type)
+        price = coerce_price(values[cache_type.to_s])
+        cache.set_price_per_hour(type_of_instance, nil, price)
+      else
+        json['valueColumns'].each do |val|
+
+          if val['prices']['USD'].empty?
+            next
+          end
+
+          price = coerce_price(val['prices']['USD'])
+
+          case val['name']
+          when "yrTerm1"
+            cache.set_prepay(type_of_instance, :year1, price)
+          when "yrTerm3"
+            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)
+          end
+        end
+      end
+    end
+
+    protected
+
+    def self.get_name(instance_type, api_name, is_reserved = false)
+      api_name.sub!(" *", "")
+
+      unless @@Name_Lookup.has_key? api_name
+        raise UnknownTypeError, "Unknown instance type #{instance_type} #{api_name}", caller
+      end
+
+      name = @@Name_Lookup.has_key? api_name
+
+      [api_name, name]
+    end
+                       
+  end
+end

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

@@ -86,6 +86,7 @@ module AwsPricing
       case category
         when 'os'; 'ec2'
         when 'db'; 'rds'
+        when 'cache'; 'elasticache'
         else
           ''
       end
@@ -253,10 +254,18 @@ module AwsPricing
     }
 
     # NOTE: These are populated by "populate_lookups"
-    #       But... AWS does not always provide memory info (e.g. t2, r3), so those are hardcoded below
+    #       But... AWS does not always provide memory info (e.g. t2, r3, cache.*), so those are hardcoded below
     @@Memory_Lookup = {
+      'cache.r3.large' => 13500, 'cache.r3.xlarge' => 28400, 'cache.r3.2xlarge' => 58200, 'cache.r3.4xlarge' => 118000, 'cache.r3.8xlarge' => 237000,
       'r3.large' => 15250, 'r3.xlarge' => 30500, 'r3.2xlarge' => 61000, 'r3.4xlarge' => 122000, 'r3.8xlarge' => 244000,
+      'cache.m3.medium' => 2780, 'cache.m3.large' => 6050, 'cache.m3.xlarge' => 13300, 'cache.m3.2xlarge' => 27900,
       't2.micro' => 1000, 't2.small' => 2000, 't2.medium' => 4000, 't2.large' => 8000,
+      'cache.t2.micro' => 555, 'cache.t2.small' =>  1550, 'cache.t2.medidium' => 3220,
+      
+      'cache.m1.small' => 1300, 'cache.m1.medium' => 3350, 'cache.m1.large' => 7100, 'cache.m1.xlarge' => 14600,
+      'cache.m2.xlarge' => 16700, 'cache.m2.2xlarge' => 33800, 'cache.m2.4xlarge' => 68000,
+      'cache.c1.xlarge' => 6600,
+      'cache.t1.micro' => 213,
     }
     @@Virtual_Cores_Lookup = {
       'r3.large' => 2, 'r3.xlarge' => 4, 'r3.2xlarge' => 8, 'r3.4xlarge' => 16, 'r3.8xlarge' => 32,

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

@@ -15,12 +15,13 @@ module AwsPricing
   # e.g. us-east, us-west
   #
   class Region
-    attr_accessor :name, :ebs_price, :ec2_instance_types, :rds_instance_types
+    attr_accessor :name, :ebs_price, :ec2_instance_types, :rds_instance_types, :elasticache_node_types
 
     def initialize(name)
       @name = name
-      @ec2_instance_types = {}
-      @rds_instance_types = {}
+      @ec2_instance_types     = {}
+      @rds_instance_types     = {}
+      @elasticache_node_types = {}
     end
 
     # Maintained for backward compatibility reasons (retrieves EC2 instance type)
@@ -36,6 +37,10 @@ module AwsPricing
       @rds_instance_types.values
     end
 
+    def elasticache_node_types
+      @elasticache_node_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
@@ -64,6 +69,15 @@ module AwsPricing
       current
     end
 
+    def add_or_update_elasticache_node_type(api_name, name)
+      current = get_elasticache_node_type(api_name)
+      if current.nil?
+        current = ElastiCacheNodeType.new(self, api_name, name)
+        @elasticache_node_types[api_name] = 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)
@@ -77,6 +91,10 @@ module AwsPricing
       @rds_instance_types[api_name]
     end
 
+    def get_elasticache_node_type(api_name)
+      @elasticache_node_types[api_name]
+    end
+
   end
 
-end
+end

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

@@ -0,0 +1,89 @@
+module AwsPricing
+  class ElastiCachePriceList < PriceList
+
+    def initialize
+      super
+      get_elasticache_on_demand_node_pricing
+      get_elasticache_reserved_node_pricing
+    end
+
+    protected
+
+    # for now all engines have the save cost
+    @@CACHE_TYPES = [:memcached]
+    
+    def get_elasticache_on_demand_node_pricing
+      od_url = ELASTICACHE_BASE_URL + "pricing-standard-deployments-elasticache.min.js"
+      od_legacy_url = ELASTICACHE_BASE_URL + "previous-generation/pricing-standard-deployments-elasticache.min.js"
+      @@CACHE_TYPES.each do |type|
+        fetch_on_demand_elasticache_node_pricing(od_url, type)
+
+        # fetch again for legacy prices
+        fetch_on_demand_elasticache_node_pricing(od_legacy_url, type)
+      end
+    end
+
+    def get_elasticache_reserved_node_pricing
+      rc_url = ELASTICACHE_BASE_URL + "pricing-elasticache-heavy-standard-deployments.min.js"
+      rc_legacy_url =  ELASTICACHE_BASE_URL + "previous-generation/pricing-elasticache-heavy-standard-deployments.min.js"
+      @@CACHE_TYPES.each do |type|
+        fetch_reserved_elasticache_node_pricing(rc_url, type)
+
+        # fetch again for legacy prices
+        fetch_reserved_elasticache_node_pricing(rc_legacy_url, type)
+      end
+    end
+
+    def fetch_on_demand_elasticache_node_pricing(url, cache_type)
+      res = PriceList.fetch_url(url)
+      res['config']['regions'].each do |reg|
+        region_name = reg['region']
+        region = get_region(region_name)
+        if region.nil?
+          $stderr.puts "[fetch_elasticache_od_node_pricing] WARNING: unable to find region #{region_name}"
+          next
+        end # region.nil?
+
+        reg['types'].each do |type|
+          name = type['name']
+          
+          type['tiers'].each do |tier|
+            begin
+              api_name = tier['name']
+              node_type = region.add_or_update_elasticache_node_type(api_name, name)
+              node_type.update_pricing(cache_type, :ondemand, tier)
+            rescue UnknownTypeError
+              $stderr.puts "[fetch_on_demand_elasticache_node_pricing] WARNING: encountered #{$!.message}"
+            end # begin
+          end # do |tier|
+        end # do |type|
+      end # do |reg|
+    end
+
+    def fetch_reserved_elasticache_node_pricing(url, cache_type)
+      res = PriceList.fetch_url(url)
+      res['config']['regions'].each do |reg|
+        region_name = reg['region']
+        region = get_region(region_name)
+        if region.nil?
+          $stderr.puts "[fetch_elasticache_rc_node_pricing] WARNING: unable to find region #{region_name}"
+          next
+        end #region.nil?
+        
+        reg['instanceTypes'].each do |type|
+          name = type['generation']
+          type['tiers'].each do |tier|
+            begin
+              api_name = tier['size']
+              node_type = region.add_or_update_elasticache_node_type(api_name, name)
+              node_type.update_pricing(cache_type, :partialupfront, tier)
+            rescue UnknownTypeError
+              $stderr.puts "[fetch_reserved_rds_instance_pricing] WARNING: encountered #{$!.message}"
+            end
+          end # do |tier|
+        end # do |type|
+      end # do |reg|
+    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.65'
+  VERSION = '0.1.66'
 end

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

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe AwsPricing::ElastiCachePriceList do
+  before(:all) do
+    @pricing = AwsPricing::ElastiCachePriceList.new
+    @node_types = [:memcached]
+  end
+  
+  describe 'new' do
+    it 'ElastiCachePriceList.new should return the valid response' do
+      @pricing.regions.each do |region|
+        # Result have valid node name
+        expect(@node_types).to include(region.elasticache_node_types.first.category_types.first.name)
+        # values should not be nil
+        region.elasticache_node_types.first.category_types.first.ondemand_price_per_hour.should_not be_nil
+        # other prices per hour
+        region.elasticache_node_types.first.category_types.first.partialupfront_prepay_1_year.should_not be_nil
+        region.elasticache_node_types.first.category_types.first.partialupfront_prepay_3_year.should_not be_nil
+        region.elasticache_node_types.first.category_types.first.partialupfront_price_per_hour_1_year.should_not be_nil
+        region.elasticache_node_types.first.category_types.first.partialupfront_price_per_hour_3_year.should_not be_nil
+      end
+    end
+  end
+
+  describe '::get_api_name' do
+    it "raises an UnknownTypeError on an unexpected instance type" do
+      expect {
+        AwsPricing::ElastiCacheNodeType::get_name 'IDK', 'MoreIDK'
+      }.to raise_error(AwsPricing::UnknownTypeError)
+    end
+  end
+
+  describe 'get_breakeven_months' do
+    it "test_fetch_all_breakeven_months" do 
+      @pricing.regions.each do |region|
+        region.elasticache_node_types.each do |node|
+          [:year1, :year3].each do |term|
+            [:partialupfront].each do |res_type|
+              [:memcached].each do |cache|
+                node.get_breakeven_month(cache, res_type, term).should_not be_nil
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.65
+  version: 0.1.66
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -35,10 +35,12 @@ files:
 - lib/amazon-pricing.rb
 - lib/amazon-pricing/aws-price-list.rb
 - lib/amazon-pricing/common/ec2_common.rb
+- lib/amazon-pricing/definitions/cache-type.rb
 - 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-instance-type.rb
+- lib/amazon-pricing/definitions/elasticache_node_type.rb
 - lib/amazon-pricing/definitions/instance-type.rb
 - lib/amazon-pricing/definitions/operating-system.rb
 - lib/amazon-pricing/definitions/rds-instance-type.rb
@@ -46,10 +48,12 @@ files:
 - lib/amazon-pricing/dynamo-db-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
 - lib/amazon-pricing/helpers/instance-type.rb
 - 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/elasticache_pricing_spec.rb
 - spec/lib/amazon-pricing/rds_pricing_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitignore
@@ -80,9 +84,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 2.3.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
-test_files: []
-has_rdoc: 
+test_files:
+- spec/lib/amazon-pricing/definitions/database-type_spec.rb
+- spec/lib/amazon-pricing/elasticache_pricing_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