fog-softlayer 0.3.6 → 0.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJhYzVmZmIzZTFmNzIwYjlkOGM2YTg4ZjQ1MTY2M2JjOGY3ZjM3MQ==
+    NTRkYjQxZWNhZTFhMzZhNWE5OWU2NmIyMjQ3ZGVkYzI2MTQ0MGRhZA==
   data.tar.gz: !binary |-
-    YjIxY2IzMjIwODRlY2QzOWQyMmU2ODA5Y2VhZDJlYTA4MDliYjA1NA==
+    YjkzMWIxMWU2NTVkY2E4N2U4YTE5ZThmZmU4ZWZhNWI1MDQ1MmNiMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjQ1NDFlYzgxZjMxYjMzYmIyNTZiM2Y1YWFiYjMzODU3MTE0NzdhNWZiYmNl
-    OGM5NWY3OGEyYzM3NTRjNDQ3NDc2NDg1OGI3ZDAyYmVkOTIzNjBmMTc0NzEz
-    ODdkZmJhODEwODllMTBmZmYzMmNmM2ZlNzBjMjdhY2JkMGJjZGE=
+    YmFmY2YyMTc2MzU2NDNhOGM5MDUyMjFhOTVjOWM2ZjQ1YzRhMjRlNzY4ZjI4
+    NDg2NjZkMTJmYTI2OTQxN2Q1OGFmZDU4NGQ4ZjIyZjQ0NDVjYmFhNjA0ZmQy
+    MDMxNTljNmE2Yjg4YjllMWU2ZDM5MWU4NDBlYzkzNzY2YmFhMzk=
   data.tar.gz: !binary |-
-    M2U3M2ZhZDIxNzZiODZkYWZmNTg1MGNiY2Y3MDM4OTcyMDcxMDY3NDMxYWUy
-    MGZmYzY1YmZlNTQwZjRmZmJhNjhiOGQyZDU1YTA4NDhkNzE4ZTNiZGNkODQx
-    NGJmZTQ4ZGVjN2RlM2E2NmM5OGNlNTkzNjU2MmNhZGNiNzhiMDM=
+    NWIwOTc3N2ZiMGQ4MmYxMWMxOGZiMjllODg0MDk1YmVkNmJlMWQ0MmVhY2I5
+    OTU2Y2ExYzA4MDdiNzMzYTNmMjZjODY1YWRlNzFkNjQzNmE3NDM0NjVkZTIy
+    MjI1MThjZDI3NTFlMjIxODg2ZjQxYjU1OTQ4ZTY5YWVjY2NiZGQ=

data/.travis.yml

@@ -26,6 +26,8 @@ matrix:
       gemfile: Gemfile
 
   allow_failures:
+    - rvm: 1.8.7
+    - rvm: jruby-18mode
     - rvm: jruby-head
 
 notifications:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.7 2014-07-11
+* Added support for ssh key pairs.
+  * See [key_pairs.md](https://github.com/fog/fog-softlayer/blob/master/examples/key_pairs.md) for details.
+* Fix [issue 19](https://github.com/fog/fog-softlayer/issues/19) Storage initialization bug.
+* Fix [issue 17], incompatibility with Rails 4.1.4. *thanks konsti*
+* Updated .fog file example and datacenter option. *thanks 
+
 ## 0.3.2 2014-06-30
 * No longer requires `fog` gem.
 
@@ -10,7 +17,7 @@
   * Tag model.
 * Added vlan and private_vlan properties to Server model.
 * Fixed up bare_metal? on Server so it's not a hack. *thanks fernandes*
-* Fixed Bundler/dep issues with Ruby 1.8.7. (Thx @fernandes!)
+* Fixed Bundler/dep issues with Ruby 1.8.7. *thanks fernandes*
 * Added some missing license headers.
 * Updated Compute examples and Tag examples to reflect new Network service.
 * Moved shared logic from `lib/fog/softlayer/compute.rb` to `lib/fog/softlayer/core.rb`

data/CONTRIBUTORS.md

@@ -1,2 +1,4 @@
 * Celso Fernandes <fernandes@zertico.com>
+* Hiroyuki Urasoko <ura.58.58@gmail.com>
+* Konstantin Krauss <konstantin@propertybase.com>
 * Matt Eldridge <matt.eldridge@us.ibm.com>

data/README.md

@@ -1,7 +1,7 @@
 ### `fog-softlayer` - SoftLayer module for fog.
 [![Gem Version](https://badge.fury.io/rb/fog-softlayer.png)](http://badge.fury.io/rb/fog-softlayer)
-[![Build Status](https://api.travis-ci.org/softlayer/fog-softlayer.svg)](https://travis-ci.org/softlayer/fog-softlayer)
-[![Dependency Status](https://gemnasium.com/softlayer/fog-softlayer.svg)](https://gemnasium.com/softlayer/fog-softlayer)
+[![Build Status](https://api.travis-ci.org/fog/fog-softlayer.svg)](https://travis-ci.org/fog/fog-softlayer)
+[![Dependency Status](https://gemnasium.com/fog/fog-softlayer.svg)](https://gemnasium.com/fog/fog-softlayer)
 
 This gem is a module for the `fog` gem that allows you to manage resources in
 the SoftLayer Cloud.

data/examples/compute.md

@@ -3,9 +3,10 @@
 These examples all assume you have `~/.fog` which contains the following
 
    ```yaml  
-   :softlayer_username: example-username
-   :softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
-   :softlayer_default_domain: example.com
+default:
+  softlayer_username: example-username
+  softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
+  softlayer_default_domain: example.com
   ```
   
 #### Create a connection to SoftLayer Compute Service
@@ -127,7 +128,7 @@ These examples all assume you have `~/.fog` which contains the following
      	:flavor_id => "m1.small",
      	:image_id => "23f7f05f-3657-4330-8772-329ed2e816bc",
      	:name => "test",
-     	:datacenter => {:name=>"ams01"}
+     	:datacenter => "ams01"
      }
      new_server = @sl.servers.create(opts)
      new_server.id # => 1337
@@ -140,7 +141,7 @@ These examples all assume you have `~/.fog` which contains the following
      	:flavor_id => "m1.small",
      	:os_code => "UBUNTU_LATEST",
      	:name => "test1",
-     	:datacenter => {:name=>"ams01"},
+     	:datacenter => "ams01",
      	:bare_metal => true
      }
      @sl.servers.create(opts)
@@ -159,7 +160,7 @@ These examples all assume you have `~/.fog` which contains the following
      	:name => "hostname",
      	:os_code => "UBUNTU_LATEST",
      	:name => "test2",
-     	:datacenter => {:name=>"ams01"},     
+     	:datacenter => "ams01"     
      }
    ```
 
@@ -175,11 +176,31 @@ These examples all assume you have `~/.fog` which contains the following
      	:name => "hostname",
      	:os_code => "UBUNTU_LATEST",
      	:name => "test2",
-     	:datacenter => {:name=>"ams01"},
+     	:datacenter => "ams01",
      	:bare_metal => true
      }
    ```
 
+1. Create a server with one or more key pairs (also see [key_pairs.md](./key_pairs.md) )
+
+	```ruby
+	the_first_key = @sl.key_pairs.by_label('my-new-key')
+	# => <Fog::Compute::Softlayer::KeyPair>
+	the_second_key = @sl.key_pairs.by_label('my-other-new-key')
+	# => <Fog::Compute::Softlayer::KeyPair>
+	
+	opts = { 
+		:flavor_id => 'm1.small', 
+		:os_code => 'UBUNTU_LATEST', 
+		:datacenter => 'hkg02', 
+		:name => 'cphrmky', 
+		:key_pairs => [ the_first_key, the_second_key ]
+	}
+	@sl.servers.create(opts)
+	# => <Fog::Compute::Softlayer::Server>
+```
+
+
 1. Delete a VM or Bare Metal instance.
 
    ```ruby

data/examples/dns.md

@@ -4,8 +4,9 @@ These examples all assume you have `~/.fog` which contains the following
 
 
    ```yaml  
-   :softlayer_username: example-username
-   :softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1
+default:
+  softlayer_username: example-username
+  softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1
   ```
 
 #### Create a connection to SoftLayer DNS Service

data/examples/key_pairs.md

@@ -0,0 +1,81 @@
+### Key Pair Examples
+
+These examples all assume you have `~/.fog` which contains the following
+
+   ```yaml  
+default:
+  softlayer_username: example-username
+  softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
+  softlayer_default_domain: example.com
+  ```
+  
+#### Create a connection to SoftLayer Compute Service
+
+```ruby
+	require 'fog/softlayer'
+	@sl = Fog::Compute[:softlayer]
+```
+
+#### Key Pair Basics
+1. Create
+
+   ```ruby
+	kp1 = @sl.key_pairs.create(:label => 'my-new-key', :key => 'ssh-rsa AAAAxbU2lx...')
+   # => <Fog::Compute::Softlayer::KeyPair>
+	kp2 = @sl.key_pairs.new
+	kp2.label = 'my-new-new-key'
+	kp2.key = 'ssh-rsa AAAAxbU2lx...'
+	kp2.save
+	# => <Fog::Compute::Softlayer::KeyPair>
+   ```
+
+1. Get
+
+	```ruby
+	# By id:
+	kp = @sl.key_pairs.get(123456)
+	# => <Fog::Compute::Softlayer::KeyPair>
+
+	# By label:
+	kp = @sl.key_pairs.by_label('my-new-key')
+	# => <Fog::Compute::Softlayer::KeyPair>
+	```
+
+
+1. Destroy
+
+	```ruby
+	kp = @sl.key_pairs.by_label('my-new-key')
+	# => <Fog::Compute::Softlayer::KeyPair>
+	kp.destroy
+	```
+
+	
+### Key Pairs with Servers
+1. Create a server with one or more key pairs
+
+	```ruby
+	the_first_key = @sl.key_pairs.by_label('my-new-key')
+	# => <Fog::Compute::Softlayer::KeyPair>
+	the_second_key = @sl.key_pairs.by_label('my-other-new-key')
+	# => <Fog::Compute::Softlayer::KeyPair>
+	
+	opts = { 
+		:flavor_id => 'm1.small', 
+		:os_code => 'UBUNTU_LATEST', 
+		:datacenter => 'hkg02', 
+		:name => 'cphrmky', 
+		:key_pairs => [ the_first_key, the_second_key ]
+	}
+	@sl.servers.create(opts)
+	# => <Fog::Compute::Softlayer::Server>
+```
+
+1. Look at the key pairs on a server.
+
+	```ruby
+	server = @sl.servers.get(12345)
+	server.key_pairs
+	# => [ <Fog::Compute::Softlayer::Server>,
+	# <Fog::Compute::Softlayer::Server>]
+	```

data/examples/network.md

@@ -7,8 +7,9 @@ These examples all assume you have `~/.fog` which contains the following
 
 
    ```yaml  
-   :softlayer_username: example-username
-   :softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
+default:
+  softlayer_username: example-username
+  softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
   ```
 
 #### Create a connection to SoftLayer Network

data/examples/storage.md

@@ -4,9 +4,10 @@ These examples all assume you have `~/.fog` which contains the following
 
 
    ```yaml  
-   :softlayer_username: example-username
-   :softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
-   :softlayer_cluster: cluster # currently supported clusters are dal05, sng01, ams01
+default:
+  softlayer_username: example-username
+  softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
+  softlayer_cluster: cluster # currently supported clusters are dal05, sng01, ams01
   ```
 
 #### Create a connection to SoftLayer Object Storage

data/examples/tags.md

@@ -3,9 +3,10 @@
 These examples all assume you have `~/.fog` which contains the following
 
    ```yaml  
-   :softlayer_username: example-username
-   :softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
-   :softlayer_default_domain: example.com
+default:
+  softlayer_username: example-username
+  softlayer_api_key: 1a1a1a1a1a1a1a1a1a11a1a1a1a1a1a1a1a1a1 
+  softlayer_default_domain: example.com
   ```
   
 #### Create a connection to SoftLayer Compute Service

data/lib/fog.rb

@@ -10,12 +10,6 @@
 __LIB_DIR__ = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift __LIB_DIR__ unless $LOAD_PATH.include?(__LIB_DIR__)
 
-# Use fog and core
 require 'fog/core'
-require 'fog'
-
-# Previously treated as "core"
-# data exchange specific (to be extracted and used on a per provider basis)
 require 'fog/json'
-
 require 'fog/softlayer'

data/lib/fog/softlayer/compute.rb

@@ -17,8 +17,7 @@ module Fog
       requires :softlayer_username, :softlayer_api_key
 
       # Excon connection settings
-      recognizes :softlayer_api_url
-      recognizes :softlayer_default_domain
+      recognizes :softlayer_api_url, :softlayer_default_domain, :softlayer_default_datacenter
 
 
       model_path 'fog/softlayer/models/compute'
@@ -26,6 +25,8 @@ module Fog
       model         :flavor
       collection    :images
       model         :image
+      collection    :key_pairs
+      model         :key_pair
       collection    :servers
       model         :server
       collection    :tags
@@ -34,37 +35,42 @@ module Fog
       request_path 'fog/softlayer/requests/compute'
       request :create_bare_metal_server
       request :create_bare_metal_tags
+      request :create_key_pair
       request :create_vm
       request :create_vms
       request :create_vm_tags
       request :delete_bare_metal_server
       request :delete_bare_metal_tags
+      request :delete_key_pair
       request :delete_vm
       request :delete_vm_tags
       request :describe_tags
       request :get_bare_metal_server
       request :get_bare_metal_servers
       request :get_bare_metal_tags
+      request :get_key_pair
+      request :get_key_pairs
       request :get_references_by_tag_name
       request :get_tag
       request :get_vm_tags
       request :get_vm
       request :get_vms
+      request :update_key_pair
 
       # The Mock Service allows you to run a fake instance of the Service
       # which makes no real connections.
       #
       #
       class Mock
-        attr_accessor :default_domain
         include Fog::Softlayer::Slapi
         include Fog::Softlayer::Compute::Shared
-        attr_accessor :virtual_guests, :bare_metal_servers
+        attr_accessor :default_domain, :virtual_guests, :bare_metal_servers, :softlayer_default_domain, :softlayer_default_datacenter
 
         def initialize(args)
           @virtual_guests = []
           @bare_metal_servers = []
           @tags = []
+          @key_pairs = []
           super(args)
         end
 
@@ -94,13 +100,16 @@ module Fog
       # Makes real connections to Softlayer.
       #
       class Real
-        attr_accessor :default_domain
+        attr_accessor :softlayer_default_domain
+        attr_accessor :softlayer_default_datacenter
         include Fog::Softlayer::Slapi
         include Fog::Softlayer::Compute::Shared
 
         def initialize(options={})
           @softlayer_api_key = options[:softlayer_api_key]
           @softlayer_username = options[:softlayer_username]
+          @softlayer_default_domain = options[:softlayer_default_domain]
+          @softlayer_default_datacenter = options[:softlayer_default_datacenter]
         end
 
         def request(service, path, options = {})
@@ -108,7 +117,6 @@ module Fog
           Fog::Softlayer::Slapi.slapi_request(service, path, options)
         end
 
-
         def list_servers
           (self.get_vms.body.map {|s| s['bare_metal'] = false; s } << self.get_bare_metal_servers.body.map {|s| s['bare_metal'] = true; s}).flatten
         end
@@ -123,11 +131,11 @@ end
 
 ## some helpers for some dirty work
 class String
-  def camelize
+  def softlayer_camelize
     self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
   end
 
-  def underscore
+  def softlayer_underscore
     self.gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').

data/lib/fog/softlayer/core.rb

@@ -82,7 +82,7 @@ module Fog
       # Try to smallCamelCase the path before appending it to the @request_url
       #
       def self.set_sl_path(path)
-        path = path.to_s.underscore.camelize
+        path = path.to_s.softlayer_underscore.softlayer_camelize
         path.fix_convention_exceptions
         @request_url += "/#{path}.json"
       end
@@ -144,15 +144,17 @@ end
 
 ## some helpers for some dirty work
 class String
-  def camelize
+  def softlayer_camelize
     self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
   end
 
   def fix_convention_exceptions
-    self.gsub!(/ipaddress/i, 'IpAddress') # SLAPI WHY U No Follow Own Convention!?
+    # SLAPI WHY U No Follow Own Convention!?
+    self.gsub!(/ipaddress/i, 'IpAddress')
+    self.gsub!(/loadbalancer/i, 'LoadBalancer')
   end
 
-  def underscore
+  def softlayer_underscore
     self.gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').

data/lib/fog/softlayer/dns.rb

@@ -132,7 +132,7 @@ module Fog
         # Try to smallCamelCase the path before appending it to the @request_url
         #
         def set_sl_path(path)
-          path = path.to_s.underscore.camelize
+          path = path.to_s.softlayer_underscore.softlayer_camelize
           @request_url += "/#{path}.json"
         end
 
@@ -149,11 +149,11 @@ end
 
 ## some helpers for some dirty work
 class String
-  def camelize
+  def softlayer_camelize
     self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
   end
 
-  def underscore
+  def softlayer_underscore
     self.gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').

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

@@ -0,0 +1,48 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Softlayer
+      class KeyPair < Fog::Model
+        identity :id
+
+        attribute :label
+        attribute :create_date,               :aliases => 'createDate'
+        attribute :modify_date,               :aliases => 'modifyDate'
+        attribute :note,                      :aliases => 'notes'
+        attribute :key
+
+        def save
+          identity ? update : create
+        end
+
+        def create
+          requires :key, :label
+          response = service.create_key_pair(attributes).body
+          merge_attributes(response)
+          self
+        end
+
+        def update
+          requires :id
+          merge_attributes(service.update_key_pair(self.id, self.attributes).body)
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_key_pair(self.id)
+          true
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/softlayer/models/compute/key_pair'
+
+module Fog
+  module Compute
+    class Softlayer
+      class KeyPairs < Fog::Collection
+        model Fog::Compute::Softlayer::KeyPair
+
+        def all
+          data = service.get_key_pairs.body
+          load(data)
+        end
+
+        def get(id)
+          if key_pair = service.get_key_pair(id).body
+            new(key_pair)
+          end
+        rescue Fog::Network::Softlayer::NotFound
+          nil
+        end
+
+        def by_label(label)
+          all.select { |key_pair| key_pair.label == label }.first
+        end
+
+      end
+    end
+  end
+end

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

@@ -24,10 +24,10 @@ module Fog
         attribute :public_ip,                :aliases => 'primaryIpAddress'
         attribute :flavor_id
         attribute :bare_metal,               :type => :boolean
-        attribute :os_code,                  :aliases => 'operatingSystemReferenceCode'
+        attribute :os_code
         attribute :image_id,                 :type => :squash
         attribute :ephemeral_storage,        :aliases => 'localDiskFlag'
-        attribute :os,                       :aliases => 'operatingSystem'
+        attribute :key_pairs,                :aliases => 'sshKeys'
 
         # Times
         attribute :created_at,              :aliases => ['createDate', 'provisionDate'], :type => :time
@@ -42,6 +42,7 @@ module Fog
         attribute :global_identifier,       :aliases => 'globalIdentifier'
         attribute :hourly_billing_flag,     :aliases => 'hourlyBillingFlag'
         attribute :tags,                    :aliases => 'tagReferences'
+        attribute :private_network_only,    :aliases => 'privateNetworkOnlyFlag'
 
         def initialize(attributes = {})
           # Forces every request inject bare_metal parameter
@@ -123,32 +124,56 @@ module Fog
           if self.private_vlan
             attributes[:private_vlan] = { :networkVlan => { :id => self.private_vlan.id } }
           end
+          if self.key_pairs
+            attributes[:key_pairs].map! { |key| { :id => key.id } }
+          end
           remap_attributes(attributes, attributes_mapping)
           clean_attributes
         end
 
-        def vlan
-          attributes[:vlan] ||= _get_vlan
+        def os_code
+          attributes['operatingSystem']['softwareLicense']['softwareDescription']['referenceCode'] if attributes['operatingSystem']
         end
 
         def private_vlan
           attributes[:private_vlan] ||= _get_private_vlan
         end
 
-        def vlan=(value)
+        def private_vlan=(value)
           unless value.is_a?(Integer) or value.is_a?(Fog::Network::Softlayer::Network)
             raise ArgumentError, "vlan argument for #{self.class.name}##{__method__} must be Integer or Fog::Network::Softlayer::Network."
           end
           value = Fog::Network[:softlayer].networks.get(value) if value.is_a?(Integer)
-          attributes[:vlan] = value
+          attributes[:private_vlan] = value
         end
 
-        def private_vlan=(value)
+        def key_pairs
+          attributes[:key_pairs]
+        end
+
+        def key_pairs=(keys)
+          raise ArgumentError, "Argument #{local_variables.first.to_s} for #{self.class.name}##{__method__} must be Array." unless keys.is_a?(Array)
+          attributes[:key_pairs] = []
+          keys.map do |key|
+            key = self.symbolize_keys(key) if key.is_a?(Hash)
+            unless key.is_a?(Fog::Compute::Softlayer::KeyPair) or (key.is_a?(Hash) and key[:id])
+              raise ArgumentError, "Elements of keys array for #{self.class.name}##{__method__} must be a Hash with key 'id', or Fog::Compute::Softlayer::KeyPair"
+            end
+            key = service.key_pairs.get(key[:id]) unless key.is_a?(Fog::Compute::Softlayer::KeyPair)
+            attributes[:key_pairs] << key
+          end
+        end
+
+        def vlan
+          attributes[:vlan] ||= _get_vlan
+        end
+
+        def vlan=(value)
           unless value.is_a?(Integer) or value.is_a?(Fog::Network::Softlayer::Network)
             raise ArgumentError, "vlan argument for #{self.class.name}##{__method__} must be Integer or Fog::Network::Softlayer::Network."
           end
           value = Fog::Network[:softlayer].networks.get(value) if value.is_a?(Integer)
-          attributes[:private_vlan] = value
+          attributes[:vlan] = value
         end
 
         def ram=(set)
@@ -212,7 +237,6 @@ module Fog
         #   * BUILD -> ERROR (on error)
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-
           copy = self.dup
           copy.pre_save
 
@@ -263,6 +287,8 @@ module Fog
               :os_code  =>  :operatingSystemReferenceCode,
               :vlan => :primaryNetworkComponent,
               :private_vlan => :primaryBackendNetworkComponent,
+              :key_pairs => :sshKeys,
+              :private_network_only => :privateNetworkOnlyFlag,
 
           }
 
@@ -331,7 +357,8 @@ module Fog
         def set_defaults
           attributes[:hourly_billing_flag] = true if attributes[:hourly_billing_flag].nil?
           attributes[:ephemeral_storage] = false if attributes[:ephemeral_storage].nil?
-          attributes[:domain] = service.default_domain if service.default_domain and attributes[:domain].nil?
+          attributes[:domain] = service.softlayer_default_domain if service.softlayer_default_domain and attributes[:domain].nil?
+          self.datacenter = service.softlayer_default_datacenter if service.softlayer_default_datacenter and attributes[:datacenter].nil?
         end
 
       end

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

@@ -0,0 +1,41 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+module Fog
+  module Compute
+    class Softlayer
+
+      class Mock
+
+        def create_key_pair(opts)
+          response = Excon::Response.new
+
+          response.status = 200
+          response.body = []
+
+          response.body = {
+              "createDate" => Time.now.iso8601,
+              "fingerprint" => "1a:1a:1a:1a:1a:1a:1a:1a:1a:1a:1a:1a:1a:1a:1a:1a",
+              "id" => Fog::Mock.random_numbers(5).to_i,
+              "key" => opts[:key],
+              "label" => opts[:label],
+              "modifyDate" => nil
+          }
+
+          @key_pairs.push(response.body)
+          response
+        end
+      end
+
+      class Real
+        def create_key_pair(opts)
+          request(:security_ssh_key, :create_object, :body => opts, :http_method => :post)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+module Fog
+  module Compute
+    class Softlayer
+
+      class Mock
+
+        def delete_key_pair(id)
+          response = Excon::Response.new
+          response.status = 200
+          if @key_pairs.reject! { |kp| kp['id'] == id }.nil?
+            response.status = 404
+            response.body = {
+              "error" => "Unable to find object with id of '#{id}'.",
+              "code" => "SoftLayer_Exception_ObjectNotFound"
+            }
+          else
+            response.body = true
+          end
+          response
+        end
+      end
+
+      class Real
+        def delete_key_pair(id)
+          request(:security_ssh_key, id, :http_method => :delete)
+        end
+      end
+
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ module Fog
 
       class Real
         def get_bare_metal_server(identifier)
-          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
+          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag]')
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_bare_metal_servers
-          request(:account, :get_hardware, :query => 'objectMask=mask[datacenter,tagReferences,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
+          request(:account, :get_hardware, :query => 'objectMask=mask[datacenter,tagReferences,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag]')
         end
       end
     end

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

@@ -0,0 +1,36 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+module Fog
+  module Compute
+    class Softlayer
+
+      class Mock
+        def get_key_pair(id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = key_pair = @key_pairs.select { |kp| kp['id'] == id }.first
+
+          if key_pair.nil?
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+            response.status = 404
+          end
+          response
+        end
+
+      end
+
+      class Real
+        def get_key_pair(id)
+          request(:security_ssh_key, id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Compute
+    class Softlayer
+
+      class Mock
+        def get_key_pairs
+          response = Excon::Response.new
+          response.body = @key_pairs
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def get_key_pairs
+          request(:account, :get_ssh_keys)
+        end
+      end
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ module Fog
 
       class Real
         def get_vm(identifier)
-          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
+          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag]')
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_vms
-          request(:account, :get_virtual_guests, :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password,primaryNetworkComponent.networkVlan]')
+          request(:account, :get_virtual_guests, :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.softwareLicense.softwareDescription.referenceCode,primaryNetworkComponent.networkVlan,sshKeys.id,privateNetworkOnlyFlag]')
         end
       end
     end

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

@@ -0,0 +1,43 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+module Fog
+  module Compute
+    class Softlayer
+
+      class Mock
+
+        def update_key_pair(id, opts)
+          response = Excon::Response.new
+          response.status = 200
+
+          key_pair, index = @key_pairs.each_with_index.map { |kp, i| [kp, i] if kp['id'] == id }.compact.flatten
+
+          if key_pair.nil?
+            response.status = 404
+            response.body = {
+                "error" => "Unable to find object with id of '#{id}'.",
+                "code" => "SoftLayer_Exception_ObjectNotFound"
+            }
+          else
+
+            @key_pairs[index] = key_pair.merge(opts)
+            response.body = true
+          end
+          response
+        end
+      end
+
+      class Real
+        def update_key_pair(id, opts)
+          request(:security_ssh_key, id, :body => opts, :http_method => :put)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/softlayer/storage.rb

@@ -86,7 +86,7 @@ module Fog
           @api_key = options[:softlayer_api_key]
           @username = options[:softlayer_username]
           @cluster = options[:softlayer_cluster]
-          @storage_account = options[:softlayer_storage_account] || default_storage_account
+          @storage_account = options[:softlayer_storage_account] || default_storage_account(options[:softlayer_username], options[:softlayer_api_key])
           @connection_options     = options[:connection_options] || {}
           authenticate
           @persistent = options[:persistent] || false
@@ -183,8 +183,8 @@ module Fog
           true
         end
 
-        def default_storage_account
-          slapi = Fog::Compute[:softlayer].request(:account, :get_hub_network_storage)
+        def default_storage_account(username, api_key)
+          slapi = Fog::Compute.new(:provider => :softlayer, :softlayer_username => username, :softlayer_api_key => api_key).request(:account, :get_hub_network_storage)
           slapi.body.map { |store| store['username'] }.first if slapi.body and slapi.body.instance_of? Array
         end
 

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

data/tests/softlayer/compute/schema.rb

@@ -120,6 +120,17 @@ class Softlayer
 
       end
 
+      module KeyPair
+        KP = {
+          "createDate"   => String,
+          "fingerprint"  => String,
+          "id"           => Integer,
+          "key"          => String,
+          "label"        => String,
+          "modifyDate"   => Fog::Nullable::String,
+        }
+      end
+
       module Collected
         SERVER = {
             :id => Fog::Nullable::Integer,

data/tests/softlayer/models/compute/key_pair_tests.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+Shindo.tests("Fog::Compute[:softlayer] | KeyPair model", ["softlayer"]) do
+  pending unless Fog.mocking?
+
+  @sl_connection = Fog::Compute[:softlayer]
+  @key_gen = Proc.new { string='ssh-rsa ';  while string.length < 380 do; string << Fog::Mock.random_base64(1); end; string; }
+  @kp1 = @sl_connection.key_pairs.create(:label => 'test-key-1', :key => @key_gen.call)
+
+  tests("success") do
+
+    tests("#label=") do
+      returns('new-label') { @kp1.label = 'new-label' }
+    end
+
+    tests("#label") do
+      returns('new-label') { @kp1.label}
+    end
+
+    tests("#key=") do
+      @new_key_value = @key_gen.call
+      returns(@new_key_value) { @kp1.key = @new_key_value }
+    end
+
+    tests("#key") do
+      returns(@new_key_value) { @kp1.key }
+    end
+
+    tests("#create(:label => 'test-key-2', :key => #{@key_gen.call}") do
+      data_matches_schema(Fog::Compute::Softlayer::KeyPair) { @sl_connection.key_pairs.create(:label => 'test-key-2', :key => @key_gen.call)}
+    end
+
+    tests("#destroy") do
+      returns(true) { @sl_connection.key_pairs.first.destroy }
+    end
+
+  end
+
+  tests ("failure") do
+    # ToDo: Failure cases.
+  end
+end

data/tests/softlayer/models/compute/server_tests.rb

@@ -23,7 +23,7 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
         :os_code => 'UBUNTU_LATEST',
         :name => 'test-bmc',
         :domain => 'bare-metal-server.com',
-        :datecenter => 'dal05',
+        :datacenter => 'dal05',
         :bare_metal => true
     }
 

data/tests/softlayer/requests/compute/key_pair_tests.rb

@@ -0,0 +1,79 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+Shindo.tests("Fog::Compute[:softlayer] | key_pair requests", ["softlayer"]) do
+
+  @sl_connection = Fog::Compute[:softlayer]
+
+  opts = { :flavor_id => 'm1.small', :os_code => 'UBUNTU_LATEST',  :name => 'matt', :datacenter => 'dal05', :domain => 'example.com', :bare_metal => false}
+  @vm = @sl_connection.servers.create(opts)
+
+  opts[:bare_metal] = true
+  @bmc = @sl_connection.servers.create(opts)
+
+  @key_gen = Proc.new { string='ssh-rsa ';  while string.length < 380 do; string << Fog::Mock.random_base64(1); end; string; }
+
+  @kp1 = @sl_connection.key_pairs.new
+  @kp1.label = 'test-key-1'
+  @kp1.key = @key_gen.call
+  @kp1.save
+
+
+  tests('success') do
+
+    tests("#create_key_pair") do
+      key = @sl_connection.create_key_pair(:key => @key_gen.call, :label => 'test-key-tmp')
+      @kp2 = @sl_connection.key_pairs.get(key.body['id'])
+      returns(200) { key.status }
+      data_matches_schema(Integer) { key.body['id'] }
+    end
+
+    tests("#get_key_pairs") do
+      data_matches_schema([Softlayer::Compute::Formats::KeyPair::KP]) { @sl_connection.get_key_pairs.body}
+      returns(200) { @sl_connection.get_key_pairs.status }
+      returns(2) { @sl_connection.get_key_pairs.body.count }
+    end
+
+    tests("#get_key_pair(#{@kp1.id}") do
+      data_matches_schema(Softlayer::Compute::Formats::KeyPair::KP) { @sl_connection.get_key_pair(@kp1.id).body }
+    end
+
+    tests("#update_key_pair(#{@kp1.id}, 'label' => 'some-new-name'}") do
+      returns(true) { @sl_connection.update_key_pair(@kp1.id, 'label' => 'some-new-name').body }
+      returns('some-new-name') { @sl_connection.get_key_pair(@kp1.id).body['label'] }
+    end
+
+    tests("#delete_key_pair(#{@kp1.id}") do
+      returns(true) { @sl_connection.delete_key_pair(@kp1.id).body }
+      returns(1) { @sl_connection.get_key_pairs.body.count }
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#get_key_pair").raises(ArgumentError) do
+      @sl_connection.get_key_pair
+    end
+
+    tests("#get_key_pair(#{@kp1.id}") do
+      returns(404) { @sl_connection.get_key_pair(@kp1.id).status }
+    end
+
+    tests("#update_key_pair(#{@kp1.id}, 'label' => 'random thing'") do
+      returns(404) { @sl_connection.update_key_pair(@kp1.id, 'label' => 'random thing' ).status }
+    end
+
+    tests("#delete_key_pair(#{@kp1.id}") do
+      returns(404) { @sl_connection.delete_key_pair(@kp1.id).status }
+    end
+
+
+
+  end
+
+end

data/tests/softlayer/requests/compute/tag_tests.rb

@@ -9,7 +9,7 @@ Shindo.tests("Fog::Compute[:softlayer] | tag requests", ["softlayer"]) do
 
   @sl_connection = Fog::Compute[:softlayer]
 
-  opts = { :flavor_id => 'm1.small', :os_code => 'UBUNTU_LATEST',  :name => 'matt', :datacenter => 'dal05', :bare_metal => false}
+  opts = { :flavor_id => 'm1.small', :os_code => 'UBUNTU_LATEST',  :name => 'matt', :datacenter => 'dal05', :domain => 'example.com', :bare_metal => false}
   @vm = @sl_connection.servers.create(opts)
 
   opts[:bare_metal] = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Matt Eldridge
@@ -200,6 +200,7 @@ files:
 - docs/fog-softlayer-CLA.pdf
 - examples/compute.md
 - examples/dns.md
+- examples/key_pairs.md
 - examples/network.md
 - examples/storage.md
 - examples/tags.md
@@ -216,6 +217,8 @@ files:
 - lib/fog/softlayer/models/compute/flavors.rb
 - lib/fog/softlayer/models/compute/image.rb
 - lib/fog/softlayer/models/compute/images.rb
+- lib/fog/softlayer/models/compute/key_pair.rb
+- lib/fog/softlayer/models/compute/key_pairs.rb
 - lib/fog/softlayer/models/compute/server.rb
 - lib/fog/softlayer/models/compute/servers.rb
 - lib/fog/softlayer/models/compute/tag.rb
@@ -241,22 +244,27 @@ files:
 - lib/fog/softlayer/network.rb
 - lib/fog/softlayer/requests/compute/create_bare_metal_server.rb
 - lib/fog/softlayer/requests/compute/create_bare_metal_tags.rb
+- lib/fog/softlayer/requests/compute/create_key_pair.rb
 - lib/fog/softlayer/requests/compute/create_vm.rb
 - lib/fog/softlayer/requests/compute/create_vm_tags.rb
 - lib/fog/softlayer/requests/compute/create_vms.rb
 - lib/fog/softlayer/requests/compute/delete_bare_metal_server.rb
 - lib/fog/softlayer/requests/compute/delete_bare_metal_tags.rb
+- lib/fog/softlayer/requests/compute/delete_key_pair.rb
 - lib/fog/softlayer/requests/compute/delete_vm.rb
 - lib/fog/softlayer/requests/compute/delete_vm_tags.rb
 - lib/fog/softlayer/requests/compute/describe_tags.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_server.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_servers.rb
 - lib/fog/softlayer/requests/compute/get_bare_metal_tags.rb
+- lib/fog/softlayer/requests/compute/get_key_pair.rb
+- lib/fog/softlayer/requests/compute/get_key_pairs.rb
 - lib/fog/softlayer/requests/compute/get_references_by_tag_name.rb
 - lib/fog/softlayer/requests/compute/get_tag.rb
 - lib/fog/softlayer/requests/compute/get_vm.rb
 - lib/fog/softlayer/requests/compute/get_vm_tags.rb
 - lib/fog/softlayer/requests/compute/get_vms.rb
+- lib/fog/softlayer/requests/compute/update_key_pair.rb
 - lib/fog/softlayer/requests/dns/create_domain.rb
 - lib/fog/softlayer/requests/dns/create_record.rb
 - lib/fog/softlayer/requests/dns/delete_domain.rb
@@ -327,6 +335,7 @@ files:
 - tests/softlayer/helper.rb
 - tests/softlayer/models/compute/flavor_tests.rb
 - tests/softlayer/models/compute/image_tests.rb
+- tests/softlayer/models/compute/key_pair_tests.rb
 - tests/softlayer/models/compute/server_tests.rb
 - tests/softlayer/models/dns/domain_tests.rb
 - tests/softlayer/models/dns/domains_tests.rb
@@ -335,6 +344,7 @@ files:
 - tests/softlayer/models/storage/directory_tests.rb
 - tests/softlayer/models/storage/file_tests.rb
 - tests/softlayer/requests/compute/bmc_tests.rb
+- tests/softlayer/requests/compute/key_pair_tests.rb
 - tests/softlayer/requests/compute/tag_tests.rb
 - tests/softlayer/requests/compute/vm_tests.rb
 - tests/softlayer/requests/network/network_tests.rb