amazon-pricing 0.0.7 → 0.0.8

data/lib/amazon-pricing/region.rb

@@ -30,7 +30,7 @@ module AwsPricing
     end
 
     # reserved_usage_type = :light, :medium, :heavy
-    def ec2_reserved_instance_types(reserved_usage_type)
+    def ec2_reserved_instance_types(reserved_usage_type = nil)
       case reserved_usage_type
       when :light
         @_ec2_reserved_instance_types_light.values
@@ -38,6 +38,8 @@ module AwsPricing
         @_ec2_reserved_instance_types_medium.values
       when :heavy
         @_ec2_reserved_instance_types_heavy.values
+      else
+        @_ec2_reserved_instance_types_light.values << @_ec2_reserved_instance_types_medium.values << @_ec2_reserved_instance_types_heavy.values
       end
     end
 

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

@@ -50,7 +50,7 @@ module AwsPricing
         'hiMemResI' => {'xl' => 'm2.xlarge', 'xxl' => 'm2.2xlarge', 'xxxxl' => 'm2.4xlarge'},
         'hiCPUResI' => {'med' => 'c1.medium', 'xl' => 'c1.xlarge'},
         'clusterGPUResI' => {'xxxxl' => 'cg1.4xlarge'},
-        'clusterCompResI' => {'xxxxl' => 'cc1.4xlarge', 'xxxxxxxxl' => 'Cluster Compute Eight Extra Large'},
+        'clusterCompResI' => {'xxxxl' => 'cc1.4xlarge', 'xxxxxxxxl' => 'cc2.8xlarge'},
         'uResI' => {'u' => 't1.micro'},
       }
       @@Name_Lookup_Reserved = {

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/sonian/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/test-ec2-instance-types.rb

@@ -14,33 +14,36 @@ require File.dirname(__FILE__) + '/helper.rb'
 require 'test/unit'
 
 class TestEc2InstanceTypes < Test::Unit::TestCase
+  def test_cc8xlarge_issue
+    pricing = AwsPricing::PriceList.new
+    obj = pricing.get_instance_type('us-east-1d', :reserved, 'cc2.8xlarge', :medium)
+    puts obj.inspect
+    assert obj.api_name == 'cc2.8xlarge'
+  end
+
   def test_name_lookup
     pricing = AwsPricing::PriceList.new
     pricing.regions.each do |region|
       assert_not_nil region.name
       region.ec2_on_demand_instance_types.each do |instance_type|
-        puts "On-demand: #{instance_type.api_name}"
         assert_not_nil instance_type.api_name
         assert_not_nil instance_type.name
-        #assert instance_type.api_name != instance_type.name
+        assert instance_type.api_name != instance_type.name
       end
       region.ec2_reserved_instance_types(:light).each do |instance_type|
-        puts "Light: #{instance_type.api_name}"
         assert_not_nil instance_type.api_name
         assert_not_nil instance_type.name
-        #assert instance_type.api_name != instance_type.name
+        assert instance_type.api_name != instance_type.name
       end
       region.ec2_reserved_instance_types(:medium).each do |instance_type|
-        puts "Medium: #{instance_type.api_name}"
         assert_not_nil instance_type.api_name
         assert_not_nil instance_type.name
-        #assert instance_type.api_name != instance_type.name
+        assert instance_type.api_name != instance_type.name
       end
       region.ec2_reserved_instance_types(:heavy).each do |instance_type|
-        puts "Heavy: #{instance_type.api_name}"
         assert_not_nil instance_type.api_name
         assert_not_nil instance_type.name
-        #assert instance_type.api_name != instance_type.name
+        assert instance_type.api_name != instance_type.name
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-pricing
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Joe Kinsella