amazon-pricing 0.1.129 → 0.1.130

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTcwYjNiYjFmZTNjNTIzMWE4ZDE4Njc2ZGVlZGU5OTgwNjcyMDI1Ng==
-  data.tar.gz: !binary |-
-    M2U5ZWU1MjIzM2IzNmI3ZTI0YzM3ODIxMDZlZDYxY2I0ZWNhYzI2NQ==
+SHA1:
+  metadata.gz: c09f9adf580b4be60a4c4044c5d7c72064f5bc7d
+  data.tar.gz: 15dbc1e40985deaed835c25787e17a7db3ee7ab2
 SHA512:
-  metadata.gz: !binary |-
-    ZjA4ZTY2MzE3MzFhOTE4MzkxOWIzNjI5OTAzMzg1N2JhOWZiM2EwOWQyMmJm
-    YTE4ZDhmNDllZmNkODdiZDBiYWEzYTIxZWE1ODI0YWViZDhjNzEwY2U0OTc4
-    NjkxZDY1YWVmYzkwMGYwZWFiOGFiYzJiZTZjYWI1NDRkODE5ZTg=
-  data.tar.gz: !binary |-
-    N2JjNDY1Y2M0MzcwNzI3Y2IwMzU1ZTMyN2RhMzAwOTg1MDMwNGFjN2VkMGY1
-    ZmE5ZTJiY2NhNjllYmQwZTQxNmI4ZWMzOWEzOThkNjRkNjNlZDZiOTliOTRk
-    NTdjZTQ0YjljZGVhYWFkOTkxMjg3ZmRmYWM1OTFjNGU2ODA1NWY=
+  metadata.gz: 5612b47fe5eefcd2a7ed94aac3ca0b76f01b424a42aea034d06667aa4aaca648bee7614137846b503243114223c3602e0263288fb67eb12024838ce4fd4106ec
+  data.tar.gz: 0756f6b8f2e15584ba8f551a7fd48efa8bb9de2c28ae11730d925eb45cd5b3e064eadf619d9476237276ebea7789bc855a57635379a917327421876547fdd75a

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

@@ -451,6 +451,9 @@ module AwsPricing
       'r5a.4xlarge' => :ten_gigabit, # upto 10G
       'r5a.12xlarge' => :ten_gigabit,
       'r5a.24xlarge' => :twenty_gigabit,
+      'u-6tb1.metal' =>  :twentyfive_gigabit,
+      'u-9tb1.metal' =>  :twentyfive_gigabit,
+      'u-12tb1.metal' => :twentyfive_gigabit,
 
     }
 

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

@@ -252,6 +252,9 @@ module AwsPricing
         'm5a.12xlarge' => 'General Purpose M5A Twelve Extra Large',  'm5a.24xlarge' => 'General Purpose M5A Twenty Four Extra Large',
       'r5a.large' => 'Memory Optimized R5A Large', 'r5a.xlarge' => 'Memory Optimized R5A Extra Large', 'r5a.2xlarge' => 'Memory Optimized R5A Double Extra Large', 'r5a.4xlarge' => 'Memory Optimized R5A Quadruple Extra Large',
         'r5a.12xlarge' => 'Memory Optimized R5A Twelve Extra Large', 'r5a.24xlarge' => 'Memory Optimized R5A Twenty Four Extra Large',
+      'u-6tb1.metal' => "Memory Optimized u-6tb1 Metal",
+      'u-9tb1.metal' => "Memory Optimized u-9tb1 Metal",
+      'u-12tb1.metal' => "Memory Optimized u-12tb1 Metal",
     }
     @@Disk_Lookup = { # size of disk supported (local disk size) TOTAL size in gb
       'a1.medium' => 0, 'a1.large' => 0, 'a1.xlarge' => 0,  'a1.2xlarge' => 0, 'a1.4xlarge' => 0, # ebs-optimized
@@ -298,6 +301,9 @@ module AwsPricing
       'z1d.large' => 75, 'z1d.xlarge' => 150, 'z1d.2xlarge' => 300, 'z1d.3xlarge' => 450, 'z1d.6xlarge' => 900, 'z1d.12xlarge' => 1800, # NVMe
       'm5a.large' => 0, 'm5a.xlarge' => 0, 'm5a.2xlarge' => 0, 'm5a.4xlarge' => 0, 'm5a.12xlarge' => 0, 'm5a.24xlarge' => 0, #ebs-only
       'r5a.large' => 0, 'r5a.xlarge' => 0, 'r5a.2xlarge' => 0, 'r5a.4xlarge' => 0, 'r5a.12xlarge' => 0, 'r5a.24xlarge' => 0, #ebs-only
+      'u-6tb1.metal' =>  0, #ebs-only
+      'u-9tb1.metal' =>  0, #ebs-only
+      'u-12tb1.metal' => 0, #ebs-only
     }
     @@Platform_Lookup = { #bit width of cpu
       'a1.medium' =>  64, 'a1.large' =>  64,   'a1.xlarge' =>  64, 'a1.2xlarge' => 64, 'a1.4xlarge' => 64,
@@ -343,6 +349,9 @@ module AwsPricing
       'z1d.large' => 64, 'z1d.xlarge' => 64, 'z1d.2xlarge' => 64, 'z1d.3xlarge' => 64, 'z1d.6xlarge' => 64, 'z1d.12xlarge' => 64,
       'm5a.large' => 64, 'm5a.xlarge' => 64, 'm5a.2xlarge' => 64, 'm5a.4xlarge' => 64, 'm5a.12xlarge' => 64, 'm5a.24xlarge' => 64,
       'r5a.large' => 64, 'r5a.xlarge' => 64, 'r5a.2xlarge' => 64, 'r5a.4xlarge' => 64, 'r5a.12xlarge' => 64, 'r5a.24xlarge' => 64,
+      'u-6tb1.metal' =>  64,
+      'u-9tb1.metal' =>  64,
+      'u-12tb1.metal' => 64,
     }
     @@Disk_Type_Lookup = { #type of local storage for the disk
       'a1.medium' => :ebs,'a1.large' =>  :ebs, 'a1.xlarge' => :ebs, 'a1.2xlarge' => :ebs, 'a1.4xlarge' => :ebs,
@@ -390,6 +399,9 @@ module AwsPricing
       'z1d.large' => :ssd, 'z1d.xlarge' => :ssd, 'z1d.2xlarge' => :ssd, 'z1d.3xlarge' => :ssd, 'z1d.6xlarge' => :ssd, 'z1d.12xlarge' => :ssd,
       'm5a.large' => :ebs, 'm5a.xlarge' => :ebs, 'm5a.2xlarge' => :ebs, 'm5a.4xlarge' => :ebs, 'm5a.12xlarge' => :ebs, 'm5a.24xlarge' => :ebs,
       'r5a.large' => :ebs, 'r5a.xlarge' => :ebs, 'r5a.2xlarge' => :ebs, 'r5a.4xlarge' => :ebs, 'r5a.12xlarge' => :ebs, 'r5a.24xlarge' => :ebs,
+      'u-6tb1.metal' =>  :ebs,
+      'u-9tb1.metal' =>  :ebs,
+      'u-12tb1.metal' => :ebs,
     }
 
     # NOTE: These are populated by "populate_lookups"
@@ -641,6 +653,9 @@ module AwsPricing
       'r5a.4xlarge' => [ 265, 16000 ], #EBSOptimized
       'r5a.12xlarge' => [ 625, 30000 ], #EBSOptimized
       'r5a.24xlarge' => [ 1250, 60000 ], #EBSOptimized
+      'u-6tb1.metal' => [ 1750, 80000], #EBSOptimized
+      'u-9tb1.metal' =>  [ 1750, 80000], #EBSOptimized
+      'u-12tb1.metal' => [ 1750, 80000], #EBSOptimized
     }
   end
 end

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

@@ -51,7 +51,9 @@ module AwsPricing
       '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},
-
+      'u-6tb1' => {"metal" => 1},
+      'u-9tb1' => {"metal" => 1},
+      'u-12tb1' => {"metal" => 1},
     }
 
     def get_ec2_dhi_od_pricing

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

@@ -46,7 +46,10 @@ module AwsPricing
                 'R5A' => ['r5a.large', 'r5a.xlarge', 'r5a.2xlarge', 'r5a.4xlarge', 'r5a.12xlarge', 'r5a.24xlarge'],
                 'X1'  => ['x1.16xlarge', 'x1.32xlarge'],
                 'X1E'  => ['x1e.xlarge', 'x1e.2xlarge', 'x1e.4xlarge', 'x1e.8xlarge', 'x1e.16xlarge', 'x1e.32xlarge'],
-                'Z1D' => ['z1d.large', 'z1d.xlarge', 'z1d.2xlarge', 'z1d.3xlarge', 'z1d.6xlarge', 'z1d.12xlarge']
+                'Z1D' => ['z1d.large', 'z1d.xlarge', 'z1d.2xlarge', 'z1d.3xlarge', 'z1d.6xlarge', 'z1d.12xlarge'],
+                'U-6TB1' => ['u-6tb1.metal'],
+                'U-9TB1' => ['u-9tb1.metal'],
+                'U-12TB1' => ['u-12tb1.metal'],
             },
             'PreviousGen' => {
                 'M2'  => ['m2.xlarge', 'm2.2xlarge', 'm2.4xlarge'],
@@ -167,16 +170,26 @@ module AwsPricing
         all_instances.select { |family, instances| instances.include?(api_name) }.values.first
       end
 
-
       def api_name_to_nf(name)
         type = name.split('.').last
         if (type == METAL)
+          # See if our metal instance has a hard-coded nf value
+          if !metal_to_nf[name].nil?
+            return metal_to_nf[name]
+          end
           # try to get largest size supported for family: presumes METAL is *not* in size_to_nf hash
           # assumes family_members are sorted by size
           sizes = family_members(name)
+          # Return nil if we have a bogus instance type
+          if sizes.nil?
+            return nil
+          end
           type = sizes[-1].split('.').last        # 'metal' defaults to largest size
           if sizes[-1].split('.').last == METAL
-            type = sizes[-2].split('.').last      # 'metal' already largest, so 2nd largest      
+            if sizes.size == 1 # We have an instance family with only metals but no NF associated; raise an error
+              raise UnknownTypeError, "Unknown metal type #{name}", caller
+            end
+            type = sizes[-2].split('.').last      # 'metal' already largest, so 2nd largest
           end
         end
         size_to_nf[type]
@@ -210,6 +223,11 @@ module AwsPricing
         NF_TO_SIZE_TABLE
       end
 
+      def metal_to_nf
+        METAL_TO_NF_TABLE
+      end
+
+      # Remove metal from this array? force adoption of this
       # NB: 'metal' is not in this table (since it's family specific), see #api_name_to_nf
       SIZE_TO_NF_TABLE = {
           "nano"    => 0.25,
@@ -227,13 +245,20 @@ module AwsPricing
           "10xlarge" => 80,
           "12xlarge" => 96,
           "16xlarge" => 128,
-          "metal"    => 128, # temporary (for _direct_ users of this hash), as only applies to i3.metal
+          "metal" => 128,  # We will be removing this once size_to_nf is deprecated.
           "18xlarge" => 144,
           "24xlarge" => 192,
           "32xlarge" => 256,
       }
       NF_TO_SIZE_TABLE = SIZE_TO_NF_TABLE.invert
 
+      METAL_TO_NF_TABLE = {
+        'u-6tb1.metal' => 896,
+        'u-9tb1.metal' => 896,
+        'u-12tb1.metal' => 896,
+        'i3.metal' => 128,
+      }
+
     end
   end
 end

data/lib/amazon-pricing/version.rb

@@ -9,6 +9,6 @@
 #++
 module AwsPricing
 
-VERSION = '0.1.129' # [major,minor.fix]: Adding eu-north-1 region
+VERSION = '0.1.130' # [major,minor.fix]: Support for all metal instances
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.129
+  version: 0.1.130
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -71,21 +71,21 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - amazon-pricing documentation
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []