amazon-pricing 0.1.62 → 0.1.63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.62)
+    amazon-pricing (0.1.63)
       mechanize (~> 2.7.2)
 
 GEM

data/Rakefile

@@ -102,7 +102,7 @@ def print_rds_table(pricing, target_region = nil)
   end
 
   [:year1, :year3].each do |term|
-   [:light, :medium, :heavy].each do |res_type|
+   [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
        AwsPricing::DatabaseType.get_database_name.each do |db|
           unless AwsPricing::DatabaseType.get_available_types(db).nil?
             AwsPricing::DatabaseType.get_available_types(db).each do |deploy_type|
@@ -136,7 +136,7 @@ def print_rds_table(pricing, target_region = nil)
         end
       end
       [:year1, :year3].each do |term|
-       [:light, :medium, :heavy].each do |res_type|
+       [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
          AwsPricing::DatabaseType.get_database_name.each do |db|
             unless AwsPricing::DatabaseType.get_available_types(db).nil?
               AwsPricing::DatabaseType.get_available_types(db).each do |deploy_type|

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

@@ -81,12 +81,47 @@ module AwsPricing
           when "yearTerm1Hourly"
             db.set_price_per_hour(type_of_instance, :year1, price)
           when "yearTerm3Hourly"
-            db.set_price_per_hour(type_of_instance, :year3, price)  
+            db.set_price_per_hour(type_of_instance, :year3, price)
           end
         end
       end
     end
 
+    def update_pricing_new(database_type, type_of_instance, prices, term = nil, is_multi_az, is_byol)
+      db = get_category_type(database_type, is_multi_az, is_byol)
+      if db.nil?
+        db = DatabaseType.new(self, database_type)
+
+        if is_multi_az == true and is_byol == true
+          @category_types["#{database_type}_byol_multiaz"] = db
+        elsif is_multi_az == true and is_byol == false
+          @category_types["#{database_type}_multiaz"] = db
+        elsif is_multi_az == false and is_byol == true
+          @category_types["#{database_type}_byol"] = db
+        else
+          @category_types[database_type] = db
+        end
+
+      end
+
+      terms_to_years = {
+          "yrTerm1" => :year1,
+          "yrTerm3" => :year3
+      }
+      years = terms_to_years[term]
+      prices.each do |price|
+        p = price['prices']['USD']
+        case price['name']
+          when 'upfront'
+            db.set_prepay(type_of_instance, years, p.to_f) unless type_of_instance == :noupfront || p == "N/A"
+          when 'monthlyStar'
+            db.set_price_per_hour(type_of_instance, years, p.to_f * 12 / 365 / 24) unless type_of_instance == :allupfront || p == "N/A"
+          else
+            # Do nothing for other names
+        end
+      end
+    end
+
     def update_pricing2(database_type, type_of_instance, is_multi_az, is_byol, ondemand_pph = nil, year1_prepay = nil, year3_prepay = nil, year1_pph = nil, year3_pph = nil)
       db = get_category_type(database_type, is_multi_az, is_byol)
       if db.nil?

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

@@ -5,6 +5,7 @@ module AwsPricing
       super
       InstanceType.populate_lookups
       get_rds_on_demand_instance_pricing
+      get_rds_reserved_instance_pricing2
       get_rds_reserved_instance_pricing
     end
 
@@ -34,6 +35,22 @@ module AwsPricing
       :sqlserver=> {:sqlserver_ex=>["li-ex"], :sqlserver_web=>["li-web"], :sqlserver_se=>["li-se","byol"], :sqlserver_ee=>["byol"]}
     }
 
+    @@RESERVED_DB_DEPLOY_TYPE2 = {
+        :mysql => {:mysql=>["standard","multiAZ"]},
+        :postgresql => {:postgresql=>["standard","multiAZ"]},
+        :oracle => {:oracle_se1=>["license-included-standard", "license-included-multiAZ"],
+                    :oracle_se=>["byol-standard", "byol-multiAZ"]},
+        :sqlserver=> {:sqlserver_se=>["byol-standard", "byol-multiAZ"]}
+    }
+
+    @@RESERVED_DB_WITH_SAME_PRICING2 = {
+        :mysql => [:mysql],
+        :postgresql => [:postgresql],
+        :oracle_se1 => [:oracle_se1],
+        :oracle_se => [:oracle_se, :oracle_se1, :oracle_ee],
+        :sqlserver_se => [:sqlserver_se, :sqlserver_ee]
+    }
+
     def is_multi_az?(type)
       return true if type.upcase.match("MULTI-AZ")
       false
@@ -80,6 +97,60 @@ module AwsPricing
       end
     end
 
+    def get_rds_reserved_instance_pricing2
+      @@DB_TYPE.each do |db_name|
+        @@RESERVED_DB_DEPLOY_TYPE2[db_name].each do |db, deploy_types|
+          deploy_types.each do |deploy_type|
+            is_byol = is_byol? deploy_type
+            is_multi_az = deploy_type.upcase.include?("MULTIAZ")
+            db_str = db == :sqlserver_se ? 'sql-server-se' : db.to_s.gsub(/_/, '-')
+            dbs_with_same_pricing = @@RESERVED_DB_WITH_SAME_PRICING2[db]
+            fetch_reserved_rds_instance_pricing2(RDS_BASE_URL+"reserved-instances/#{db_str}-#{deploy_type}.min.js", dbs_with_same_pricing, is_multi_az, is_byol)
+          end
+        end
+      end
+    end
+
+    def fetch_reserved_rds_instance_pricing2(url, dbs, is_multi_az, is_byol)
+      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_reserved_rds_instance_pricing2] WARNING: unable to find region #{region_name}"
+          next
+        end
+        reg['instanceTypes'].each do |type|
+          api_name = type["type"]
+          instance_type = region.get_rds_instance_type(api_name)
+          if instance_type.nil?
+            $stderr.puts "[fetch_reserved_rds_instance_pricing2] WARNING: new reserved instances not found for #{api_name} in #{region_name}"
+            next
+          end
+
+          type["terms"].each do |term|
+            term["purchaseOptions"].each do |option|
+              case option["purchaseOption"]
+                when "noUpfront"
+                  reservation_type = :noupfront
+                when "allUpfront"
+                  reservation_type = :allupfront
+                when "partialUpfront"
+                  reservation_type = :partialupfront
+              end
+
+              duration = term["term"]
+              prices = option["valueColumns"]
+              dbs.each do |db|
+                instance_type.update_pricing_new(db, reservation_type, prices, duration, is_multi_az, is_byol)
+              end
+            end
+          end
+
+        end
+      end
+    end
+
     def get_rds_reserved_instance_pricing
        @@DB_TYPE.each do |db|
         if [:mysql, :postgresql].include? db

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.62
+  version: 0.1.63
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize