amazon-pricing 0.1.140 → 0.1.141

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTRhZDhmZjNiNzRlNzhlODA3ZTE3NjRjNjE2ZGNmNjZiNTdiNTk4OQ==
+    YjU5NTVhZjFmYTFjYWFhODhjYjdkY2ZmNDdlMTA0NjFhNjk5YWE4OQ==
   data.tar.gz: !binary |-
-    ZjZiMzg1NGUxYTZlZTk5OGQ4NzhlOWExNDU3NmFlMjdkOGUwNWM0MQ==
+    NjZiNzAyMTMyZDgyZmYzY2NmOTI2MWM0YjVmYWQyNzQ3NzEzODIyOQ==
 SHA512:
   metadata.gz: !binary |-
-    YjExOWY0NzlkNDY0MjY0Y2FhOWU1NWI4YjAwMmFhM2UwZDlhNGQ2MTc1NmFh
-    YTBiZjMwMDk2ODkyZDJiZjgyYTU5NjNiNzllMDNhZjlmNmFhODIwY2ZiNTk1
-    NGIxZjEyMzY2NjM2ZGFmOGUzMjVmODdmMWI2ZGEwNTUxMGM3MmM=
+    MmVmY2IyYjU4YmU1MWViN2QzMjAyOWViMzcxYTg4ZDZjNWRkYmRlZjc1ZjAw
+    NTJlMThmYmM1YzQ0Mjc0MGM5OTI4NTZhODVkZjA3ZDFkZTk0YzNhOTk0YWVm
+    ZDYzNTExYzY0ZTAzZWFlMTZlNzM4ZjRlMjFkMTM3NTNhZjBiNzA=
   data.tar.gz: !binary |-
-    MGU1MTU5ZTI3YTUwM2E1ZWI1MTg3NzlkMTIzYWJlZmQwNDE1Y2E2MzQ5ZDk2
-    NzE0ZWZiZjgxN2JjOTI4MTJlODBhYzFkZDIyNThiYzkwZmU5MjhkZGJkMzMx
-    YzhlNGI2YzEzMTI0ZDgwNTU3MjIxNzY4OWIyNzAyYzNjYzhlZDA=
+    NjA5NWNiNThmNjk0NjJiZjFjODhmMjg0NmFkNGRhNzk1NDkwYTQxZWQ5YmIw
+    YjQyOGU4MTg3NTViYjRiZDg2YTA1NWU5NWQzYWEzMTVmYzU0MDEwMDRmYTJi
+    YjFlZWIzYWZjZWYzMjRlODE3ZDFiYTZmYWFmMDE0Njk3NjhiNDE=

data/Rakefile

@@ -41,13 +41,6 @@ task :print_ec2_di_price_list do
   print_ec2_table(pricing)
 end
 
-desc "Prints current EC2 Dedicated Host Instance pricing in CSV format"
-task :print_ec2_dhi_price_list do
-  require 'amazon-pricing'
-  pricing = AwsPricing::Ec2DedicatedHostInstancePriceList.new
-  print_ec2_table(pricing)
-end
-
 desc "Prints current EC2 Dedicated Host pricing in CSV format"
 task :print_ec2_dh_price_list do
   require 'amazon-pricing'

data/lib/amazon-pricing.rb

@@ -8,7 +8,6 @@ require 'amazon-pricing/common/ec2_common'
 require 'amazon-pricing/aws-price-list'
 require 'amazon-pricing/ec2-price-list'
 require 'amazon-pricing/ec2-di-price-list'
-require 'amazon-pricing/ec2-dhi-price-list'
 require 'amazon-pricing/ec2-dh-price-list'
 require 'amazon-pricing/rds-price-list'
 require 'amazon-pricing/dynamo-db-price-list'

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

@@ -8,8 +8,8 @@ module AwsPricing
     def get_operating_system(type)
       get_category_type(type)
     end
-    
-    # Returns whether an instance_type is available. 
+
+    # Returns whether an instance_type is available.
     # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
     # type_of_instance = :ondemand, :light, :medium, :heavy
     def available?(type_of_instance = :ondemand, operating_system = :linux)
@@ -90,22 +90,6 @@ module AwsPricing
       end
     end
 
-    # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
-    # dhprice is a string representing the price per hour for the Dedicated Host
-    # capacity is the number of this type of instancess supported on this Dedicated Host
-    def update_dhi_pricing(operating_system, dhprice, capacity)
-      os = get_category_type(operating_system)
-      if os.nil?
-        os = OperatingSystem.new(self, operating_system)
-        @category_types[operating_system] = os
-      end
-
-      category = operating_system.to_s
-      values = { category => dhprice }
-      price = coerce_price(values[category])
-      os.set_price_per_hour(:ondemand, nil, price/capacity)
-    end
-
     def update_pricing2(operating_system, res_type, ondemand_pph = nil, year1_prepay = nil, year3_prepay = nil, year1_pph = nil, year3_pph = nil)
 
       os = get_category_type(operating_system)
@@ -126,15 +110,6 @@ module AwsPricing
       @category_types
     end
 
-    # aws does not provide any json-sourced network_capacity, so for now we provide this hardcoded lookup
-    # see https://aws.amazon.com/ec2/instance-types/, under 'Instance Types Matrix', under 'Networking Performance'
-    def self.get_network_capacity(api_name)
-      throughput = @Network_Performance[api_name]
-      if not throughput
-        $stderr.puts "Unknown network throughput for instance type #{api_name}"
-      end
-      throughput
-    end
     def self.get_network_mbps(throughput)
       network_mbps = @Network_Throughput_MBits_Per_Second[throughput]
       if not network_mbps
@@ -207,298 +182,5 @@ module AwsPricing
         '100 Gigabit' => :one_hundred_gigabit
     }
 
-    # handy summary here: www.ec2instances.info
-    @Network_Performance = {
-      'a1.medium' => :ten_gigabit, # up to 10G
-      'a1.large' => :ten_gigabit, # up to 10G
-      'a1.xlarge' => :ten_gigabit, # up to 10G
-      'a1.2xlarge' => :ten_gigabit, # up to 10G
-      'a1.4xlarge' => :ten_gigabit, # up to 10G
-      'c1.medium' => :moderate,
-      'c1.xlarge' => :high,
-      'c3.2xlarge' => :high,
-      'c3.4xlarge' => :high,
-      'c3.8xlarge' => :ten_gigabit,
-      'c3.large' => :moderate,
-      'c3.xlarge' => :moderate,
-      'c4.2xlarge' => :high,
-      'c4.4xlarge' => :high,
-      'c4.8xlarge' => :ten_gigabit,
-      'c4.large' => :moderate,
-      'c4.xlarge' => :high,
-      'c5.18xlarge' => :twentyfive_gigabit,
-      'c5.2xlarge' => :ten_gigabit, # upto 10G
-      'c5.4xlarge' => :ten_gigabit, # upto 10G
-      'c5.9xlarge' => :ten_gigabit,
-      'c5.large' => :ten_gigabit,   # upto 10G
-      'c5.xlarge' => :ten_gigabit,  # upto 10G
-      'c5d.18xlarge' => :twentyfive_gigabit,
-      'c5d.2xlarge' => :ten_gigabit, # upto 10G
-      'c5d.4xlarge' => :ten_gigabit, # upto 10G
-      'c5d.9xlarge' => :ten_gigabit,
-      'c5d.large' => :ten_gigabit,   # upto 10G
-      'c5d.xlarge' => :ten_gigabit,  # upto 10G
-      'c5n.large' => :twentyfive_gigabit, # up to 25gb
-      'c5n.xlarge' => :twentyfive_gigabit, # up to 25gb
-      'c5n.2xlarge' => :twentyfive_gigabit, # up to 25gb
-      'c5n.4xlarge' => :twentyfive_gigabit, # up to 25gb
-      'c5n.9xlarge' => :fifty_gigabit,
-      'c5n.18xlarge' => :one_hundred_gigabit,
-      'cache.c1.xlarge' => :high,
-      'cache.m1.large' => :moderate,
-      'cache.m1.medium' => :moderate,
-      'cache.m1.small' => :low,
-      'cache.m1.xlarge' => :high,
-      'cache.m2.2xlarge' => :moderate,
-      'cache.m2.4xlarge' => :high,
-      'cache.m2.xlarge' => :moderate,
-      'cache.m3.2xlarge' => :high,
-      'cache.m3.large' => :moderate,
-      'cache.m3.medium' => :moderate,
-      'cache.m3.xlarge' => :high,
-      'cache.m4.large' => :moderate,
-      'cache.m4.xlarge' => :high,
-      'cache.m4.2xlarge' => :high,
-      'cache.m4.4xlarge' => :high,
-      'cache.m4.10xlarge' => :ten_gigabit,
-      'cache.r3.2xlarge' => :high,
-      'cache.r3.4xlarge' => :high,
-      'cache.r3.8xlarge' => :ten_gigabit,
-      'cache.r3.large' => :moderate,
-      'cache.r3.xlarge' => :moderate,
-      'cache.r4.16xlarge' => :twentyfive_gigabit,
-      'cache.r4.2xlarge' => :ten_gigabit, # upto 10G
-      'cache.r4.4xlarge' => :ten_gigabit, # upto 10G
-      'cache.r4.8xlarge' => :ten_gigabit,
-      'cache.r4.large' => :ten_gigabit,   # upto 10G
-      'cache.r4.xlarge' => :ten_gigabit,  # upto 10G
-      'cache.x1.16xlarge' => :ten_gigabit,
-      'cache.x1.32xlarge' => :ten_gigabit,
-      'cache.t1.micro' => :very_low,
-      'cache.t2.medium' => :low_to_moderate,
-      'cache.t2.micro' => :low_to_moderate,
-      'cache.t2.small' => :low_to_moderate,
-      'cc1.4xlarge' => :ten_gigabit,
-      'cc2.8xlarge' => :ten_gigabit,
-      'cg1.4xlarge' => :ten_gigabit,
-      'cr1.8xlarge' => :ten_gigabit,
-      'd2.2xlarge' => :high,
-      'd2.4xlarge' => :high,
-      'd2.8xlarge' => :ten_gigabit,
-      'd2.xlarge' => :moderate,
-      'db.cr1.8xlarge' => :ten_gigabit,
-      'db.m1.large' => :moderate,
-      'db.m1.medium' => :moderate,
-      'db.m1.small' => :low,
-      'db.m1.xlarge' => :high,
-      'db.m2.2xlarge' => :moderate,
-      'db.m2.4xlarge' => :high,
-      'db.m2.xlarge' => :moderate,
-      'db.m3.2xlarge' => :high,
-      'db.m3.large' => :moderate,
-      'db.m3.medium' => :moderate,
-      'db.m3.xlarge' => :high,
-      'db.m4.10xlarge' => :ten_gigabit,
-      'db.m4.2xlarge' => :high,
-      'db.m4.4xlarge' => :high,
-      'db.m4.large' => :moderate,
-      'db.m4.xlarge' => :high,
-      'db.m4.16xlarge' => :twentyfive_gigabit,
-      'db.r3.2xlarge' => :high,
-      'db.r3.4xlarge' => :high,
-      'db.r3.8xlarge' => :ten_gigabit,
-      'db.r3.large' => :moderate,
-      'db.r3.xlarge' => :moderate,
-      'db.r4.large' => :ten_gigabit,
-      'db.r4.xlarge' => :ten_gigabit,
-      'db.r4.2xlarge' => :ten_gigabit,
-      'db.r4.4xlarge' => :ten_gigabit,
-      'db.r4.8xlarge' => :ten_gigabit,
-      'db.r4.16xlarge' => :twentyfive_gigabit,
-      'db.r5.large' => :ten_gigabit,
-      'db.r5.xlarge' => :ten_gigabit,
-      'db.r5.2xlarge' => :ten_gigabit,
-      'db.r5.4xlarge' => :ten_gigabit,
-      'db.r5.12xlarge' => :ten_gigabit,
-      'db.r5.24xlarge' => :twentyfive_gigabit,
-      'db.t1.micro' => :very_low,
-      'db.t2.large' => :low_to_moderate,
-      'db.t2.medium' => :low_to_moderate,
-      'db.t2.micro' => :low,
-      'db.t2.small' => :low_to_moderate,
-      'db.t2.xlarge' => :moderate,
-      'db.t2.2xlarge' => :moderate,
-      'db.t3.micro' => :low_to_moderate,
-      'db.t3.small' => :low_to_moderate,
-      'db.t3.medium' => :low_to_moderate,
-      'db.t3.large' => :low_to_moderate,
-      'db.t3.xlarge' => :moderate,
-      'db.t3.2xlarge' => :moderate,
-      'db.x1.16xlarge' => :ten_gigabit,
-      'db.x1.32xlarge' => :ten_gigabit,
-      'f1.2xlarge' => :high,
-      'f1.4xlarge' => :high,
-      'f1.16xlarge' => :twentyfive_gigabit,
-      'g2.2xlarge' => :high,
-      'g2.8xlarge' => :ten_gigabit,
-      'g3.4xlarge' => :ten_gigabit,
-      'g3.8xlarge' => :ten_gigabit,
-      'g3.16xlarge' => :twenty_gigabit,
-      'g3s.xlarge' => :ten_gigabit,
-      'h1.2xlarge' => :ten_gigabit, # upto 10G
-      'h1.4xlarge' => :ten_gigabit, # upto 10G
-      'h1.8xlarge' => :ten_gigabit,
-      'h1.16xlarge' => :twentyfive_gigabit,
-      'hi1.4xlarge' => :ten_gigabit,
-      'hs1.8xlarge' => :ten_gigabit,
-      'i2.2xlarge' => :high,
-      'i2.4xlarge' => :high,
-      'i2.8xlarge' => :ten_gigabit,
-      'i2.xlarge' => :moderate,
-      'i3.16xlarge' => :twentyfive_gigabit,
-      'i3.2xlarge' => :ten_gigabit,
-      'i3.4xlarge' => :ten_gigabit,
-      'i3.8xlarge' => :ten_gigabit,
-      'i3.large' => :ten_gigabit,
-      'i3.metal' => :twentyfive_gigabit,
-      'i3p.16xlarge' => :twentyfive_gigabit,
-      'i3.xlarge' => :ten_gigabit,
-      'i3en.large'=> :twentyfive_gigabit,
-      'i3en.xlarge'=> :twentyfive_gigabit,
-      'i3en.2xlarge'=> :twentyfive_gigabit,
-      'i3en.3xlarge'=> :twentyfive_gigabit,
-      'i3en.6xlarge'=> :twentyfive_gigabit,
-      'i3en.12xlarge'=> :fifty_gigabit,
-      'i3en.24xlarge'=> :one_hundred_gigabit,
-      'm1.large' => :moderate,
-      'm1.medium' => :moderate,
-      'm1.small' => :low,
-      'm1.xlarge' => :high,
-      'm2.2xlarge' => :moderate,
-      'm2.4xlarge' => :high,
-      'm2.xlarge' => :moderate,
-      'm3.2xlarge' => :high,
-      'm3.large' => :moderate,
-      'm3.medium' => :moderate,
-      'm3.xlarge' => :high,
-      'm4.16xlarge' => :twentyfive_gigabit,
-      'm4.10xlarge' => :ten_gigabit,
-      'm4.2xlarge' => :high,
-      'm4.4xlarge' => :high,
-      'm4.large' => :moderate,
-      'm4.xlarge' => :high,
-      'm5.large' => :ten_gigabit,   # upto 10G
-      'm5.xlarge' => :ten_gigabit,  # upto 10G
-      'm5.2xlarge' => :ten_gigabit, # upto 10G
-      'm5.4xlarge' => :ten_gigabit, # upto 10G
-      'm5.12xlarge' => :ten_gigabit,
-      'm5.24xlarge' => :twentyfive_gigabit,
-      'm5.metal' => :twentyfive_gigabit,
-      'm5d.large' => :ten_gigabit,   # upto 10G
-      'm5d.xlarge' => :ten_gigabit,  # upto 10G
-      'm5d.2xlarge' => :ten_gigabit, # upto 10G
-      'm5d.4xlarge' => :ten_gigabit, # upto 10G
-      'm5d.12xlarge' => :ten_gigabit,
-      'm5d.24xlarge' => :twentyfive_gigabit,
-      'm5d.metal' => :twentyfive_gigabit,
-      'm5a.large' => :ten_gigabit, # upto 10G
-      'm5a.xlarge' => :ten_gigabit, # upto 10G
-      'm5a.2xlarge' => :ten_gigabit, # upto 10G
-      'm5a.4xlarge' => :ten_gigabit, # upto 10G
-      'm5a.12xlarge' => :ten_gigabit,
-      'm5a.24xlarge' => :twenty_gigabit,
-      'm5ad.large' => :ten_gigabit, # upto 10G
-      'm5ad.xlarge' => :ten_gigabit, # upto 10G
-      'm5ad.2xlarge' => :ten_gigabit, # upto 10G
-      'm5ad.4xlarge' => :ten_gigabit, # upto 10G
-      'm5ad.12xlarge' => :ten_gigabit,
-      'm5ad.24xlarge' => :twenty_gigabit,
-      'p2.xlarge' =>   :high,
-      'p2.8xlarge' =>  :ten_gigabit,
-      'p2.16xlarge' => :twenty_gigabit,
-      'p3.2xlarge' =>   :ten_gigabit,
-      'p3.8xlarge' =>  :ten_gigabit,
-      'p3.16xlarge' => :twentyfive_gigabit,
-      'p3dn.24xlarge' => :one_hundred_gigabit,
-      'r3.2xlarge' => :high,
-      'r3.4xlarge' => :high,
-      'r3.8xlarge' => :ten_gigabit,
-      'r3.large' => :moderate,
-      'r3.xlarge' => :moderate,
-      'r4.16xlarge' => :twentyfive_gigabit,
-      'r4.2xlarge' => :ten_gigabit,
-      'r4.4xlarge' => :ten_gigabit,
-      'r4.8xlarge' => :ten_gigabit,
-      'r4.large' => :ten_gigabit,
-      'r4.xlarge' => :ten_gigabit,
-      'r5.large' => :ten_gigabit, # upto 10G
-      'r5.xlarge' => :ten_gigabit, # upto 10G
-      'r5.2xlarge' => :ten_gigabit, # upto 10G
-      'r5.4xlarge' => :ten_gigabit, # upto 10G
-      'r5.12xlarge' => :ten_gigabit,
-      'r5.24xlarge' => :twentyfive_gigabit,
-      'r5.metal' => :twentyfive_gigabit,
-      'r5d.large' => :ten_gigabit, # upto 10G
-      'r5d.xlarge' => :ten_gigabit, # upto 10G
-      'r5d.2xlarge' => :ten_gigabit, # upto 10G
-      'r5d.4xlarge' => :ten_gigabit, # upto 10G
-      'r5d.12xlarge' => :ten_gigabit,
-      'r5d.24xlarge' => :twentyfive_gigabit,
-      'r5d.metal' => :twentyfive_gigabit,
-      'r5a.large' => :ten_gigabit, # upto 10G
-      'r5a.xlarge' => :ten_gigabit, # upto 10G
-      'r5a.2xlarge' => :ten_gigabit, # upto 10G
-      'r5a.4xlarge' => :ten_gigabit, # upto 10G
-      'r5a.12xlarge' => :ten_gigabit,
-      'r5a.24xlarge' => :twenty_gigabit,
-      'r5ad.large' => :ten_gigabit, # upto 10G
-      'r5ad.xlarge' => :ten_gigabit, # upto 10G
-      'r5ad.2xlarge' => :ten_gigabit, # upto 10G
-      'r5ad.4xlarge' => :ten_gigabit, # upto 10G
-      'r5ad.12xlarge' => :ten_gigabit,
-      'r5ad.24xlarge' => :twenty_gigabit,
-      't1.micro' => :very_low,
-      't2.large' => :low_to_moderate,
-      't2.medium' => :low_to_moderate,
-      't2.micro' => :low_to_moderate,
-      't2.nano' => :low,
-      't2.small' => :low_to_moderate,
-      't2.xlarge' => :moderate,   # same as c4.2xlarge, cf:https://aws.amazon.com/blogs/aws/new-t2-xlarge-and-t2-2xlarge-instances/
-      't2.2xlarge' => :moderate,  # same as m4.xlarge,  cf:https://aws.amazon.com/blogs/aws/new-t2-xlarge-and-t2-2xlarge-instances/
-      't3.nano' => :low,
-      't3.micro' => :low_to_moderate,
-      't3.small' => :low_to_moderate,
-      't3.medium' => :low_to_moderate,
-      't3.large' => :low_to_moderate,
-      't3.xlarge' => :moderate,
-      't3.2xlarge' => :moderate,
-      't3a.nano' => :low_to_moderate,
-      't3a.micro' => :low_to_moderate,
-      't3a.small' => :low_to_moderate,
-      't3a.medium' => :low_to_moderate,
-      't3a.large' => :low_to_moderate,
-      't3a.xlarge' => :low_to_moderate,
-      't3a.2xlarge' => :low_to_moderate,
-      'x1.16xlarge' => :ten_gigabit,
-      'x1.32xlarge' => :twenty_gigabit,
-      'x1e.16xlarge' => :ten_gigabit,
-      'x1e.2xlarge' => :ten_gigabit,        # upto 10G
-      'x1e.32xlarge' => :twentyfive_gigabit,
-      'x1e.4xlarge' => :ten_gigabit,        # upto 10G
-      'x1e.8xlarge' => :ten_gigabit,        # upto 10G
-      'x1e.xlarge' => :ten_gigabit,         # upto 10G
-      'z1d.large' => :ten_gigabit, # upto 10G
-      'z1d.xlarge' => :ten_gigabit, # upto 10G
-      'z1d.2xlarge' => :ten_gigabit, # upto 10G
-      'z1d.3xlarge' => :ten_gigabit, # upto 10G
-      'z1d.6xlarge' => :ten_gigabit,
-      'z1d.12xlarge' => :twentyfive_gigabit,
-      'z1d.metal' => :twentyfive_gigabit,
-      'u-6tb1.metal' =>  :twentyfive_gigabit,
-      'u-9tb1.metal' =>  :twentyfive_gigabit,
-      'u-12tb1.metal' => :twentyfive_gigabit,
-    }
-
   end
-
 end

data/lib/amazon-pricing/version.rb

@@ -9,6 +9,6 @@
 #++
 module AwsPricing
 
-VERSION = '0.1.140' # [major,minor.fix]: Adding support for i3en instances
+VERSION = '0.1.141' # [major,minor.fix]: Removing unused code 
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.140
+  version: 0.1.141
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -50,7 +50,6 @@ files:
 - lib/amazon-pricing/definitions/region.rb
 - lib/amazon-pricing/dynamo-db-price-list.rb
 - lib/amazon-pricing/ec2-dh-price-list.rb
-- lib/amazon-pricing/ec2-dhi-price-list.rb
 - lib/amazon-pricing/ec2-di-price-list.rb
 - lib/amazon-pricing/ec2-price-list.rb
 - lib/amazon-pricing/elasticache-price-list.rb
@@ -59,7 +58,6 @@ files:
 - lib/amazon-pricing/version.rb
 - spec/lib/amazon-pricing/definitions/database-type_spec.rb
 - spec/lib/amazon-pricing/ec2_dh_pricing_spec.rb
-- spec/lib/amazon-pricing/ec2_dhi_pricing_spec.rb
 - spec/lib/amazon-pricing/elasticache_pricing_spec.rb
 - spec/lib/amazon-pricing/helpers/instance-type-spec.rb
 - spec/lib/amazon-pricing/rds_pricing_spec.rb
