amazon-pricing 0.1.53 → 0.1.54

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE5NzY3ZTgxMWJiMzJlN2E5ZjEyN2U0YjZmYTQxODE5OGU0ZjY4Mw==
+    YTEzNzRlNDEyOWU3M2IyYmE0Y2IzMTc2ZTMwMjExYjA3OWQyOGJmZQ==
   data.tar.gz: !binary |-
-    NDkxOTg3NzlkMGVlNmEwNTRiNjUzZTVlYTlhYTUxMGE3NjYwMmZmYw==
+    YThhNmQ4MjM0ZjE3ZGY5MjQ1MzBhYzA5ZGE5ZDRiM2IyMDAyNzIxYQ==
 SHA512:
   metadata.gz: !binary |-
-    MWRlOWM5NDk2NzFjMzUxYzRjNWM3OTIwMTNkMzJmNWQ0OTQ2NzYxY2E3MWQ4
-    MDI2N2FjOWEwZmUzOTU4YjM4NGU4MzAyZjhkOTY3YzBhZjU1Zjc5NjM0NTMz
-    ZWUwZTU2MjIzZTFiNzFmMDgyYjg0MTg4MjQ4OTNmNGNlOGE2Mjk=
+    YmE3MmQ1NzMxZTlmZjNkZmJjMTE1Y2YwZmI3MTk2NDBmNjIyZjNmMzllMmNm
+    MjM2Mjg4ODhiOTkyMDVmMGRkNTc1OTc0YWU4MzMxYjk5OTg5YzEwN2RhMmM4
+    ZmQwMjQyODA0YTVhNzc2Y2Y3ZGM1M2UyZDBiNDBiNWRkMWY1YTg=
   data.tar.gz: !binary |-
-    YWQyYWI5MjcyYmVhOGIxYjE2NDIyMzFhNWFiMTYwZGUzMjllNDVhNDdjYWNk
-    NDQ4OGRhNzJkYTk2ZWQyOTgzMDQyZWJiN2FmNWNjNjQ3YjNiMTVhYTU4YjQz
-    NDQ5ODJkM2NlNjU5ZmY2ZGMyOGZjNzEyM2MwZWQyYzgzMjBhYTg=
+    Y2NlNmE4ZDIyODRhNDZkNTAzYmRkZTRkMTYyNzBhNGI1ZDk1ZmVhNjA3MjUw
+    YTFhZGZmNDFkZmUxZDJiYTBkYmQ3ZmMyM2M0YzUxNjVjZmRhNDM5OTIzZmRj
+    MDk0YzNmYjU5YTZlMjVmMzAwZDM2MjEzZDI5ZTI4YTEzMjM4NjM=

data/Gemfile.lock

@@ -1,13 +1,34 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.22)
+    amazon-pricing (0.1.54)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    rake (10.1.0)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    mechanize (2.7.3)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0)
+      mime-types (~> 2.0)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (~> 2.5, >= 2.5.2)
+      nokogiri (~> 1.4)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
+    net-http-digest_auth (1.4)
+    net-http-persistent (2.9.4)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    ntlm-http (0.1.1)
+    power_assert (0.2.2)
+    rake (10.4.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -16,13 +37,19 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    test-unit (2.5.5)
+    test-unit (3.0.8)
+      power_assert
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
+    webrobots (0.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   amazon-pricing!
+  mechanize (~> 2.7.3)
   rake
   rspec (~> 2.11.0)
   test-unit

data/Rakefile

@@ -44,22 +44,22 @@ end
 desc "Prints current GovCloud EC2 pricing in CSV format"
 task :print_govcloud_ec2_price_list do
   require 'amazon-pricing'
-  pricing = AwsPricing::GovCloudEc2PriceList.new
-  print_ec2_table(pricing)
+  pricing = AwsPricing::Ec2PriceList.new
+  print_ec2_table(pricing, "us-gov-west-1")
 end
 
 desc "Prints current GovCloud RDS pricing in CSV format"
 task :print_govcloud_rds_price_list do
   require 'amazon-pricing'
-  pricing = AwsPricing::GovCloudRdsPriceList.new
-  print_rds_table(pricing)
+  pricing = AwsPricing::Ec2PriceList.new
+  print_rds_table(pricing, "us-gov-west-1")
 end
 
 task :default => [:test]
 
 #########################################
 
-def print_ec2_table(pricing)
+def print_ec2_table(pricing, target_region = nil)
   line = "Region,Instance Type,API Name,Memory (MB),Disk (GB),Compute Units,Virtual Cores,Disk Type,OD Linux PPH,OD Windows PPH,OD RHEL PPH,OD SLES PPH,OD MsWinSQL PPH,OD MsWinSQLWeb PPH,"
   [:year1, :year3].each do |term|
     [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
@@ -70,6 +70,7 @@ def print_ec2_table(pricing)
   end
   puts line.chop
   pricing.regions.each do |region|
+    next if region.name != target_region if target_region
     region.ec2_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},"
       [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb].each do |os|
@@ -87,7 +88,7 @@ def print_ec2_table(pricing)
   end
 end
 
-def print_rds_table(pricing)
+def print_rds_table(pricing, target_region = nil)
   line = "Region,Instance Type,API Name,Memory (MB),Disk (GB),Compute Units,Virtual Cores,Disk Type,"
 
   AwsPricing::DatabaseType.get_database_name.each do |db|
@@ -118,10 +119,11 @@ def print_rds_table(pricing)
   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?
+    next if region.name != target_region if target_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)},"
@@ -129,11 +131,11 @@ def print_rds_table(pricing)
               line += "#{t.price_per_hour(db, :ondemand, nil, deploy_type == :multiaz, deploy_type == :byol)},"
             end  
           end
-       else
+        else
           line += "#{t.price_per_hour(db, :ondemand, nil)},"
-       end
-     end
-     [:year1, :year3].each do |term|
+        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?
@@ -147,10 +149,10 @@ def print_rds_table(pricing)
             else
               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
+      puts line.chop
+    end
   end
 end

data/lib/amazon-pricing.rb

@@ -7,7 +7,6 @@ Dir[File.join(File.dirname(__FILE__), 'amazon-pricing/*.rb')].sort.each { |lib|
 
 require 'aws-price-list'
 require 'ec2-price-list'
-require 'gov-cloud-price-list'
 require 'rds-price-list'
 
 require 'logger'

data/lib/amazon-pricing/version.rb

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

data/lib/aws-price-list.rb

@@ -16,16 +16,11 @@ module AwsPricing
   class PriceList
     attr_accessor :regions
 
-    def initialize(is_govcloud = false)
+    def initialize()
       @_regions = {}
 
       # Creating regions upfront since different json files all use different naming conventions. No more ad-hoc creation.
-      if is_govcloud
-        regions = ["us-gov-west-1"]
-      else
-        # AWS added some but not all of teh data for us-gov-west-1. Not sure why they have not completed it. If they do not deprecate the screen scraping.
-        regions = ["eu-west-1", "sa-east-1", "us-east-1", "ap-northeast-1", "us-west-2", "us-west-1", "ap-southeast-1", "ap-southeast-2", "eu-central-1"]
-      end
+      regions = ["eu-west-1", "sa-east-1", "us-east-1", "ap-northeast-1", "us-west-2", "us-west-1", "ap-southeast-1", "ap-southeast-2", "eu-central-1", "us-gov-west-1"]
 
       regions.each do |name|
         @_regions[name] = Region.new(name)

data/test/ec2_instance_types_test.rb

@@ -146,4 +146,49 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     end
   end
 
+  def test_govcloud_cc8xlarge_issue
+    obj = @@ec2_pricing.get_instance_type('us-gov-west-1', 'm3.large')
+    assert obj.api_name == 'm3.large'
+  end
+
+  def test_govcloud_memory
+    # Validate instance types in specific regions are available
+    region = @@ec2_pricing.get_region('us-gov-west-1')
+    instance = region.get_ec2_instance_type('m3.large')
+    assert instance.memory_in_mb == 7500
+  end
+
+  def test_govcloud_virtual_cores
+    region = @@ec2_pricing.get_region('us-gov-west-1')
+    instance = region.get_ec2_instance_type('m3.large')
+    assert instance.virtual_cores == 2
+  end
+
+  def test_govcloud_ebs
+    region = @@ec2_pricing.get_region('us-gov-west-1')
+    assert region.ebs_price.standard_per_gb == 0.065
+    assert region.ebs_price.standard_per_million_io == 0.065
+    assert region.ebs_price.preferred_per_gb == 0.15
+    assert region.ebs_price.preferred_per_iops == 0.078
+    assert region.ebs_price.s3_snaps_per_gb == 0.125
+  end
+
+  def test_govcloud_new_reservation_types
+    region = @@ec2_pricing.get_region('us-gov-west-1')
+    instance = region.get_ec2_instance_type('r3.large')
+    os = instance.get_operating_system(:linux)
+    assert os.ondemand_price_per_hour == 0.210
+    assert os.partialupfront_prepay_1_year == 649
+    assert os.allupfront_prepay_1_year == 976
+    assert os.partialupfront_prepay_3_year == 1239
+    assert os.allupfront_prepay_3_year == 1935
+    assert os.noupfront_effective_rate_1_year == 0.1320
+    assert os.partialupfront_effective_rate_1_year == 0.1131
+    assert os.allupfront_effective_rate_1_year == 0.1114
+    assert os.partialupfront_effective_rate_3_year == 0.0781
+    assert os.allupfront_effective_rate_3_year == 0.0736
+  end
+
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -43,7 +43,6 @@ files:
 - lib/amazon-pricing/version.rb
 - lib/aws-price-list.rb
 - lib/ec2-price-list.rb
-- lib/gov-cloud-price-list.rb
 - lib/rds-price-list.rb
 - spec/instance_type_spec.rb
 - spec/price_list_spec.rb
@@ -51,7 +50,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/.gitignore
 - test/ec2_instance_types_test.rb
-- test/govcloud_test.rb
 - test/helper.rb
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
@@ -89,6 +87,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/.gitignore
 - test/ec2_instance_types_test.rb
-- test/govcloud_test.rb
 - test/helper.rb
-has_rdoc: 

data/lib/gov-cloud-price-list.rb

@@ -1,273 +0,0 @@
-module AwsPricing
-
-  class GovCloudEc2PriceList < PriceList
-    GOV_CLOUD_URL = "http://aws.amazon.com/govcloud-us/pricing/ec2/"
-    GOV_CLOUD_EBS_URL = "http://aws.amazon.com/govcloud-us/pricing/ebs/"
-
-    def initialize
-      super(true)
-      InstanceType.populate_lookups
-      get_ec2_instance_pricing
-      fetch_ec2_ebs_pricing
-    end
-
-    protected
-
-    def get_ec2_instance_pricing
-
-      client = Mechanize.new
-      page = client.get(GOV_CLOUD_URL)
-      tables = page.search("//div[@class='aws-table ']")
-      for i in 0..3
-        create_ondemand_instances(tables[i])
-      end
-      
-      for i in 4..9
-        # GovCloud no longer supports reservation types
-        #create_reserved_instances(tables[i], :light)
-      end
-      for i in 9..22
-        # GovCloud no longer supports reservation types
-        #create_reserved_instances(tables[i], :medium)
-      end
-      for i in 23..33
-        # GovCloud no longer supports reservation types
-        #create_reserved_instances(tables[i], :heavy)
-      end
-
-    end
-
-    # e.g. [["Prices / Hour", "Amazon Linux", "RHEL", "SLES"], ["m1.small", "$0.053", "$0.083", "$0.083"]]
-    def create_ondemand_instances(table)
-      rows = get_rows(table)
-      header = rows[0]
-      @_regions.values.each do |region|
-
-        rows.slice(1, rows.size).each do |row|
-          api_name = row[0]
-          instance_type = region.get_ec2_instance_type(api_name)
-          if instance_type.nil?
-            api_name, name = Ec2InstanceType.get_name(nil, row[0], false)
-            instance_type = region.add_or_update_ec2_instance_type(api_name, name)
-          end
-          instance_type.update_pricing2(get_os(header[1]), :ondemand, row[1])
-          instance_type.update_pricing2(get_os(header[2]), :ondemand, row[2])
-          instance_type.update_pricing2(get_os(header[3]), :ondemand, row[3])
-        end
-      end
-    end
-
-    # e.g. [["RHEL", "1 yr Term Upfront", "1 yr TermHourly", "3 yr TermUpfront", "3 yr Term Hourly"], ["m1.small", "$68.00", "$0.099", "$105.00", "$0.098"]]
-    def create_reserved_instances(table, res_type)
-      rows = get_rows(table)
-      operating_system = get_os(table.search(".//td/p").last.inner_text.strip)  # Wow...
-
-      @_regions.values.each do |region|
-
-        rows.slice(1, rows.size).each do |row|
-          api_name = row[0]
-          instance_type = region.get_instance_type(api_name)
-          if instance_type.nil?
-            api_name, name = Ec2InstanceType.get_name(nil, api_name, true)
-            instance_type = region.add_or_update_ec2_instance_type(api_name, name)
-          end
-         instance_type.update_pricing2(operating_system, res_type, nil, row[1], row[3], row[2], row[4])
-        end
-      end
-    end
-
-    def fetch_ec2_ebs_pricing
-      client = Mechanize.new
-      page = client.get(GOV_CLOUD_EBS_URL)
-      ebs_costs = page.search("//div[@class='text-box section']//li")
-      @_regions.values.each do |region|
-        region.ebs_price = EbsPrice.new(region)
-        region.ebs_price.preferred_per_gb = get_ebs_price(ebs_costs[1])
-        region.ebs_price.preferred_per_iops = get_ebs_price(ebs_costs[2])
-        region.ebs_price.standard_per_gb = get_ebs_price(ebs_costs[3])
-        region.ebs_price.standard_per_million_io = get_ebs_price(ebs_costs[4])
-        region.ebs_price.ssd_per_gb = nil
-        region.ebs_price.s3_snaps_per_gb = get_ebs_price(ebs_costs[5])
-      end
-
-    end
-
-    # e.g. $0.065 per GB-Month of provisioned storage
-    def get_ebs_price(xml_element)
-      tokens = xml_element.text.split(" ")
-      tokens[0].gsub("$", "").to_f
-    end
-
-    def get_os(val)
-      case val
-      when "Amazon Linux"
-        :linux
-      when "RHEL"
-        :rhel
-      when "SLES"
-        :sles
-      when "Windows"
-        :mswin
-      when "Windows SQL Server Web", "Windows SQL Server Web Edition", "Windows SQL Server\n Web Edition", "Server Web"
-        :mswinSQL
-      when "Windows SQL Server Standard", "Windows SQL Server Standard Edition", "Windows SQL Server\n Standard Edition"
-        :mswinSQLWeb
-      else
-        raise "Unable to identify operating system '#{val}'"
-      end
-    end
-
-    def get_rows(html_table)
-      rows = []
-      html_table.search(".//tr").each do |tr|
-        row = []
-        tr.search(".//td").each do |td|
-         row << td.inner_text.strip.sub("\n", " ").sub("  ", " ")
-        end
-        next if row.size == 1
-        rows << row unless row.empty?
-      end
-      rows
-    end  
-  end
-
-
-  class GovCloudRdsPriceList < PriceList
-    GOV_CLOUD_URL = "http://aws.amazon.com/govcloud-us/pricing/rds/"
-
-    def initialize
-      @_regions = {}
-      @_regions["us-gov-west-1"] = Region.new("us-gov-west-1")
-      InstanceType.populate_lookups
-      get_rds_instance_pricing
-    end
-
-    protected
-    #@@DB_TYPE = [:mysql, :postgresql, :oracle, :sqlserver]
-    #@@RES_TYPES = [:light, :medium, :heavy]
-   
-    def get_rds_instance_pricing
-
-      client = Mechanize.new
-      page = client.get(GOV_CLOUD_URL)
-      tables = page.search("//div[@class='aws-table ']")
-
-      # Mysql
-      create_ondemand_instances(:mysql, :ondemand, false, false, get_rows(tables[0]))
-      create_ondemand_instances(:mysql, :ondemand, true, false, get_rows(tables[1]))
-      no_multi_az_rows, multi_az_rows =  get_reserved_rows(get_rows(tables[2]))
-      create_reserved_instances(:mysql, :light, false, false, no_multi_az_rows)
-      create_reserved_instances(:mysql, :light, true, false, multi_az_rows)
-      no_multi_az_rows, multi_az_rows =  get_reserved_rows(get_rows(tables[3]))
-      create_reserved_instances(:mysql, :medium, false, false, no_multi_az_rows)
-      create_reserved_instances(:mysql, :medium, true, false, multi_az_rows)
-      no_multi_az_rows, multi_az_rows =  get_reserved_rows(get_rows(tables[4]))
-      create_reserved_instances(:mysql, :heavy, false, false, no_multi_az_rows)
-      create_reserved_instances(:mysql, :heavy, true, false, multi_az_rows)
-
-      # Oracle
-      create_ondemand_instances(:oracle_se1, :ondemand, false, false, get_rows(tables[5]))
-      create_ondemand_instances(:oracle_se1, :ondemand, true, false, get_rows(tables[6]))
-      create_ondemand_instances(:oracle_se1, :ondemand, false, true, get_rows(tables[7]))
-      create_ondemand_instances(:oracle_se1, :ondemand, true, true, get_rows(tables[8]))
-
-      row = 9
-      [false, true].each do |is_byol|
-        [:light, :medium, :heavy].each do |res_type|
-          no_multi_az_rows, multi_az_rows =  get_reserved_rows(get_rows(tables[9]))
-          create_reserved_instances(:oracle_se1, res_type, false, is_byol, no_multi_az_rows)
-          create_reserved_instances(:oracle_se1, res_type, true, is_byol, multi_az_rows)
-          row += 1
-        end
-      end
-
-      # SQL Server
-      create_ondemand_instances(:sqlserver_ex, :ondemand, false, false, get_rows(tables[15]))
-      create_ondemand_instances(:sqlserver_web, :ondemand, false, false, get_rows(tables[16]))
-      create_ondemand_instances(:sqlserver_se, :ondemand, false, false, get_rows(tables[17]))
-      row = 18
-      [:light, :medium, :heavy].each do |restype|
-        [:sqlserver_ex, :sqlserver_web, :sqlserver_se].each do |db|
-          no_multi_az_rows, multi_az_rows =  get_reserved_rows(get_rows(tables[row]))
-          create_reserved_instances(db, restype, false, false, no_multi_az_rows)
-          create_reserved_instances(db, restype, true, false, multi_az_rows)
-          row += 1
-        end
-      end
-
-      # Postgres
-      # Mysql
-      create_ondemand_instances(:postgresql, :ondemand, false, false, get_rows(tables[31]))
-      create_ondemand_instances(:postgresql, :ondemand, true, false, get_rows(tables[32]))
-      row = 33
-      [:light, :medium, :heavy].each do |restype|
-        no_multi_az_rows, multi_az_rows =  get_reserved_rows(get_rows(tables[row]))
-        create_reserved_instances(:postgresql, restype, false, false, no_multi_az_rows)
-        create_reserved_instances(:postgresql, restype, true, false, multi_az_rows)
-        row += 1
-      end
-
-    end
-
-    # e.g. [["General Purpose - Previous Generation", "Price Per Hour"], ["m1.small", "$0.090"], ["m1.medium", "$0.185"]]
-    def create_ondemand_instances(db_type, res_type, is_multi_az, is_byol, rows)
-      @_regions.values.each do |region|
-        # Skip header row
-        rows.each do |row|
-          api_name = row[0]
-          unless api_name.include?("db.")
-            $stderr.puts "Skipping row containing non-db type: #{api_name}"
-            next
-          end
-          instance_type = region.get_rds_instance_type(api_name)
-          if instance_type.nil?
-            api_name, name = RdsInstanceType.get_name(nil, row[0], false)
-            instance_type = region.add_or_update_rds_instance_type(api_name, name)
-          end
-          instance_type.update_pricing2(db_type, res_type, is_multi_az, is_byol, row[1])
-        end
-      end
-    end
-
-    # e.g. [[" ", "1 yr Term", "3 yr Term"], [" ", "Upfront", "Hourly", "Upfront", "Hourly"], ["m1.small", "$159", "$0.035", "$249", "$0.033"]]
-    def create_reserved_instances(db_type, res_type, is_multi_az, is_byol, rows)
-      @_regions.values.each do |region|
-        rows.each do |row|
-          api_name = row[0]
-          unless api_name.include?("db.")
-            $stderr.puts "Skipping row containing non-db type: #{api_name}"
-            next
-          end
-          instance_type = region.get_rds_instance_type(api_name)
-          if instance_type.nil?
-            api_name, name = RdsInstanceType.get_name(nil, row[0], true)
-            instance_type = region.add_or_update_rds_instance_type(api_name, name)
-          end
-         instance_type.update_pricing2(db_type, res_type, is_multi_az, is_byol, nil, row[1], row[3], row[2], row[4])
-        end
-      end
-    end
-
-    def get_reserved_rows(rows)
-      # Skip 2 header rows
-      new_rows = rows.slice(2, rows.size)
-      no_multi_az_rows = new_rows.slice(0, new_rows.size / 2)
-      multi_az_rows = new_rows.slice(new_rows.size / 2, new_rows.size / 2)
-      [no_multi_az_rows, multi_az_rows]
-    end
-
-    def get_rows(html_table)
-      rows = []
-      html_table.search(".//tr").each do |tr|
-        row = []
-        tr.search(".//td").each do |td|
-         row << td.inner_text.strip.sub("\n", " ").sub("  ", " ")
-        end
-        # Various <tR> elements contain labels which have only 1 <td> - except heavy multi-az ;)
-        next if row.size == 1 || row[0].include?("Multi-AZ Deployment")
-        rows << row unless row.empty?
-      end
-      rows
-    end  
-  end
-end

data/test/govcloud_test.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Amazon Web Services Pricing Ruby library
-#
-# Ruby Gem Name::  amazon-pricing
-# Author::    Joe Kinsella (mailto:joe.kinsella@gmail.com)
-# Copyright:: Copyright (c) 2011-2013 CloudHealth
-# License::   Distributes under the same terms as Ruby
-# Home::      http://github.com/CloudHealth/amazon-pricing
-#++
-
-$: << File.expand_path(File.dirname(__FILE__))
-require 'helper'
-require 'test/unit'
-
-class TestGovCloud < Test::Unit::TestCase
-  def setup
-    #This is expensive, so only do once.
-      @@ec2_pricing = AwsPricing::GovCloudEc2PriceList.new
-  end
-
-  def test_cc8xlarge_issue
-    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('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('m3.large')
-    assert instance.virtual_cores == 2
-  end
-
-  def test_ebs
-    region = @@ec2_pricing.get_region('us-gov-west-1')
-    assert region.ebs_price.standard_per_gb == 0.065
-    assert region.ebs_price.standard_per_million_io == 0.065
-    assert region.ebs_price.preferred_per_gb == 0.15
-    assert region.ebs_price.preferred_per_iops == 0.078
-    assert region.ebs_price.s3_snaps_per_gb == 0.125
-  end
-
-end