fog-softlayer 0.3.5 → 0.3.6.pre.f7e3358

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJlMDhkNWIxOTU3ZjcyYTA5YzdjNjAwNDUyMTA4Y2IwMGUzNWFjMQ==
+    ZWI2OTJkMjg3YmQyM2I5MzY4MTZiNmI1YmMwNDQwM2I3YmMzNTQ4OA==
   data.tar.gz: !binary |-
-    OWM5Mzg0NjIyZTc2Y2M2OGRkMmM1NzY1M2Y1YTIwYTI4NjgzYmE3YQ==
+    ZWM0ZmQ5N2NmYzc0OTc3NDZmNjE5YmY2N2Y0Mzg1NTM0NTk4ZTYxMg==
 SHA512:
   metadata.gz: !binary |-
-    NmE0NDBhZTQyY2Y0NmViNWQ3Nzg4NDg5OWM3MDMyMDUxMGU5OTZkZjc2MTQw
-    YWFhMWFjZTczOGQzOTU5N2JmMzZhOWE1M2U1OWU2MDhmZGRmYmU3YTIyYTZh
-    MDAzZDk2N2U0ZmYyMmQ5Y2QzNGE5MWI2M2U3OTE0NWUwNDJiNTg=
+    MjUzMDZjYjBlMzQzYzI1ZjM1ZjI3OGNlYjk5MmM2ZTE2MDg3YTk1YmMwMDg1
+    MmRhMzBkZTdjNmJmYTk2NTVkOWQ2MGY2OWY1OWZjNmY5MmUyYzcyOGNiNzVk
+    M2I3MDZmMzM0ZTFkMGViMDViODRhMWQ1NDQwOTVhZmEwNzExODQ=
   data.tar.gz: !binary |-
-    NDNjZTM0OGFkOGIyN2M4ZGUzODM1MDBmZjJhNTYyYzY1ZTZkODQwMjMwMGRl
-    YzdlNGRhYTkxYjk1NDAwYzVkNDk5NWJhZmM2ZTJhZDJjOTNlNjgyYjAwNTBi
-    Yjg5MGFhZjNlNjM3M2I1MWE4OTgwYzAzNzAyNTFjYTFjNjIzNzI=
+    OTllNjkwOWJlNGI2NTBlMjc5MzNjMzgzYWZiYmJiMDJlYTMwNDM4YjJjMmEw
+    ZWZmYzY1ODNjZmFlYTQ2NzBmODExMjIwZTljODAwN2UzYmFhMTJkMmZjNWMy
+    NzUyODhhMTA2YWRkYTQ5NGVkNDY5YjcyNDkxOWJlN2E3MTBjNGM=

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/fog-softlayer.gemspec

@@ -33,5 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('shindo', '~> 0.3.4')
   spec.add_development_dependency('fission')
   spec.add_development_dependency('pry')
+  spec.add_development_dependency('pry-debugger')
   spec.add_development_dependency('osrcry')
 end

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,17 +35,21 @@ 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
@@ -65,6 +70,7 @@ module Fog
           @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

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

@@ -123,32 +123,60 @@ 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
+          attributes[:os]['softwareLicense']['softwareDescription']['referenceCode']
+        end
+
+        def os_code
+          self.os if attributes[:os]
         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[:id] or key.is_a?(Fog::Compute::Softlayer::KeyPair)
+              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[:id].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 +240,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 +290,7 @@ module Fog
               :os_code  =>  :operatingSystemReferenceCode,
               :vlan => :primaryNetworkComponent,
               :private_vlan => :primaryBackendNetworkComponent,
+              :key_pairs => :sshKeys,
 
           }
 
@@ -331,7 +359,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]')
         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]')
         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 '#{identifier}'.",
+                "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]')
         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]')
         end
       end
     end

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

@@ -0,0 +1,42 @@
+#
+# 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.select { |kp, i| kp['id'] == id }
+
+          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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6.pre.f7e3358
 platform: ruby
 authors:
 - Matt Eldridge
@@ -178,6 +178,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: osrcry
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,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
@@ -255,22 +271,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
@@ -370,9 +391,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2