fog-softlayer 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWMzMWI0MTk1OTA5MTA1ZDc1MmFlMDVmYzA4MjM1MzNmODAyOGYxZQ==
+  data.tar.gz: !binary |-
+    MjQwYjI3YmEzNmNkMWNiMWU0NWY3ZDM4NDViOTI5MWZlZmEyZDVlNg==
+SHA512:
+  metadata.gz: !binary |-
+    MWNlNTM4Mzk4N2ZkMjZmY2QxMzdlODdlYzdlMGZkOWYxMDU3NDEyMGU3MmVm
+    ZmI3OTVjZWQ4MzQ5ZGY1ZjZjMTNhYjQ0ZGM3YTM3MWQwZGExMjdhY2I5OWJj
+    OTU3YzFmNDZlOGIxZGJiYzdkOTMwNjY2MDdiY2IyY2QzYWFmZWQ=
+  data.tar.gz: !binary |-
+    NjIxNWNkZWM5ZTMzOWI3MjhkY2E2OGYzZTkwMWQzZTM2Yjk3ZjM0MjU1ZjBj
+    OTM0NDc3MTllZjliZjExODczM2EwM2FiZGJiN2JlNGM0MzEyNzI5NWU5ZWM5
+    MzQwYjQ5NzY2NGQwNzM2ZDZhOTk4OTJhODI0NmMxOGQzMmM4Mjg=

data/lib/fog/softlayer/compute.rb

@@ -18,34 +18,42 @@ module Fog
 
       # Excon connection settings
       recognizes :softlayer_api_url
+      recognizes :softlayer_default_domain
 
-      #model_path 'fog/softlayer/models/compute'
-      #collection  :servers
-      #model       :server
-      #collection  :bare_metal_servers
-      #model       :bare_metal_server
-      #collection  :global_ipv4s
-      #model       :global_ipv4
-      #collection  :images
-      #model       :image
-      #
 
       service = File.basename(__FILE__, '.rb')
 
-      path = "fog/softlayer/requests/#{service}"
-      request_path path
+      model_path 'fog/softlayer/models/compute'
+      Fog::Softlayer.loader("models/#{service}") do |basename|
+        if basename =~ /s$/
+        collection basename
+        else
+          model basename
+        end
+
+      end
 
-      Fog::Softlayer.load_requests(service) do |r|
-        request r
+      request_path "fog/softlayer/requests/#{service}"
+      Fog::Softlayer.loader("requests/#{service}") do |basename|
+        request basename
       end
 
 
+
       # 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::Compute::Shared
+        attr_accessor :virtual_guests, :bare_metal_servers
+
+        def initialize(args)
+          @virtual_guests = []
+          @bare_metal_servers = []
+          super(args)
+        end
 
         def request(method, path, expected_responses, parameters = {})
           _request
@@ -59,12 +67,17 @@ module Fog
           raise Fog::Errors::MockNotImplemented
         end
 
+        def list_servers
+          (self.get_vms.body << self.get_bare_metal_servers.body).flatten
+        end
+
       end
 
       ##
       # Makes real connections to Softlayer.
       #
       class Real
+        attr_accessor :default_domain
         include Fog::Softlayer::Compute::Shared
 
         # Sends the real request to the real SoftLayer service.
@@ -95,12 +108,15 @@ module Fog
           set_sl_service(service)
           # set the request path (known as the "method" in SL docs)
           set_sl_path(path)
+          # set the query params if any
+
 
           # build request params
           params = { :headers => user_agent_header }
           params[:headers]['Content-Type'] = 'application/json'
-          params[:expects] = [200,201]
+          params[:expects] = options[:expected] || [200,201]
           params[:body] = Fog::JSON.encode({:parameters => [ options[:body] ]}) unless options[:body].nil?
+          params[:query] = options[:query] unless options[:query].nil?
 
           # initialize connection object
           @connection = Fog::Core::Connection.new(@request_url, false, params)
@@ -113,6 +129,10 @@ module Fog
           response
         end
 
+        def list_servers
+          (self.get_vms.body << self.get_bare_metal_servers.body).flatten
+        end
+
         private
 
         def credentialize_url(username, apikey)

data/lib/fog/softlayer/compute/shared.rb

@@ -27,6 +27,7 @@ module Fog
         def initialize(options)
           @api_url             = options[:softlayer_api_url]   || API_URL
           @credentials   = { :username => options[:softlayer_username], :api_key => options[:softlayer_api_key] }
+          @default_domain = options[:softlayer_default_domain]
         end
 
         def self.valid_request?(required, passed)

data/lib/fog/softlayer/core.rb

@@ -10,8 +10,8 @@ module Fog
 
     service(:compute, 'Compute')
 
-    def self.load_requests(service)
-      path = "providers/softlayer/lib/fog/softlayer/requests/#{service}"
+    def self.loader(service)
+      path = "providers/softlayer/lib/fog/softlayer/#{service}"
       Dir.entries(path).reject{|e| e =~ /^\./}.each do |file|
         _request = File.basename(file, '.rb')
         yield _request.to_sym

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

@@ -0,0 +1,26 @@
+#
+# 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 Flavor < Fog::Model
+
+        identity :id
+
+        attribute :cpu
+        attribute :disk
+        attribute :name
+        attribute :ram
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,100 @@
+#
+# 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/flavor'
+
+module Fog
+  module Compute
+    class Softlayer
+
+      ## SoftLayer doesn't actually have "flavors", these are just for portability/convenience,
+      # they map directly to OpenStack defaults.
+
+
+      # :cores => number of virtual CPUs presented
+      # :disk  => size in GB of the virtual root disk
+      # :ram   => virtual machine memory in MB
+      FLAVORS = [
+          {
+              :id                      => 'm1.tiny',
+              :name                    => 'Tiny Instance',
+              :cpu                     => 2,
+              :disk                    => [{'device' => 0, 'diskImage' => {'capacity' => 25 } }],
+              :ram                     => 1024
+          },
+          {
+              :id                      => 'm1.small',
+              :name                    => 'Small Instance',
+              :cpu                     => 2,
+              :disk                    => [{'device' => 0, 'diskImage' => {'capacity' => 100 } }],
+              :ram                     => 2048
+          },
+          {
+              :id                      => 'm1.medium',
+              :name                    => 'Medium Instance',
+              :cpu                     => 4,
+              :disk                    => [{'device' => 0, 'diskImage' => {'capacity' => 500 } }],
+              :ram                     => 4096
+          },
+          {
+              :id                      => 'm1.large',
+              :name                    => 'Large Instance',
+              :cpu                     => 8,
+              :disk                    => [{'device' => 0, 'diskImage' => {'capacity' => 750 } }],
+              :ram                     => 8192
+          },
+          {
+              :id                      => 'm1.xlarge',
+              :name                    => 'Extra Large Instance',
+              :cpu                     => 16,
+              :disk                    => [{'device' => 0, 'diskImage' => {'capacity' => 1000 } }],
+              :ram                     => 16384
+          }
+      ]
+
+      class Flavors < Fog::Collection
+
+        model Fog::Compute::Softlayer::Flavor
+
+        # Returns an array of all flavors that have been created
+        #
+        # Fog::Softlayer.flavors.all
+        def all
+          load(Fog::Compute::Softlayer::FLAVORS)
+          self
+        end
+
+        # Used to retrieve a flavor
+        # flavor_id is required to get the associated flavor information.
+        # flavors available currently:
+        #
+        # m1.tiny
+        #
+        # You can run the following command to get the details:
+        # Softlayer.flavors.get("m1.tiny")
+        #
+        # ==== Returns
+        #
+        #>> Softlayer.flavors.get("m1.tiny")
+        # <Fog::Softlayer::Compute::Flavor
+        #  id="m1.tiny",
+        #  cores=1,
+        #  disk=160,
+        #  name="Tiny Instance",
+        #  ram=1024
+        # >
+        #
+
+        def get(flavor_id)
+          self.class.new(:service => service).all.detect {|flavor| flavor.id == flavor_id}
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+#
+# 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 Image < Fog::Model
+
+        identity :id,               :aliases => 'globalIdentifier'
+        attribute :name
+        attribute :note
+        attribute :parent_id,       :aliases => 'parentId'
+        attribute :pulic_flag,      :aliases => 'publicFlag'
+        attribute :status_id,       :aliases => 'statusId'
+        attribute :summary
+        attribute :transaction_id,  :aliases => 'transactionId'
+        attribute :user_record_id,  :aliases => 'userRecordId'
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+#
+# 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/image'
+
+module Fog
+  module Compute
+    class Softlayer
+
+      class Images < Fog::Collection
+
+        model Fog::Compute::Softlayer::Image
+
+        # Returns an array of all public images.
+        #
+        # Fog::Softlayer.images.all
+        def all
+          load(service.request(:virtual_guest_block_device_template_group, :get_public_images).body)
+          self
+        end
+
+        # Used to retrieve an image
+        def get(uuid)
+          self.class.new(:service => service).all.detect {|image| image.id == uuid}
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,252 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+require 'fog/compute/models/server'
+
+module Fog
+  module Compute
+    class Softlayer
+
+      class Server < Fog::Compute::Server
+
+        identity  :id
+        attribute :name,                     :aliases => 'hostname'
+        attribute :domain
+        attribute :fqdn,                     :aliases => 'fullyQualifiedDomainName'
+        attribute :cpu,                      :aliases => ['startCpus', 'processorCoreAmount']
+        attribute :ram,                      :aliases => ['maxMemory', 'memory']
+        attribute :disk,                     :aliases => ['blockDevices','hardDrives'], :type => :squash
+        attribute :private_ip,               :aliases => 'primaryBackendIpAddress'
+        attribute :public_ip,                :aliases => 'primaryIpAddress'
+        attribute :flavor_id
+        attribute :bare_metal,               :aliases => 'bareMetalInstanceFlag'
+        attribute :os_code,                  :aliases => 'operatingSystemReferenceCode'
+        attribute :image_id,                 :type => :squash
+        attribute :ephemeral_storage,        :aliases => 'localDiskFlag'
+
+        # Times
+        attribute :created_at,              :aliases => ['createDate', 'provisionDate'], :type => :time
+        attribute :last_verified_date,      :aliases => 'lastVerifiedDate', :type => :time
+        attribute :metric_poll_date,        :aliases => 'metricPollDate', :type => :time
+        attribute :modify_date,             :aliases => 'modifyDate', :type => :time
+
+        # Metadata
+        attribute :account_id,              :aliases => 'accountId', :type => :integer
+        attribute :datacenter
+        attribute :single_tenant,           :aliases => 'dedicatedAccountHostOnlyFlag'
+        attribute :global_identifier,       :aliases => 'globalIdentifier'
+        attribute :hourly_billing_flag,     :aliases => 'hourlyBillingFlag'
+
+
+        def initialize(attributes = {})
+          super(attributes)
+          set_defaults
+        end
+
+        def bare_metal?
+          bare_metal
+        end
+
+        def bare_metal=(set)
+          attributes[:bare_metal] = case set
+            when true, 'true', 1
+              1
+            when false, 'false', 0, nil
+              0
+            else
+              raise ArgumentError, ":bare_metal cannot be #{set.class}"
+          end
+        end
+
+        def bare_metal
+          attributes[:bare_metal] === 1 ? true : false
+        end
+
+        def image_id=(uuid)
+          attributes[:image_id] = {:globalIdentifier => uuid}
+        end
+
+        def image_id
+          attributes[:image_id][:globalIdentifier] unless attributes[:image_id].nil?
+        end
+
+        def ram=(set)
+          if set.is_a?(Array) and set.first['hardwareComponentModel']
+            set = 1024 * set.first['hardwareComponentModel']['capacity'].to_i
+          end
+          attributes[:ram] = set
+        end
+
+        def name=(set)
+          attributes[:hostname] = set
+        end
+
+        def name
+          attributes[:hostname]
+        end
+
+        #def ram
+        #
+        #end
+
+        def snapshot
+          # TODO: implement
+        end
+
+        def reboot(use_hard_reboot = true)
+          # TODO: implement
+        end
+
+        def start
+          # TODO: implement
+
+          #requires :identity
+          #service.start_server(identity)
+          true
+        end
+
+        def stop
+          # TODO: implement
+        end
+
+        def shutdown
+          # TODO: implement
+        end
+
+        def destroy
+          requires :id
+          request = bare_metal? ? :delete_bare_metal_server : :delete_vm
+          response = service.send(request, self.id)
+          response.body
+        end
+
+        # Returns the public DNS name of the server
+        #
+        # @return [String]
+        #
+        def dns_name
+          fqdn
+        end
+
+        def state
+          if bare_metal?
+            service.request(:hardware_server, "#{id}/getServerPowerState").body
+          else
+            service.request(:virtual_guest, "#{id}/getPowerState").body['name']
+          end
+
+        end
+
+        def ready?
+          if bare_metal?
+            state == "on"
+          else
+            state == "Running"
+          end
+        end
+
+        # Creates server
+        # * requires attributes: :name, :domain, and :flavor_id OR (:cpu_count && :ram && :disks)
+        #
+        # @note You should use servers.create to create servers instead calling this method directly
+        #
+        # * State Transitions
+        #   * BUILD -> ACTIVE
+        #   * BUILD -> ERROR (on error)
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+
+          data = if bare_metal?
+            pre_save
+            service.create_bare_metal_server(attributes).body
+          else
+            pre_save
+            service.create_vm(attributes).body
+          end
+          merge_attributes(data.first)
+          true
+        end
+
+        def pre_save
+          extract_flavor
+          validate_attributes
+          remap_attributes(attributes, attributes_mapping)
+          clean_attributes
+        end
+
+        private
+
+        ##
+        # Generate mapping for use with remap_attributes
+        def attributes_mapping
+          common = {
+              :hourly_billing_flag => :hourlyBillingFlag,
+              :os_code  =>  :operatingSystemReferenceCode,
+
+          }
+
+          conditional = if bare_metal?
+            {
+              :cpu  =>   :processorCoreAmount,
+              :ram  =>   :memoryCapacity,
+              :disk =>   :hardDrives,
+              :bare_metal => :bareMetalInstanceFlag
+            }
+          else
+            {
+              :cpu  =>   :startCpus,
+              :ram  =>   :maxMemory,
+              :disk =>   :blockDevices,
+              :image_id =>  :blockDeviceTemplateGroup,
+              :ephemeral_storage => :localDiskFlag,
+            }
+          end
+          common.merge(conditional)
+        end
+
+        ##
+        # Remove model attributes that aren't expected by the SoftLayer API
+        def clean_attributes
+          @bare_metal = attributes.delete(:bare_metal)
+          attributes.delete(:flavor_id)
+          attributes.delete(:ephemeral_storage)
+        end
+
+
+        ##
+        # Expand a "flavor" into cpu, ram, and disk attributes
+        def extract_flavor
+          if attributes[:flavor_id]
+            flavor = @service.flavors.get(attributes[:flavor_id])
+            flavor.nil? and Fog::Errors::Error.new("Unrecognized flavor in #{self.class}##{__method__}")
+            attributes[:cpu] = flavor.cpu
+            attributes[:ram] = flavor.ram
+            attributes[:disk] = flavor.disk unless attributes[:image_id]
+            if bare_metal?
+              value = flavor.disk.first['diskImage']['capacity'] < 500 ? 250 : 500
+              attributes[:disk] = [{'capacity'=>value}]
+              attributes[:ram] = attributes[:ram] / 1024 if attributes[:ram] > 64
+            end
+          end
+        end
+
+        def validate_attributes
+          requires :name, :domain, :cpu, :ram
+          requires_one :os_code, :image_id
+          requires_one :image_id, :disk
+          bare_metal? and image_id and raise ArgumentError, "Bare Metal Cloud does not support booting from Image"
+        end
+
+        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 attributes[:domain].nil?
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+#
+# 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/server'
+
+module Fog
+  module Compute
+    class Softlayer
+
+      class Servers < Fog::Collection
+
+        model Fog::Compute::Softlayer::Server
+
+        def all
+          data = service.list_servers
+          load(data)
+        end
+
+        ## Get a SoftLayer server.
+        #
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          response = service.get_vm(identifier)
+          if response.status == 404 # we didn't find it as a VM, look for a BMC server
+            response = service.get_bare_metal_server(identifier)
+          end
+          data = response.body
+          new.merge_attributes(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def bootstrap(options={})
+          server = service.create(options)
+          server.wait_for { ready? }
+          server
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -1,3 +1,9 @@
+#
+# 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
@@ -61,6 +67,7 @@ module Fog
                 "error" => "Properties #{required.join(', ')} ALL must be set to create an instance of 'SoftLayer_Hardware'."
             }
           end
+          @bare_metal_servers.push(response.body).flatten!
           response
         end
       end

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

@@ -1,3 +1,9 @@
+#
+# 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

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

@@ -1,3 +1,9 @@
+#
+# 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
@@ -71,6 +77,7 @@ module Fog
                 "error" => "Properties #{required.join(', ')} ALL must be set to create an instance of 'SoftLayer_Hardware'."
             }
           end
+          @virtual_guests.push(response.body).flatten!
           response
         end
 

data/lib/fog/softlayer/requests/compute/delete_bare_metal_server.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
+
+        # Delete a BMC server
+        # @param [Integer] id
+        # @return [Excon::Response]
+        def delete_bare_metal_server(id)
+          response = Excon::Response.new
+
+          # Found it and deleted it.
+          response.status = 200
+          response.body = self.get_bare_metal_servers.body.map{|server| server['id']}.include?(id)
+
+          # Didn't find it, give the error that the API would give.
+          unless response.body
+            response.body = Fog::JSON.encode({:error => "A billing item is required to process a cancellation.", :code => "SoftLayer_Exception_NotFound"})
+            response.status = 500
+          end
+
+          response
+        end
+      end
+
+      class Real
+
+        def delete_bare_metal_server(id)
+          request(:hardware_server, id.to_s, :http_method => :DELETE)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/compute/delete_vm.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
+
+        # Delete a VM
+        # @param [Integer] id
+        # @return [Excon::Response]
+        def delete_vm(id)
+          response = Excon::Response.new
+
+          # Found it and deleted it.
+          response.status = 200
+          response.body = self.get_vms.body.map{|server| server['id']}.include?(id)
+
+          # Didn't find it, give the error that the API would give.
+          unless response.body
+            response.body = Fog::JSON.encode({:error => "A billing item is required to process a cancellation.", :code => "SoftLayer_Exception_NotFound"})
+            response.status = 500
+          end
+
+          response
+        end
+      end
+
+      class Real
+
+        def delete_vm(id)
+          request(:virtual_guest, id.to_s, :http_method => :DELETE)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+#
+# 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_bare_metal_server(identifier)
+          response = Excon::Response.new
+          response.body = @bare_metal_servers.map {|vm| vm if vm['id'] == identifier}.compact.reduce
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def get_bare_metal_server(identifier)
+          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag]')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+#
+# 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_bare_metal_servers
+          response = Excon::Response.new
+          response.body = @bare_metal_servers
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def get_bare_metal_servers
+          request(:account, :get_hardware)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+#
+# 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_vm(identifier)
+          response = Excon::Response.new
+          response.body = @virtual_guests.map {|vm| vm if vm['id'] == identifier}.compact.reduce
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def get_vm(identifier)
+          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[blockDevices,blockDeviceTemplateGroup.globalIdentifier]')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+#
+# 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_vms
+          response = Excon::Response.new
+          response.body = @virtual_guests
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def get_vms
+          request(:account, :get_virtual_guests)
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Softlayer
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,35 +112,46 @@ files:
 - lib/fog/softlayer/compute.rb
 - lib/fog/softlayer/compute/shared.rb
 - lib/fog/softlayer/core.rb
+- lib/fog/softlayer/models/compute/flavor.rb
+- 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/server.rb
+- lib/fog/softlayer/models/compute/servers.rb
 - lib/fog/softlayer/requests/compute/create_bare_metal_server.rb
 - lib/fog/softlayer/requests/compute/create_vm.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_vm.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_vm.rb
+- lib/fog/softlayer/requests/compute/get_vms.rb
 - lib/fog/softlayer/version.rb
 - spec/fog/compute/softlayer_spec.rb
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This library can be used as a module for `fog` or as standalone provider
   to use the SoftLayer Cloud in applications
 test_files: