Updating tests to catch issue with pricing getting reversed for GovCloud

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

@@ -1,6 +1,12 @@
 require 'amazon-pricing/instance-type'
 module AwsPricing
   class Ec2InstanceType < InstanceType
+
+    # Returns OperatingSystem pricing
+    # e.g. :linux
+    def get_operating_system(type)
+      get_category_type(type)
+    end
 
     # Returns whether an instance_type is available. 
     # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb

test/govcloud_test.rb

@@ -23,20 +23,20 @@ def startup
   end
 
   def test_cc8xlarge_issue
-    obj = @@ec2_pricing.get_instance_type('us-gov-west-1', 'cc2.8xlarge')
-    assert obj.api_name == 'cc2.8xlarge'
+    obj = @@ec2_pricing.get_instance_type('us-gov-west-1', 'm3.large')
+    assert obj.api_name == 'm3.large'
   end
 
   def test_memory
     # Validate instance types in specific regions are available
     region = @@ec2_pricing.get_region('us-gov-west-1')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     assert instance.memory_in_mb == 7500
   end
 
   def test_virtual_cores
     region = @@ec2_pricing.get_region('us-gov-west-1')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     assert instance.virtual_cores == 2
   end
 
@@ -49,4 +49,14 @@ def test_ebs
     assert region.ebs_price.s3_snaps_per_gb == 0.125
   end
 
+  # Defect found in which ordering of price per hour and upfront get reversed
+  def test_ri_pricing
+    region = @@ec2_pricing.get_region('us-gov-west-1')
+    instance = region.get_ec2_instance_type('m3.large')
+    os = instance.get_operating_system(:linux)
+    assert os.ondemand_price_per_hour == 0.168
+    assert os.light_prepay_1_year == 300.0
+    assert os.light_price_per_hour_1_year == 0.167
+  end
+
 end