@@ -99,7 +97,6 @@ summary: Amazon Web Services Pricing Ruby gem
 test_files:
 - spec/lib/amazon-pricing/definitions/database-type_spec.rb
 - spec/lib/amazon-pricing/ec2_dh_pricing_spec.rb
-- spec/lib/amazon-pricing/ec2_dhi_pricing_spec.rb
 - spec/lib/amazon-pricing/elasticache_pricing_spec.rb
 - spec/lib/amazon-pricing/helpers/instance-type-spec.rb
 - spec/lib/amazon-pricing/rds_pricing_spec.rb

data/lib/amazon-pricing/ec2-dhi-price-list.rb

@@ -1,107 +0,0 @@
-module AwsPricing
-  class Ec2DedicatedHostInstancePriceList < PriceList
-    include AwsPricing::Ec2Common
-
-    def initialize
-      super
-      InstanceType.populate_lookups
-      get_ec2_dhi_od_pricing
-    end
-
-    def os_types
-      @@OS_TYPES
-    end
-
-    protected
-
-    @@OS_TYPES = [ 'linux', 'rhel', 'sles', 'mswin', 
-                   'mswinSQL', 'mswinSQLWeb', 'mswinSQLEnterprise',
-                   'linuxSQL', 'linuxSQLWeb', 'linuxSQLEnterprise',
-                 ]
-
-    @@CAPACITY_HASH = { # number of instances a host can run, by definition largest size can only run one instance/host
-      'a1' => {"medium" =>16, "large"=>8, "xlarge"=>4, "2xlarge"=>2, "4xlarge"=>1},
-      'c3' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
-      'c4' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
-      'c5' => { "large"=>36, "xlarge"=>18, "2xlarge"=>8, "4xlarge"=>4,"9xlarge"=>2, "18xlarge"=>1 },
-      'c5d' => { "large"=>36, "xlarge"=>18, "2xlarge"=>8, "4xlarge"=>4,"9xlarge"=>2, "18xlarge"=>1 },
-      'c5n' => { "large"=>36, "xlarge"=>18, "2xlarge"=>8, "4xlarge"=>4, "9xlarge"=>2, "18xlarge" =>1 },
-      'p2' => { "xlarge"=>16, "8xlarge"=>2, "16xlarge"=>1 },
-      'p3' => { "2xlarge"=>8, "8xlarge"=>2, "16xlarge"=>1 },
-      'p3dn' => { "24xlarge"=>1 },
-      'g2' => { "2xlarge"=>4, "8xlarge"=>1 },
-      'g3' => { "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
-      'g3s' => { "xlarge" => 1},
-      'f1' => { "2xlarge"=>8, "4xlarge"=>4, "16xlarge" =>1 },
-      'm3' => { "medium"=>32, "large"=>16, "xlarge"=>8, "2xlarge"=>4 },
-      'd2' => { "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
-      'h1' => { "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
-      'r3' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
-      'r4' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
-      'r5' => { "large"=> 48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
-      'r5d' => { "large"=> 48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
-      'r5a' => { "large"=> 48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1 },
-      'r5ad' => { "large"=> 48, "xlarge"=> 24, "2xlarge"=> 12, "4xlarge"=> 6, "12xlarge"=> 2, "24xlarge" => 1},
-      'm4' => { "large"=>22, "xlarge"=>11, "2xlarge"=>5, "4xlarge"=>4, "10xlarge"=>1, "16xlarge"=>1 },
-      'm5' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
-      'm5d' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
-      'm5a' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1 },
-      'm5ad' => { "large"=> 48, "xlarge"=> 24, "2xlarge"=> 12, "4xlarge"=> 6, "12xlarge"=> 2, "24xlarge" => 1},
-      'i2' => { "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1, "16xlarge"=>1 },
-      'i3' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1, "metal"=>1},
-      'i3p' => {"16xlarge"=>1},
-      'x1' => { "16xlarge"=>2, "32xlarge"=>1 },
-      'x1e' =>{ "xlarge"=>32, "2xlarge"=>16, "4xlarge"=>8, "8xlarge"=>4, "16xlarge"=>2, "32xlarge"=>1 },
-      'z1d' => {"large"=> 24, "xlarge"=> 12,  "2xlarge"=> 6,  "3xlarge"=> 4,  "6xlarge"=> 2,  "12xlarge"=> 1, "metal"=> 1},
-      'u-6tb1' => {"metal" => 1},
-      'u-9tb1' => {"metal" => 1},
-      'u-12tb1' => {"metal" => 1},
-    }
-
-    def get_ec2_dhi_od_pricing
-      @@OS_TYPES.each do |os|
-        fetch_ec2_dedicated_host_instance_pricing(DH_OD_BASE_URL + "dh-od.min.js", os.to_sym)
-      end
-    end
-
-    def fetch_ec2_dedicated_host_instance_pricing(url, operating_system)
-      res = PriceList.fetch_url(url)
-      res['config']['regions'].each do |reg|
-        begin
-          region_name = reg['region']
-          region = get_region(region_name)
-          if region.nil?
-            $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: unable to find region #{region_name}"
-            next
-          end
-          reg['types'].each do |type|
-            type_name = type['name']
-            tiers = type['tiers']
-            next if tiers.nil?
-            tiers.each do |tier|
-              family = tier['name']
-
-              # hack for now until I can get capacity for fpga instances
-              next if family == 'f1'
-              if @@CAPACITY_HASH[family].nil?
-                # 2017-11-08 family == 'c5' not supported for DH
-                $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: unable to find CAPACITY_HASH for #{family}"
-                next
-              end
-
-              dhprice = tier['prices']['USD']
-              @@CAPACITY_HASH[family].each do |inst_size,capacity|
-                api_name, name = Ec2InstanceType.get_name(family, "#{family}.#{inst_size}", false)
-                instance_type = region.add_or_update_ec2_instance_type(api_name, name)
-                instance_type.update_dhi_pricing(operating_system, dhprice, capacity)
-              end
-            end
-          end
-
-        rescue UnknownTypeError
-          $stderr.puts "[fetch_ec2_dedicated_host_instance_pricing] WARNING: encountered #{$!.message}"
-        end
-      end
-    end
-  end
-end

data/spec/lib/amazon-pricing/ec2_dhi_pricing_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe AwsPricing::Ec2DedicatedHostInstancePriceList do
-
-  before(:all) do
-    @pricing = AwsPricing::Ec2DedicatedHostInstancePriceList.new
-    @dh_pricing = AwsPricing::Ec2DedicatedHostPriceList.new
-  end
-
-  def validate_price_in_region region
-    # Result have valid node name
-    region.ec2_instance_types.each do |inst_type|
-      expect(inst_type.api_name).to match(/[[:alpha:]][[:alpha:]]./)
-      expect(inst_type.category_types).to have_exactly(@pricing.os_types.length).items
-      expect(inst_type.category_types[0].price_per_hour.class).to eq(Float)
-
-      family_name = inst_type.api_name.split('.').first
-      dh_region_arr = @dh_pricing.regions.select { |reg| reg.name == region.name }
-      expect(dh_region_arr).to have_exactly(1).items
-      dh_region = dh_region_arr[0]
-      dh_price_per_hour = dh_region.ec2_dh_types[0].price_per_hour(:linux, :ondemand)
-      dh_dh_type_arr = dh_region.ec2_dh_types.select { |type| type.api_name == family_name }
-      expect(dh_dh_type_arr).to have_exactly(1).items
-      dh_dh_type = dh_dh_type_arr[0]
-      expect(inst_type.category_types[0].price_per_hour).to be <= dh_dh_type.category_types[:linux].ondemand_price_per_hour
-    end
-  end
-
-  describe 'new' do
-    it 'Ec2DedicatedHostInstancePriceList.new should return valid response' do
-      @pricing.regions.each do |region|
-        validate_price_in_region region
-      end
-    end
-  end
-
-end