fog-softlayer 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4653fea3f18009d860e8472c3c0a30a94888b628
-  data.tar.gz: 91e26288c27c6990a36b2a435def63e05c13a63a
+  metadata.gz: c8e974e2bd69d7a85f5f75c30c58aab63c5feb4a
+  data.tar.gz: 62a6c43e1da9592ba070e14269429a49e44c1afb
 SHA512:
-  metadata.gz: 2c6e003eb7e9bd6452f02f8d7ceccdb5b81e6e6b30d2239b67a203b2f2105072d4c4ed25adc957e47362d6e324ad2e8b182e9571e04a4dd629f56ec5110f1480
-  data.tar.gz: 06d9e733a5f5b60041b6c7ecb33abd1fb8441261151466ff26ab50e1c0444999fe3043d118f465968c4b9e4161df77b47590a6d25c9f9e82cb9c536a43a7c5ee
+  metadata.gz: 567acc968851f508de336f89b888cdee138d061a365bec496d8f3b452321c0d0eaa9c9dfdd9d32c359fff754981a034bc0020d3e1aa5a06c8fb21b6571329919
+  data.tar.gz: ef12acaa5e16d13049045aa31b59371542bdbfcabbd68694251b763fb0f46dbc17a59810f06d2c1add38db8b074d8d434c2b2a20b97323fd596be3fd8ff36a17

data/.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{rb,gemspec}]
+indent_size = 2
+indent_style = space
+
+[Gemfile]
+indent_size = 2
+indent_style = space

data/.travis.yml

@@ -24,4 +24,5 @@ notifications:
 
 before_install:
   - gem update --system #  todo: workaround for https://github.com/rubygems/rubygems/pull/763
+  - gem update bundler
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v1.1.0
+__features__
+
+* Add support for pre-configured bare metal with fast provisioning times.
+
 # v0.4.7
 
 __features__

data/examples/compute.md

@@ -150,6 +150,24 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
      @sl.servers.create(opts)
      new_server.id # => 1338
    ```
+   
+1. Provision a *preset* Bare Metal instance (instant provisioning).
+    1. First get a list of available preset configuration keys:
+
+        ```ruby
+        
+        ``` 
+
+    ```ruby
+        opts = {  
+            :domain => 'example.com',  
+            :name => 'my-test',  
+            :flavor_id => 'm1.small', 
+            :fixed_configuration_preset => '50_128GB_4X800GBSSD_RAID10',
+            :os_code => 'UBUNTU_LATEST',  
+            :datacenter => 'wdc01'
+        }
+    ```
 
 1. Provision a new VM without flavor.
 

data/examples/storage.md

@@ -10,6 +10,23 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
 	@sl = Fog::Storage[:softlayer]
 ```
 
+#### Create a connection within a Bluemix Application to Bluemix v1 Object Storage
+
+```ruby
+	require 'fog/softlayer'
+	objstor_service = JSON.parse(ENV['VCAP_SERVICES'])["objectstorage"].first["credentials"]
+	bluemix_app_name = JSON.parse(ENV["VCAP_APPLICATION"])["name"]
+
+	@sl = Fog::Storage.new({
+	   :provider => 'softlayer',
+	   :softlayer_username => objstor_service['username'].to_s,
+	   :softlayer_api_key => objstor_service['password'].to_s,
+	   :softlayer_storage_account => bluemix_app_name, 
+	   :softlayer_bluemix_objstor_auth_url => objstor_service['auth_uri'].to_s,
+	   :softlayer_cluster => 'dal05'
+	})
+```
+
 #### Use the Models
 1. List directories/containers.
 

data/lib/fog/softlayer/compute.rb

@@ -48,6 +48,7 @@ module Fog
       request :describe_tags
       request :generate_bare_metal_order_template
       request :generate_virtual_guest_order_template
+      request :get_available_preset_codes
       request :get_bare_metal_active_tickets
       request :get_bare_metal_create_options
       request :get_bare_metal_server

data/lib/fog/softlayer/models/compute/server.rb

@@ -29,6 +29,7 @@ module Fog
         attribute :ephemeral_storage,        :aliases => 'localDiskFlag'
         attribute :key_pairs,                :aliases => 'sshKeys'
         attribute :network_components
+        attribute :fixed_configuration_preset, :aliases => 'fixedConfigurationPreset'
 
         # Times
         attribute :created_at,              :aliases => ['createDate', 'provisionDate'], :type => :time
@@ -121,6 +122,7 @@ module Fog
 
         def pre_save
           extract_flavor
+          self.bare_metal = true if attributes[:fixed_configuration_preset] and not bare_metal?
           validate_attributes
           if self.vlan
             attributes[:vlan] = { :networkVlan => { :id => self.vlan.id } }
@@ -139,6 +141,10 @@ module Fog
             end
           end
 
+          if attributes[:fixed_configuration_preset].is_a? String
+              attributes[:fixedConfigurationPreset] = {:keyName => attributes.delete(:fixed_configuration_preset)}
+          end
+
           remap_attributes(attributes, attributes_mapping)
           clean_attributes
         end
@@ -343,7 +349,7 @@ module Fog
           copy = self.dup
           copy.pre_save
 
-          data = if bare_metal?
+          data = if copy.bare_metal?
             service.create_bare_metal_server(copy.attributes).body
           else
             service.create_vm(copy.attributes).body.first
@@ -384,10 +390,49 @@ module Fog
         def generate_order_template
           copy = self.dup
           copy.pre_save
-          return service.generate_bare_metal_order_template(copy.attributes).body if bare_metal?
+          return service.generate_bare_metal_order_template(copy.attributes).body if copy.bare_metal?
           service.generate_virtual_guest_order_template(copy.attributes).body
         end
 
+        def wait_for_id(timeout=14400, delay=30)
+          # Cannot use self.wait_for because it calls reload which requires
+          # self.id which is not initially available for bare metal.
+          filterStr = Fog::JSON.encode({
+            "hardware" => {
+              "hostname" => {
+                "operation" => self.name,
+              },
+              "domain" => {
+                "operation" => self.domain,
+              },
+              "globalIdentifier" => {
+                "operation" => self.uid,
+              },
+            }
+          })
+
+          Fog.wait_for(timeout, delay) do
+            res = service.request(:account, 'getHardware', :query => {
+              :objectMask => 'mask[id,fullyQualifiedDomainName,provisionDate,hardwareStatus,lastTransaction[elapsedSeconds,transactionStatus[friendlyName]],operatingSystem[id,passwords[password,username]]]',
+              :objectFilter => filterStr,
+            })
+
+            server = res.body.first
+
+            yield server if block_given?
+
+            if server and server["provisionDate"]
+                attributes[:id] = server['id']
+                true
+            else
+                false
+            end
+          end
+
+          self.reload
+          true
+        end
+
         private
 
         def network_connection
@@ -455,7 +500,8 @@ module Fog
               :cpu  =>   :processorCoreAmount,
               :ram  =>   :memoryCapacity,
               :disk =>   :hardDrives,
-              :bare_metal => :bareMetalInstanceFlag
+              :bare_metal => :bareMetalInstanceFlag,
+              :fixed_configuration_preset => :fixedConfigurationPreset,
             }
           else
             {
@@ -470,12 +516,13 @@ module Fog
         end
 
         def bare_metal=(set)
+          return @bare_metal if set == @bare_metal
           raise Exception, "Bare metal flag has already been set" unless @bare_metal.nil?
           @bare_metal = case set
             when false, 'false', 0, nil, ''
-              false
+              attributes[:bare_metal] = false
             else
-              true
+              attributes[:bare_metal] = true
           end
         end
 
@@ -485,6 +532,7 @@ module Fog
           attributes.delete(:bare_metal)
           attributes.delete(:flavor_id)
           attributes.delete(:ephemeral_storage)
+          attributes.delete(:tags) if bare_metal?
         end
 
         ##
@@ -505,9 +553,14 @@ module Fog
         end
 
         def validate_attributes
-          requires :name, :domain, :cpu, :ram, :datacenter
-          requires_one :os_code, :image_id
-          requires_one :disk, :image_id
+          requires :name, :domain, :datacenter
+          if attributes[:fixed_configuration_preset]
+              requires :os_code
+          else
+              requires :cpu, :ram
+              requires_one :os_code, :image_id
+              requires_one :disk, :image_id
+          end
           bare_metal? and image_id and raise ArgumentError, "Bare Metal Cloud does not support booting from Image"
         end
 

data/lib/fog/softlayer/models/compute/servers.rb

@@ -78,6 +78,10 @@ module Fog
         def get_vm_create_options
           service.get_virtual_guest_create_options.body
         end
+
+        def get_available_preset_codes
+          service.get_available_preset_codes.body['fixedConfigurationPresets'].map { |item| { :desc => item['preset']['description'], :key => item['preset']['keyName'] } }
+        end
       end
     end
   end

data/lib/fog/softlayer/models/storage/directory.rb

@@ -46,7 +46,10 @@ module Fog
         alias_method :public?, :public
 
         def public_url
-          raise NotImplementedError
+          requires :key
+          cluster = service.cluster.downcase
+          key = Fog::Softlayer.escape(self.key)
+          "http://17532.http.#{cluster}.cdn.softlayer.net/#{key}"
         end
 
         def save

data/lib/fog/softlayer/network.rb

@@ -170,7 +170,7 @@ module Fog
         # @return [Integer]
         def global_ipv4_price_code
           request(:product_package, '0/get_item_prices', :query => 'objectMask=mask[id,item.description,categories.id]').body.map do |item|
-            item['id'] if item['categories'][0]['id'] == global_ipv4_cat_code
+            item['id'] if item.has_key?('categories') && !item['categories'][0].nil? && item['categories'][0]['id'] == global_ipv4_cat_code
           end.compact.first
         end
 

data/lib/fog/softlayer/requests/compute/get_available_preset_codes.rb

@@ -0,0 +1,40 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        def get_available_preset_codes
+          {
+              "fixedConfigurationPresets" =>
+                  [{"preset"=>{"description"=>"Single Xeon 1270, 8GB Ram, 2x1TB SATA disks, Non-RAID", "keyName"=>"S1270_8GB_2X1TBSATA_NORAID", "totalMinimumHourlyFee"=>".368", "totalMinimumRecurringFee"=>"244"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"S1270_8GB_2X1TBSATA_NORAID"}}},
+                   {"preset"=>{"description"=>"Single Xeon 1270, 32GB Ram, 1x1TB SATA disks, Non-RAID", "keyName"=>"S1270_32GB_1X1TBSATA_NORAID", "totalMinimumHourlyFee"=>".595", "totalMinimumRecurringFee"=>"395"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"S1270_32GB_1X1TBSATA_NORAID"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2620, 32GB Ram, 4x1TB SATA disks, Non-RAID", "keyName"=>"D2620_32GB_4X1TBSATA_NORAID", "totalMinimumHourlyFee"=>".786", "totalMinimumRecurringFee"=>"522"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2620_32GB_4X1TBSATA_NORAID"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2620, 64GB Ram, 2x1TB SATA disks, Non-RAID", "keyName"=>"D2620_64GB_2X1TBSATA_NORAID", "totalMinimumHourlyFee"=>".978", "totalMinimumRecurringFee"=>"649"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2620_64GB_2X1TBSATA_NORAID"}}},
+                   {"preset"=>{"description"=>"Single Xeon 1270, 32GB Ram, 2x960GB SSD disks, Non-RAID", "keyName"=>"S1270_32GB_2X400GBSSD_NORAID", "totalMinimumHourlyFee"=>"1.057", "totalMinimumRecurringFee"=>"701"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"S1270_32GB_2X400GBSSD_NORAID"}}},
+                   {"preset"=>{"description"=>"Single Xeon 1270, 32GB Ram, 2x960GB SSD disks, Non-RAID", "keyName"=>"S1270_32GB_2X960GBSSD_NORAID", "totalMinimumHourlyFee"=>"1.057", "totalMinimumRecurringFee"=>"701"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"S1270_32GB_2X960GBSSD_NORAID"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2650, 64GB Ram, 4x1TB SATA disks, Non-RAID", "keyName"=>"D2650_64GB_4X1TBSATA_NORAID", "totalMinimumHourlyFee"=>"1.148", "totalMinimumRecurringFee"=>"762"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2650_64GB_4X1TBSATA_NORAID"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2650, 128GB Ram, 1x1TB SATA  disks, Non-RAID", "keyName"=>"D2650_128GB_1X1TBSATA_NORAID", "totalMinimumHourlyFee"=>"1.399", "totalMinimumRecurringFee"=>"929"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2650_128GB_1X1TBSATA_NORAID"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2620, 64GB Ram, 4x600GB SAS disks, RAID10", "keyName"=>"D2620_64GB_4X300GBSAS_RAID10", "totalMinimumHourlyFee"=>"1.603", "totalMinimumRecurringFee"=>"1068"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2620_64GB_4X300GBSAS_RAID10"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2690, 128GB Ram, 2x600GB SAS disks, RAID1", "keyName"=>"D2690_128GB_2X600GBSAS_RAID1", "totalMinimumHourlyFee"=>"1.87", "totalMinimumRecurringFee"=>"1246"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2690_128GB_2X600GBSAS_RAID1"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2690, 128GB Ram, 2x600GB SAS disks, RAID1", "keyName"=>"D2690_128GB_2X600GBSAS_RAID1_2", "totalMinimumHourlyFee"=>"1.893", "totalMinimumRecurringFee"=>"1261"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2690_128GB_2X600GBSAS_RAID1_2"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2690, 64GB Ram, 4x960GB SSD disks, RAID10", "keyName"=>"D2690_64GB_4X960GBSSD_RAID10", "totalMinimumHourlyFee"=>"2.226", "totalMinimumRecurringFee"=>"1481"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2690_64GB_4X960GBSSD_RAID10"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2690, 256GB Ram, 4x600GB SAS disks, RAID10", "keyName"=>"D2690_256GB_4X600GBSAS_RAID10_RAID_10", "totalMinimumHourlyFee"=>"2.605", "totalMinimumRecurringFee"=>"1733"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2690_256GB_4X600GBSAS_RAID10_RAID_10"}}},
+                   {"preset"=>{"description"=>"Dual Xeon 2650, 128GB Ram, 4x800GB SSD disks, RAID10", "keyName"=>"D2650_128GB_4X800GBSSD_RAID10", "totalMinimumHourlyFee"=>"2.749", "totalMinimumRecurringFee"=>"1828"}, "template"=>{"fixedConfigurationPreset"=>{"keyName"=>"D2650_128GB_4X800GBSSD_RAID10"}}}]
+          }
+        end
+      end
+
+      class Real
+        def get_available_preset_codes
+          self.request(:hardware_server, :get_create_object_options, :http_method => :GET)
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/storage.rb

@@ -5,11 +5,13 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
+require 'base64'
+
 module Fog
   module Storage
     class Softlayer < Fog::Service
       requires :softlayer_username, :softlayer_api_key, :softlayer_cluster
-      recognizes :persistent, :softlayer_storage_account, :softlayer_temp_url_key
+      recognizes :persistent, :softlayer_storage_account, :softlayer_temp_url_key, :softlayer_bluemix_objstor_auth_url
 
       model_path 'fog/softlayer/models/storage'
       model       :directory
@@ -87,7 +89,7 @@ module Fog
       class Real
         include Integrity
 
-        attr_reader :auth_url
+        attr_reader :auth_url, :cluster
         attr_accessor :auth_token, :auth_expires
 
         def initialize(options={})
@@ -97,6 +99,7 @@ module Fog
           @cluster = options[:softlayer_cluster]
           @storage_account = options[:softlayer_storage_account] || default_storage_account(options[:softlayer_username], options[:softlayer_api_key])
           @connection_options     = options[:connection_options] || {}
+          @bluemix_objstor_auth_url = options[:softlayer_bluemix_objstor_auth_url] || nil
           authenticate
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@@ -104,7 +107,7 @@ module Fog
         end
 
         def auth_url
-          "https://#{@cluster}.#{Fog::Softlayer::SL_STORAGE_AUTH_URL}"
+          @bluemix_objstor_auth_url.nil? ? "https://#{@cluster}.#{Fog::Softlayer::SL_STORAGE_AUTH_URL}" : "#{@bluemix_objstor_auth_url}/#{@storage_account}"
         end
 
         def reload
@@ -141,13 +144,23 @@ module Fog
         private
 
         def _auth_headers
-          {
-              :headers => {
-                  'User-Agent' => "Fog SoftLayer Adapter #{Fog::Softlayer::VERSION}",
-                  'X-Auth-User' => "#{@storage_account}:#{@username}",
-                  'X-Auth-Key'  => @api_key
-              }
-          }
+          unless @bluemix_objstor_auth_url.nil?
+            puts "Bluemix Object Store v1 Authentication Header Required ..."
+            {
+                :headers => {
+                    'User-Agent' => "Fog SoftLayer Adapter #{Fog::Softlayer::VERSION}",
+                    'Authorization' => "Basic " + Base64.strict_encode64("#{@username}" + ':' + "#{@api_key}")
+                }
+            }
+          else
+            {
+                :headers => {
+                    'User-Agent' => "Fog SoftLayer Adapter #{Fog::Softlayer::VERSION}",
+                    'X-Auth-User' => "#{@storage_account}:#{@username}",
+                    'X-Auth-Key'  => @api_key
+                }
+            }
+          end
         end
 
         def _build_params(params)
@@ -296,4 +309,3 @@ module Fog
     end
   end
 end
-

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

data/tests/softlayer/models/storage/directory_tests.rb

@@ -36,6 +36,21 @@ Shindo.tests("Fog::Storage[:softlayer] | Directory model", ["softlayer"]) do
       data_matches_schema([Fog::Storage::Softlayer::Directory]) { @storage.directories.all }
     end
 
+    tests("#public_url") do
+      data_matches_schema(String) do
+        directory = @storage.directories.create(:key => @test_dir1)
+        service = directory.service
+        def service.cluster
+          @cluster ||= %w[
+            AMS01 CHE01 DAL05 FRA02
+            HKG02 LON02 MEL01 MEX01
+            MON01 PAR01 SAO01 SJC01
+            SNG01 SYD01 TOK02 TOR01
+          ].sample
+        end
+        directory.public_url
+      end
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -185,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -275,6 +276,7 @@ files:
 - lib/fog/softlayer/requests/compute/describe_tags.rb
 - lib/fog/softlayer/requests/compute/generate_bare_metal_order_template.rb
 - lib/fog/softlayer/requests/compute/generate_virtual_guest_order_template.rb
+- lib/fog/softlayer/requests/compute/get_available_preset_codes.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_active_tickets.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_create_options.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_server.rb