amazon-pricing 0.1.12 → 0.1.13

data/Rakefile

@@ -67,67 +67,72 @@ desc "Prints current RDS pricing in CSV format"
 task :print_rds_price_list do
   require 'amazon-pricing'
   pricing = AwsPricing::RdsPriceList.new
-
+  
   line = "Region,Instance Type,API Name,Memory (MB),Disk (GB),Compute Units,Virtual Cores,Disk Type,"
-
-
-  [:mysql, :oracle, :oracle_byol, :sqlserver, :sqlserver_express, :sqlserver_web, :sqlserver_byol].each do |db|
-    if [:mysql, :oracle, :oracle_byol].include? db
-      [:standard,:multiAZ].each do |deploy_type|
-        line += "OD #{db} #{deploy_type} PPH,"
+  
+  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|
+        line += "OD "+ AwsPricing::DatabaseType.display_name("#{db}_#{deploy_type}") +" PPH,"
       end
     else
-      line += "OD #{db} PPH,"
-    end  
+      line += "OD "+ AwsPricing::DatabaseType.display_name(db.to_s) +" PPH,"
+    end      
   end
 
-
   [:year1, :year3].each do |term|
-    [:light, :medium, :heavy].each do |res_type|
-      [:mysql, :oracle, :oracle_byol, :sqlserver, :sqlserver_express, :sqlserver_web, :sqlserver_byol].each do |db|
-        if [:mysql, :oracle, :oracle_byol].include? db
-          [:standard,:multiAZ].each do |deploy_type|
-            line += "#{term} #{res_type} #{deploy_type} #{db} Prepay,#{term} #{res_type} #{deploy_type} #{db} PPH,"
+   [:light, :medium, :heavy].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|
+              line += "#{term} #{res_type} "+ AwsPricing::DatabaseType.display_name("#{db}_#{deploy_type}") +" Prepay,#{term} #{res_type} "+ AwsPricing::DatabaseType.display_name("#{db}_#{deploy_type}") +" PPH,"
+            end
+          else
+            line += "#{term} #{res_type} "+ AwsPricing::DatabaseType.display_name(db.to_s) +" Prepay,#{term} #{res_type} "+ AwsPricing::DatabaseType.display_name(db.to_s) +" PPH,"
           end
-        else
-          line += "#{term} #{res_type} #{db} Prepay,#{term} #{res_type} #{db} PPH,"
-        end
-      end
-    end
+       end
+   end
   end
 
  
-  puts line.chop
-
-  pricing.regions.each do |region|
-    region.rds_instance_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},"
-      [:mysql, :oracle, :oracle_byol, :sqlserver, :sqlserver_express, :sqlserver_web, :sqlserver_byol].each do |db|
-         if [:mysql, :oracle, :oracle_byol].include? db
-            [:standard,:multiAZ].each do |deploy_type|
-              line += "#{t.price_per_hour(db, :ondemand, nil, deploy_type == :multiAZ)},"
-            end
-         else
-            line += "#{t.price_per_hour(db, :ondemand, nil, false)},"
-         end          
-      end
-
-      [:year1, :year3].each do |term|
-        [:light, :medium, :heavy].each do |res_type|
-          [:mysql, :oracle, :oracle_byol, :sqlserver, :sqlserver_express, :sqlserver_web, :sqlserver_byol].each do |db|
-            if [:mysql, :oracle, :oracle_byol].include? db
-              [:standard,:multiAZ].each do |deploy_type|
-                line += "#{t.prepay(db, res_type, term, deploy_type == :multiAZ)},#{t.price_per_hour(db, res_type, term, deploy_type == :multiAZ)},"
+ puts line.chop
+
+ pricing.regions.each do |region|
+   region.rds_instance_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},"
+     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|
+            if deploy_type == :byol_multiaz
+              line += "#{t.price_per_hour(db, :ondemand, nil, true, true)},"
+            else
+              line += "#{t.price_per_hour(db, :ondemand, nil, deploy_type == :multiaz, deploy_type == :byol)},"
+            end  
+          end
+       else
+          line += "#{t.price_per_hour(db, :ondemand, nil)},"
+       end
+     end
+     [:year1, :year3].each do |term|
+       [:light, :medium, :heavy].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|
+                if deploy_type == :byol_multiaz
+                  line += "#{t.prepay(db, res_type, term, true, true)},#{t.price_per_hour(db, res_type, term, true, true)},"
+                else  
+                  line += "#{t.prepay(db, res_type, term, deploy_type == :multiaz, deploy_type == :byol)},#{t.price_per_hour(db, res_type, term, deploy_type == :multiaz, deploy_type == :byol)},"
+                end  
               end
             else
-              line += "#{t.prepay(db, res_type, term, false)},#{t.price_per_hour(db, res_type, term, false)},"
+              line += "#{t.prepay(db, res_type, term)},#{t.price_per_hour(db, res_type, term)},"
             end
-          end
-        end
-      end
-      puts line.chop
-    end
-  end
+         end
+       end
+     end
+     puts line.chop
+   end
+ end
 end
 
 task :default => [:test]

data/lib/amazon-pricing.rb

@@ -137,8 +137,6 @@ module AwsPricing
 
   end
 
-
-
   class RdsPriceList < PriceList
     
     def initialize
@@ -154,30 +152,39 @@ module AwsPricing
     
     @@OD_DB_DEPLOY_TYPE = {
                            :mysql=> {:mysql=>["standard","multiAZ"]},
-                           :oracle=> {:oracle=>["li-standard","li-multiAZ"], :oracle_byol=>["byol-standard","byol-multiAZ"]},
-                           :sqlserver=> {:sqlserver=>["li-se"], :sqlserver_express=>["li-ex"], :sqlserver_web=>["li-web"], :sqlserver_byol=>["byol"]}
+                           :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"]}
                         }
 
 
     @@RESERVED_DB_DEPLOY_TYPE = {
-                           :oracle=> {:oracle=>"li", :oracle_byol=>"byol"},
-                           :sqlserver=> {:sqlserver=>"li-se", :sqlserver_express=>"li-ex", :sqlserver_web=>"li-web", :sqlserver_byol=>"byol"}
+                           :oracle=> {:oracle_se1=>["li","byol"], :oracle_se=>["byol"], :oracle_ee=>["byol"]},
+                           :sqlserver=> {:sqlserver_ex=>["li-ex"], :sqlserver_web=>["li-web"], :sqlserver_se=>["li-se","byol"], :sqlserver_ee=>["byol"]}
                           }
 
     
     def is_multi_az?(type)
       return true if type.match("multiAZ")
       false
+    end
+
+    def is_byol?(type)
+      return true if type.match("byol")
+      false
     end                                  
 
     def get_rds_on_demand_instance_pricing
       @@DB_TYPE.each do |db|
         @@OD_DB_DEPLOY_TYPE[db].each {|db_type, db_instances|
           db_instances.each do |dp_type|
+            #
+            # to find out the byol type
+            is_byol = is_byol? dp_type
+
             if db == :mysql or db == :oracle
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.json",:ondemand, db_type)
+              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)
+              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.json",:ondemand, db_type, is_byol)
             end
           end
         }
@@ -188,20 +195,26 @@ module AwsPricing
        @@DB_TYPE.each do |db|
         if db == :mysql
           @@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)
+            fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.json", res_type, db, false)
           end
         else
           @@RESERVED_DB_DEPLOY_TYPE[db].each {|db_type, db_instance|
             @@RES_TYPES.each do |res_type|
-              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{db_instance}-#{res_type}-utilization-reserved-instances.json", res_type, db_type) if db == :oracle
-              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{db_instance}-#{res_type}-ri.json", res_type, db_type) if db == :sqlserver           
+              db_instance.each do |dp_type|
+                is_byol = is_byol? dp_type
+                if db == :oracle
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.json", res_type, db_type, is_byol) 
+                elsif db == :sqlserver
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-#{res_type}-ri.json", res_type, db_type, is_byol)
+                end
+              end    
             end            
           }
         end
       end
     end
 
-    def fetch_on_demand_rds_instance_pricing(url, type_of_rds_instance, db_type)
+    def fetch_on_demand_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol)
       res = fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -212,22 +225,22 @@ module AwsPricing
               #
               # this is special case URL, it is oracle - multiAZ type of deployment but it doesn't have mutliAZ attributes in json.
               if url == "http://aws.amazon.com/rds/pricing/oracle/pricing-li-multiAZ-deployments.json"
-                isMultiAz = true
+                is_multi_az = true
               else
-                isMultiAz = is_multi_az? type["name"]
+                is_multi_az = is_multi_az? type["name"]
               end              
               api_name, name = RdsInstanceType.get_name(type["name"], tier["name"], type_of_rds_instance != :ondemand)
               
-              region.add_or_update_rds_instance_type(api_name, name, db_type, type_of_rds_instance, tier, isMultiAz)
+              region.add_or_update_rds_instance_type(api_name, name, db_type, type_of_rds_instance, tier, is_multi_az, is_byol)
             rescue UnknownTypeError
               $stderr.puts "WARNING: encountered #{$!.message}"
             end
           end
-        end
+        end                        
       end
     end
 
-    def fetch_reserved_rds_instance_pricing(url, type_of_rds_instance, db_type)
+    def fetch_reserved_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol)
       res = fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -235,10 +248,10 @@ module AwsPricing
         reg['instanceTypes'].each do |type|
           type['tiers'].each do |tier|
             begin
-                isMultiAz = is_multi_az? type["type"]
+                is_multi_az = is_multi_az? type["type"]
                 api_name, name = RdsInstanceType.get_name(type["type"], tier["size"], true)
                 
-                region.add_or_update_rds_instance_type(api_name, name, db_type, type_of_rds_instance, tier, isMultiAz)
+                region.add_or_update_rds_instance_type(api_name, name, db_type, type_of_rds_instance, tier, is_multi_az, is_byol)
             rescue UnknownTypeError
               $stderr.puts "WARNING: encountered #{$!.message}"
             end
@@ -247,6 +260,4 @@ module AwsPricing
       end
     end                              
   end
-
-
 end

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

@@ -16,7 +16,7 @@ module AwsPricing
       :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year
 
 
-    def initialize(instance_type, name)
+    def initialize(instance_type=nil, name=nil)
       @instance_type = instance_type
       @name = name
     end

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

@@ -9,5 +9,48 @@
 #++
 module AwsPricing
   class DatabaseType < CategoryType
+
+  	@@Database_Name_Lookup = {
+	    'mysql_standard'=> 'MySQL Community Edition',
+		'mysql_multiaz'=> 'MySQL Community Edition (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)',
+		'oracle_se1_byol_multiaz'=> 'Oracle Database Standard Edition One (BYOL Multi-AZ)',
+		'oracle_se_byol'=> 'Oracle Database Standard Edition (BYOL)',
+		'oracle_se_byol_multiaz'=> 'Oracle Database Standard Edition (BYOL Multi-AZ)',
+		'oracle_ee_byol'=> 'Oracle Database Enterprise Edition (BYOL)',
+		'oracle_ee_byol_multiaz'=> 'Oracle Database Enterprise Edition (BYOL Multi-AZ)',
+		'sqlserver_ex'=> 'Microsoft SQL Server Express Edition',
+		'sqlserver_web'=> 'Microsoft SQL Server Web Edition',
+		'sqlserver_se_standard'=> 'Microsoft SQL Server Standard Edition',
+		'sqlserver_se_byol'=> 'Microsoft SQL Server Standard Edition (BYOL)',
+		'sqlserver_ee_byol'=> 'Microsoft SQL Server Enterprise Edition (BYOL)'	
+	  }
+
+	  @@DB_Deploy_Types = {
+	  	:mysql=>[:standard, :multiaz],
+	  	:oracle_se1=>[:standard, :multiaz, :byol, :byol_multiaz],
+	  	:oracle_se=>[:byol, :byol_multiaz],
+	  	:oracle_ee=>[:byol, :byol_multiaz],
+	  	:sqlserver_se=>[:standard, :byol],
+	  	:sqlserver_ee=>[:byol]
+	  }
+
+  	def self.display_name(name)
+	  @@Database_Name_Lookup[name]
+  	end
+
+  	def self.get_database_name
+  		[:mysql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web, :sqlserver_se, :sqlserver_ee]
+  	end
+
+  	def self.get_available_types(db)
+  		@@DB_Deploy_Types[db]	
+  	end
+
+  	def display_name
+		self.class.display_name(name)
+	end
   end
 end

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

@@ -49,9 +49,13 @@ module AwsPricing
       @category_types.values
     end
 
-    def get_category_type(name, multiAz = false)
-      if multiAz
-        db = @category_types["#{name}_multiAz"]
+    def get_category_type(name, multi_az = false, byol = false)
+      if multi_az == true and byol == true
+        db = @category_types["#{name}_byol_multiaz"]
+      elsif multi_az == true and byol == false
+        db = @category_types["#{name}_multiaz"]
+      elsif multi_az == false and byol == true
+        db = @category_types["#{name}_byol"]
       else
         db = @category_types[name]
       end      
@@ -59,15 +63,15 @@ module AwsPricing
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
     # term = :year_1, :year_3, nil
-    def price_per_hour(category_type, type_of_instance, term = nil, isMultiAz = false)
-      cat = get_category_type(category_type, isMultiAz)
+    def price_per_hour(category_type, type_of_instance, term = nil, is_multi_az = false, isByol = false)
+      cat = get_category_type(category_type, is_multi_az, isByol)
       cat.price_per_hour(type_of_instance, term) unless cat.nil?      
     end
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
     # term = :year_1, :year_3, nil
-    def prepay(category_type, type_of_instance, term = nil, isMultiAz = false)
-      cat = get_category_type(category_type, isMultiAz)
+    def prepay(category_type, type_of_instance, term = nil, is_multi_az = false, isByol = false)
+      cat = get_category_type(category_type, is_multi_az, isByol)
       cat.prepay(type_of_instance, term) unless cat.nil?      
     end
 

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

@@ -3,15 +3,21 @@ module AwsPricing
   class RdsInstanceType < InstanceType
     # database_type = :mysql, :oracle, :sqlserver
     # type_of_instance = :ondemand, :light, :medium, :heavy
-    def update_pricing(database_type, type_of_instance, json, isMultiAz)
-      db = get_category_type(database_type, isMultiAz)
+    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?
         db = DatabaseType.new(self, database_type)        
-        if isMultiAz
-          @category_types["#{database_type}_multiAz"] = db
+        
+        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    
+
       end
 
       if type_of_instance == :ondemand

data/lib/amazon-pricing/region.rb

@@ -56,13 +56,13 @@ module AwsPricing
       current
     end
 
-    def add_or_update_rds_instance_type(api_name, name, db_type, type_of_instance, json, isMultiAz)
+    def add_or_update_rds_instance_type(api_name, name, db_type, type_of_instance, json, is_multi_az, is_byol)
       current = get_rds_instance_type(api_name)
       if current.nil?
         current = RdsInstanceType.new(self, api_name, name)
         @rds_instance_types[api_name] = current
       end
-      current.update_pricing(db_type, type_of_instance, json, isMultiAz)
+      current.update_pricing(db_type, type_of_instance, json, is_multi_az, is_byol)
       current
     end
 

data/lib/amazon-pricing/version.rb

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

metadata

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