amazon-pricing 0.1.14 → 0.1.15

data/lib/amazon-pricing/database-type.rb

@@ -13,6 +13,8 @@ module AwsPricing
   	@@Database_Name_Lookup = {
 	    'mysql_standard'=> 'MySQL Community Edition',
 		'mysql_multiaz'=> 'MySQL Community Edition (Multi-AZ)',
+		'postgresql_standard'=> 'PostgreSql Community Edition(Beta)',
+		'postgresql_multiaz'=> 'PostgreSql Community Edition(Beta) (Multi-AZ)',
 		'oracle_se1_standard'=> 'Oracle Database Standard Edition One',
 		'oracle_se1_multiaz'=> 'Oracle Database Standard Edition One (Multi-AZ)',
 		'oracle_se1_byol'=> 'Oracle Database Standard Edition One (BYOL)',
@@ -30,6 +32,7 @@ module AwsPricing
 
 	  @@DB_Deploy_Types = {
 	  	:mysql=>[:standard, :multiaz],
+	  	:postgresql=>[:standard, :multiaz],
 	  	:oracle_se1=>[:standard, :multiaz, :byol, :byol_multiaz],
 	  	:oracle_se=>[:byol, :byol_multiaz],
 	  	:oracle_ee=>[:byol, :byol_multiaz],
@@ -42,7 +45,7 @@ module AwsPricing
   	end
 
   	def self.get_database_name
-  		[:mysql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web, :sqlserver_se, :sqlserver_ee]
+  		[:mysql, :postgresql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web, :sqlserver_se, :sqlserver_ee]
   	end
 
   	def self.get_available_types(db)

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

@@ -77,9 +77,9 @@ module AwsPricing
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
     # term = :year_1, :year_3, nil
-    def get_breakeven_month(category_types, type_of_instance, term)
-      os = get_category_type(category_types)
-      os.get_breakeven_month(type_of_instance, term)
+    def get_breakeven_month(category_types, type_of_instance, term, is_multi_az = false, isByol = false)
+      cat = get_category_type(category_types, is_multi_az, isByol)
+      cat.get_breakeven_month(type_of_instance, term) unless cat.nil?
     end
 
     protected

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

@@ -3,6 +3,13 @@ module AwsPricing
   class RdsInstanceType < InstanceType
     # database_type = :mysql, :oracle, :sqlserver
     # type_of_instance = :ondemand, :light, :medium, :heavy
+
+    def available?(database_type = :mysql, type_of_instance = :ondemand, is_multi_az, is_byol)
+      db = get_category_type(database_type, is_multi_az, is_byol)
+      return false if db.nil?
+      db.available?(type_of_instance)
+    end
+
     def update_pricing(database_type, type_of_instance, json, is_multi_az, is_byol)
       db = get_category_type(database_type, is_multi_az, is_byol)
       if db.nil?

data/lib/amazon-pricing/version.rb

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

data/lib/amazon-pricing.rb

@@ -147,11 +147,12 @@ module AwsPricing
 
     protected
 
-    @@DB_TYPE = [:mysql, :oracle, :sqlserver]
+    @@DB_TYPE = [:mysql, :postgresql, :oracle, :sqlserver]
     @@RES_TYPES = [:light, :medium, :heavy]
     
     @@OD_DB_DEPLOY_TYPE = {
                            :mysql=> {:mysql=>["standard","multiAZ"]},
+                           :postgresql=> {:postgresql=>["standard","multiAZ"]},
                            :oracle=> {:oracle_se1=>["li-standard","li-multiAZ","byol-standard","byol-multiAZ"], :oracle_se=>["byol-standard","byol-multiAZ"], :oracle_ee=>["byol-standard","byol-multiAZ"]},
                            :sqlserver=> {:sqlserver_ex=>["li-ex"], :sqlserver_web=>["li-web"], :sqlserver_se=>["li-se", "byol"], :sqlserver_ee=>["byol"]}
                         }
@@ -181,7 +182,7 @@ module AwsPricing
             # to find out the byol type
             is_byol = is_byol? dp_type
 
-            if db == :mysql or db == :oracle
+            if [:mysql, :postgresql, :oracle].include? db
               fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.json",:ondemand, db_type, is_byol)
             elsif db == :sqlserver
               fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.json",:ondemand, db_type, is_byol)
@@ -193,9 +194,13 @@ module AwsPricing
 
     def get_rds_reserved_instance_pricing
        @@DB_TYPE.each do |db|
-        if db == :mysql
+        if [:mysql, :postgresql].include? db
           @@RES_TYPES.each do |res_type|
-            fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.json", res_type, db, false)
+            if db == :postgresql and res_type == :heavy
+              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.json", res_type, db, false)
+            elsif db == :mysql
+              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.json", res_type, db, false)
+            end            
           end
         else
           @@RESERVED_DB_DEPLOY_TYPE[db].each {|db_type, db_instance|

data/spec/rds-amazon-pricing-spec.rb

@@ -1,4 +1,5 @@
 require 'amazon-pricing'
+require File.join('amazon-pricing', 'database-type')
 
 describe AwsPricing::RdsPriceList do
 
@@ -27,8 +28,42 @@ describe AwsPricing::RdsPriceList do
   describe '::get_api_name' do
     it "raises an UnknownTypeError on an unexpected instance type" do
       expect {
-        AwsPricing::InstanceType::get_name 'QuantumODI', 'huge'
+        AwsPricing::RdsInstanceType::get_name 'QuantumODI', 'huge'
       }.to raise_error(AwsPricing::UnknownTypeError)
     end
   end
+
+  describe 'get_breakeven_months' do 
+    it "test_fetch_all_breakeven_months" do
+      pricing = AwsPricing::RdsPriceList.new
+      pricing.regions.each do |region|
+        region.rds_instance_types.each do |instance|
+          [:year1, :year3].each do |term|
+             [:light, :medium, :heavy].each do |res_type|
+               [:mysql, :postgresql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_se, :sqlserver_ee].each do |db|
+                  if db == :postgresql
+                    if :heavy
+                      AwsPricing::DatabaseType.get_available_types(db).each do |deploy_type|
+                        next if not instance.available?(db, res_type, deploy_type == :multiaz, false)
+                        instance.get_breakeven_month(db, res_type, term, deploy_type == :multiaz, false).should_not be_nil
+                      end
+                    end
+                  else
+                    AwsPricing::DatabaseType.get_available_types(db).each do |deploy_type|
+                      if deploy_type == :byol_multiaz
+                        next if not instance.available?(db, res_type, true, true)
+                        instance.get_breakeven_month(db, res_type, term, true, true).should_not be_nil
+                      else 
+                        next if not instance.available?(db, res_type, deploy_type == :multiaz, deploy_type == :byol)
+                        instance.get_breakeven_month(db, res_type, term, deploy_type == :multiaz, deploy_type == :byol).should_not be_nil
+                      end  
+                    end
+                  end                      
+               end
+             end
+          end          
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: