fog-softlayer 0.1.1 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2M4MGM2NTNkMTQ2M2UwZGUxZDU1MjBmZjJiZTIxY2ZkNzU3MWEyYg==
+    ODBkZjA5MDMwN2UzM2FlOGJiMmNkYjhmZTkxMGRkNGYwNmFkNDllYg==
   data.tar.gz: !binary |-
-    MjEwY2EzZmE4YTEwOTYyOTEyNTVjNDY0ODVhM2ExN2VkZGY1NTQzMQ==
+    ZDk5ZjI0ZDE2YTA5OWQyN2RhYzNkNDY5OTYzMDFiYWQ2MzJmNWIxOA==
 SHA512:
   metadata.gz: !binary |-
-    ZDRkN2ZmZmE1YWFmNGZmYWY5Yzk1ZjZlOTVkNWQ4MTVmMzkyNzYyOWJkYWY1
-    NzMxMzFkYzU1YTc5Y2IwMzM1M2YzZDhiMDc1YjU5NWY1ZjU1ZmEzNGQ5MTg3
-    MTYyYjlmMmEwY2Q4ZjY5NTM1MGUyZDliZDM0ZTJiZWNiOWE2NDU=
+    ODA5NzljZTFlNDZmMjUxYTJiZjI5ZjIzYjViZGY0YmE4M2RjMzRhNmE4MGQ1
+    NGVjY2E3ZTc2YzI0YjQxMWJkNjgxNDc4ODRjMWYwN2Y0NzE4MjM3Zjg2YWEx
+    NGE0OTNhYmVmOTI4MzkwMTNhZTk4NGZkMTdmZjJjNjgzMTBkM2E=
   data.tar.gz: !binary |-
-    N2NmN2YyNjUyZjUyZjhjNzBlNDZjYzM2MTQ0MzdlYjdkODA3YzYwMDJmMDE0
-    NDAyZjQ3NTdmYTM0NzYzNDgyNWFmYjUzZjE3NjM2Y2JiMmJmM2FmZTAwNjcw
-    MzgxOGVjZTRkMTBhOTg2MTkyYWY2ZDljNjlhNDU0ODdlZmY4ZDY=
+    NmYyN2ZhOGI2Mjg4YjQ5ZTdmOGNjMWViYzgxZWY0ZWM1Y2FmZmI0NGJiNWVk
+    YmI1ZTc5NjUxMDcxODM0ZWU0OWQzYTQwNWJkMjc2OGY3YmI5MjUwM2I0MGYw
+    YjBmYWE2MzBiNDIxOTk2MzZjMzRjZmYyMTExOWIzM2RhNzQxODA=

data/examples/tags.md

@@ -0,0 +1,82 @@
+### Tags Examples
+
+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
+  ```
+  
+#### Create a connection to SoftLayer Compute Service
+
+```ruby
+	require 'fog/softlayer'
+	@sl = Fog::Compute[:softlayer]
+```
+
+#### Tags with Servers
+1. Add some tags to a server.
+
+   ```ruby
+   server = @sl.servers.get(1234567) # get the server in question
+   server.add_tags(['sparkle', 'motion']) # => true
+   ```
+
+1. Verify that the tags stuck.
+
+   ```ruby
+   server.tags # => ["sparkle", "motion"]
+   ```
+
+1. Remove a tag.
+
+   ```ruby
+   server.tags # => ["sparkle", "motion"]
+   server.delete_tags(["sparkle"]) # => true
+   server.tags # => ["motion"]
+   ```
+
+1. Put it back.
+
+   ```ruby
+   server.tags # => ["motion"]
+   server.add_tags(['sparkle']) # => true     
+   server.tags # => ["sparkle", "motion"]
+   ```
+
+1. Get servers tagged by a single tag.
+
+   ```ruby
+   	@sl.servers.tagged_with(['foo']) # => [<Fog::Compute::Softlayer::Server>, <Fog::Compute::Softlayer::Server>, ...]
+   ```
+
+1. Get servers tagged by multiple tags (tag OR tag OR ...).
+
+   ```ruby
+   	@sl.servers.tagged_with(['foo','bar']) # => [<Fog::Compute::Softlayer::Server>, <Fog::Compute::Softlayer::Server>, ...]
+   ```
+
+1. List all tags on account.
+
+   ```ruby
+   	  @sl.tags.all # => [<Fog::Compute::Softlayer::Tag>, <Fog::Compute::Softlayer::Tag>, ...]
+     ```
+1. Anatomy of a Tag object.
+
+	```ruby
+	<Fog::Compute::Softlayer::Tag
+    id=32850, # SoftLayer assigned ID
+    name="sparkle", # the tag itself
+    referenceCount=2, # number of SL API objects that "have" this tag
+    resource_id=nil, # fog-softlayer property used by models
+    internal=0 # SoftLayer API flag indicating user assigned (0) or system assigned (1)
+  	>
+	```
+	
+1. Miscellany
+
+	```ruby
+	tag = @sl.tags.get(32850)
+	tag.references # => [<Fog::Compute::Softlayer::Server>, <Fog::Compute::Softlayer::Server>, ...]
+	```

data/lib/fog/softlayer/compute.rb

@@ -28,15 +28,26 @@ module Fog
       model         :image
       collection    :servers
       model         :server
+      collection    :tags
+      model         :tag
 
       request_path 'fog/softlayer/requests/compute'
       request :create_bare_metal_server
+      request :create_bare_metal_tags
       request :create_vm
       request :create_vms
+      request :create_vm_tags
       request :delete_bare_metal_server
+      request :delete_bare_metal_tags
       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_references_by_tag_name
+      request :get_tag
+      request :get_vm_tags
       request :get_vm
       request :get_vms
 
@@ -52,6 +63,7 @@ module Fog
         def initialize(args)
           @virtual_guests = []
           @bare_metal_servers = []
+          @tags = []
           super(args)
         end
 
@@ -130,7 +142,7 @@ module Fog
         end
 
         def list_servers
-          (self.get_vms.body << self.get_bare_metal_servers.body).flatten
+          (self.get_vms.body << self.get_bare_metal_servers.body.map {|s| s['bare_metal'] = true; s}).flatten
         end
 
         private

data/lib/fog/softlayer/core.rb

@@ -42,6 +42,12 @@ module Fog
         '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
       end
     end
+
+    def self.stringify_keys(obj)
+      return obj.inject({}){|memo,(k,v)| memo[k.to_s] =  stringify_keys(v); memo} if obj.is_a? Hash
+      return obj.inject([]){|memo,v    | memo         << stringify_keys(v); memo} if obj.is_a? Array
+      obj
+    end
   end
 end
 

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

@@ -22,7 +22,7 @@ module Fog
         attribute :private_ip,               :aliases => 'primaryBackendIpAddress'
         attribute :public_ip,                :aliases => 'primaryIpAddress'
         attribute :flavor_id
-        attribute :bare_metal,               :aliases => 'bareMetalInstanceFlag'
+        attribute :bare_metal,               :type => :boolean
         attribute :os_code,                  :aliases => 'operatingSystemReferenceCode'
         attribute :image_id,                 :type => :squash
         attribute :ephemeral_storage,        :aliases => 'localDiskFlag'
@@ -40,25 +40,33 @@ module Fog
         attribute :single_tenant,           :aliases => 'dedicatedAccountHostOnlyFlag'
         attribute :global_identifier,       :aliases => 'globalIdentifier'
         attribute :hourly_billing_flag,     :aliases => 'hourlyBillingFlag'
-
+        attribute :tags,                    :aliases => 'tagReferences'
 
         def initialize(attributes = {})
           super(attributes)
           set_defaults
         end
 
+        def add_tags(tags)
+          requires :id
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          tags.each do |tag|
+            service.tags.new(:resource_id => self.id, :name => tag).save
+          end
+          self.reload
+          true
+        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
+            when false, 'false', 0, nil, ''
               0
             else
-              raise ArgumentError, ":bare_metal cannot be #{set.class}"
+              1
           end
         end
 
@@ -75,6 +83,27 @@ module Fog
           attributes[:datacenter][:name] unless attributes[:datacenter].nil?
         end
 
+        def delete_tags(tags)
+          requires :id
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          tags.each do |tag|
+            service.tags.new(:resource_id => self.id, :name => tag).destroy
+          end
+          self.reload
+          true
+        end
+
+        def destroy
+          requires :id
+          request = bare_metal? ? :delete_bare_metal_server : :delete_vm
+          response = service.send(request, self.id)
+          response.body
+        end
+
+        def dns_name
+          fqdn
+        end
+
         def image_id=(uuid)
           attributes[:image_id] = {:globalIdentifier => uuid}
         end
@@ -83,8 +112,19 @@ module Fog
           attributes[:image_id][:globalIdentifier] unless attributes[:image_id].nil?
         end
 
-        def ssh_password
-          self.os['passwords'][0]['password'] if self.id
+        def name=(set)
+          attributes[:hostname] = set
+        end
+
+        def name
+          attributes[:hostname]
+        end
+
+        def pre_save
+          extract_flavor
+          validate_attributes
+          remap_attributes(attributes, attributes_mapping)
+          clean_attributes
         end
 
         def ram=(set)
@@ -94,23 +134,23 @@ module Fog
           attributes[:ram] = set
         end
 
-        def name=(set)
-          attributes[:hostname] = set
+        def ready?
+          if bare_metal?
+            state == "on"
+          else
+            state == "Running"
+          end
         end
 
-        def name
-          attributes[:hostname]
+        def reboot(use_hard_reboot = true)
+          # TODO: implement
         end
 
-        #def ram
-        #
-        #end
-
-        def snapshot
-          # TODO: implement
+        def ssh_password
+          self.os['passwords'][0]['password'] if self.id
         end
 
-        def reboot(use_hard_reboot = true)
+        def snapshot
           # TODO: implement
         end
 
@@ -130,36 +170,12 @@ module Fog
           # 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
@@ -186,11 +202,8 @@ module Fog
           true
         end
 
-        def pre_save
-          extract_flavor
-          validate_attributes
-          remap_attributes(attributes, attributes_mapping)
-          clean_attributes
+        def tags
+          attributes[:tags].map { |i| i['tag']['name'] } if attributes[:tags]
         end
 
         private

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

@@ -22,11 +22,12 @@ module Fog
 
         ## Get a SoftLayer server.
         #
-        def get(identifier)
-          return nil if identifier.nil? || identifier == ""
-          response = service.get_vm(identifier)
+        def get(id)
+          return nil if id.nil? || id == ""
+          response = service.get_vm(id)
           if response.status == 404 # we didn't find it as a VM, look for a BMC server
-            response = service.get_bare_metal_server(identifier)
+            response = service.get_bare_metal_server(id)
+            response.body['bare_metal'] = true
           end
           data = response.body
           new.merge_attributes(data)
@@ -40,8 +41,16 @@ module Fog
           server
         end
 
+        def tagged_with(tags)
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          ids = service.get_references_by_tag_name(tags.join(',')).body.map do |tag|
+            tag['references'].map do |ref|
+              ref['resourceTableId']
+            end
+          end.flatten.uniq
+          ids.map { |id| get(id) }
+        end
       end
-
     end
   end
 end

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

@@ -0,0 +1,72 @@
+#
+# 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 Tag < Fog::Model
+        identity  :id
+
+        attribute :name
+        attribute :referenceCount, :type => :integer
+        attribute :resource_id
+        attribute :internal, :type => :boolean
+
+        def initialize(attributes = {})
+          super
+        end
+
+        def destroy
+          requires :name, :resource_id
+          load_server
+          @server.bare_metal? ? destroy_bare_metal_tag : destroy_vm_tag
+          true
+        end
+
+        def references
+          service.get_tag(self.id).body['references'].map do |ref|
+            @refs ||= case ref['tagType']['keyName']
+              when 'GUEST', 'HARDWARE'
+                @servers ||= service.servers.get(ref['resourceTableId'])
+            end
+          end
+        end
+
+        def save
+          requires :name, :resource_id
+          load_server
+          @server.bare_metal? ? add_bare_metal_tag : add_vm_tag
+          true
+        end
+
+        private
+
+        def add_bare_metal_tag
+          service.create_bare_metal_tags(@server.id, @server.tags << self.name)
+        end
+
+        def add_vm_tag
+          service.create_vm_tags(@server.id, @server.tags << self.name)
+        end
+
+        def destroy_bare_metal_tag
+          service.delete_bare_metal_tags(@server.id, [self.name])
+        end
+
+        def destroy_vm_tag
+          service.delete_vm_tags(@server.id, [self.name])
+        end
+
+        def load_server
+          requires :resource_id
+          @server ||= service.servers.get(self.resource_id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+#
+# 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/tag'
+
+module Fog
+  module Compute
+    class Softlayer
+      class Tags < Fog::Collection
+        attribute :filters
+
+        model Fog::Compute::Softlayer::Tag
+
+        def initialize(attributes)
+          self.filters ||= []
+          super
+        end
+
+        def all(filters = filters)
+          raise ArgumentError, "Filters argument for #{self.class.name}##{__method__} must be Array." unless filters.is_a?(Array)
+          self.filters = filters
+          data = service.describe_tags.body
+          data.select! { |tag| filters.include?(tag) } unless filters.empty?
+          load(data)
+        end
+
+        def get(id)
+          return nil if id.nil? || id == ""
+          response = service.get_tag(id)
+          data = response.body
+          new.merge_attributes(data)
+        end
+      end
+    end
+  end
+end

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

@@ -42,23 +42,23 @@ module Fog
             response.status = 200
             # a real response comes back with lots of nil values like this too, it takes 1 - 2 hours for a real BMC server to provision
             response.body = {
-                "accountId" =>  Fog::Softlayer.mock_account_id,
-                "createDate" => Time.now.iso8601,
-                "dedicatedAccountHostOnlyFlag" => false,
-                "domain" => nil,
-                "fullyQualifiedDomainName" => nil,
-                "hostname" => nil,
-                "id" => Fog::Softlayer.mock_vm_id,
-                "lastPowerStateId" => nil,
-                "lastVerifiedDate" => nil,
-                "maxCpu" => nil,
-                "maxCpuUnits" => "CORE",
-                "maxMemory" => nil,
-                "metricPollDate" => nil,
-                "modifyDate" => nil,
-                "startCpus" => nil,
-                "statusId" => 1001,
-                "globalIdentifier" => Fog::Softlayer.mock_global_identifier
+                'accountId' =>  Fog::Softlayer.mock_account_id,
+                'createDate' => Time.now.iso8601,
+                'dedicatedAccountHostOnlyFlag' => false,
+                'domain' => nil,
+                'fullyQualifiedDomainName' => nil,
+                'hostname' => nil,
+                'id' => Fog::Softlayer.mock_vm_id,
+                'lastPowerStateId' => nil,
+                'lastVerifiedDate' => nil,
+                'maxCpu' => nil,
+                'maxCpuUnits' => "CORE",
+                'maxMemory' => nil,
+                'metricPollDate' => nil,
+                'modifyDate' => nil,
+                'startCpus' => nil,
+                'statusId' => 1001,
+                'globalIdentifier' => Fog::Softlayer.mock_global_identifier
             }
           rescue MissingRequiredParameter
             response.status = 500

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

@@ -0,0 +1,50 @@
+#
+# 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_bare_metal_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          response = Excon::Response.new
+          response.status = self.get_bare_metal_server(id).status
+
+          if response.status != 404
+            tags.each do |tag|
+              @tags << {
+                  'empRecordId'=>nil,
+                  'id'=>Fog::Mock.random_numbers(7),
+                  'resourceTableId'=>id,
+                  'tagId'=> tagId = Fog::Mock.random_numbers(5),
+                  'tagTypeId'=>1,
+                  'usrRecordId'=>123456,
+                  'tag'=>{'accountId'=>987654, 'id'=>tagId, 'internal'=>0, 'name'=>tag},
+                  'tagType'=>{'description'=>'Hardware', 'keyName'=>'HARDWARE'}
+              }
+            end
+            response.body = true
+          else
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+      end
+
+      class Real
+        def create_bare_metal_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          self.request(:hardware_server, "#{id}/set_tags", :body => tags.join(','), :http_method => :post)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+#
+# 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_vm_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          response = Excon::Response.new
+          response.status = self.get_vm(id).status
+
+          if response.status != 404
+            tags.each do |tag|
+              @tags << {
+                  'empRecordId'=>nil,
+                  'id'=>Fog::Mock.random_numbers(7),
+                  'resourceTableId'=>id,
+                  'tagId'=> tagId = Fog::Mock.random_numbers(5),
+                  'tagTypeId'=>1,
+                  'usrRecordId'=>123456,
+                  'tag'=>{'accountId'=>987654, 'id'=>tagId, 'internal'=>0, 'name'=>tag},
+                  'tagType'=>{'description'=>'CCI', 'keyName'=>'GUEST'}
+              }
+            end
+            response.body = true
+          else
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+      end
+
+      class Real
+        def create_vm_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          self.request(:virtual_guest, "#{id}/set_tags", :body => tags.join(','), :http_method => :post)
+        end
+      end
+    end
+  end
+end

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

@@ -44,32 +44,33 @@ module Fog
 
             ## stub some responses
             fields = {
-                :accountId =>  Fog::Softlayer.mock_account_id,
-                :createDate => Time.now.iso8601,
-                :dedicatedAccountHostOnlyFlag => false,
-                :domain => nil,
-                :fullyQualifiedDomainName => nil,
-                :hostname => nil,
-                :id => Fog::Softlayer.mock_vm_id,
-                :lastPowerStateId => nil,
-                :lastVerifiedDate => nil,
-                :maxCpu => nil,
-                :maxCpuUnits => "CORE",
-                :maxMemory => nil,
-                :metricPollDate => nil,
-                :modifyDate => nil,
-                :startCpus => nil,
-                :statusId => 1001,
-                :globalIdentifier => Fog::Softlayer.mock_global_identifier
+                'accountId' =>  Fog::Softlayer.mock_account_id,
+                'createDate' => Time.now.iso8601,
+                'datacenter' => nil,
+                'dedicatedAccountHostOnlyFlag' => false,
+                'domain' => nil,
+                'fullyQualifiedDomainName' => nil,
+                'hostname' => nil,
+                'id' => Fog::Softlayer.mock_vm_id,
+                'lastPowerStateId' => nil,
+                'lastVerifiedDate' => nil,
+                'maxCpu' => nil,
+                'maxCpuUnits' => "CORE",
+                'maxMemory' => nil,
+                'metricPollDate' => nil,
+                'modifyDate' => nil,
+                'startCpus' => nil,
+                'statusId' => 1001,
+                'globalIdentifier' => Fog::Softlayer.mock_global_identifier,
+                'operatingSystem' => {},
+                'tagReferences' => []
             }
 
             # clobber stubbed values where applicable
-            response.body = opts.each_with_index.map do |vm,i|
-              fields.reduce({}) do |result,(field,default)|
-                result[field] = vm[field] || default
-                result
-              end
+            response.body = opts.map do |vm|
+              fields.deep_merge(Fog::Softlayer.stringify_keys(opts.first)) # stringify in case :symbols were passed.
             end
+
           rescue MissingRequiredParameter
             response.status = 500
             response.body = {

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

@@ -0,0 +1,46 @@
+#
+# 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_bare_metal_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          response = Excon::Response.new
+          response.status = self.get_bare_metal_server(id).status
+
+          if response.status != 404
+            @tags = @tags.reject do |tag|
+              tag['resourceTableId'] == id and tags.include?(tag['tag']['name'])
+            end
+            response.body = true
+          else
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+
+      end
+
+      class Real
+        def delete_bare_metal_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          subset = self.get_bare_metal_tags(id).body['tagReferences'].map do |i|
+            i['tag']['name'] unless tags.include?(i['tag']['name'])
+          end.compact
+          self.create_bare_metal_tags(id, subset)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+#
+# 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_vm_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          response = Excon::Response.new
+          response.status = self.get_vm(id).status
+
+          if response.status != 404
+            @tags = @tags.reject do |tag|
+              tag['resourceTableId'] == id and tags.include?(tag['tag']['name'])
+            end
+            response.body = true
+          else
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+
+      end
+
+      class Real
+        def delete_vm_tags(id, tags = [])
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          subset = self.get_vm_tags(id).body['tagReferences'].map do |i|
+            i['tag']['name'] unless tags.include?(i['tag']['name'])
+          end.compact
+          self.create_vm_tags(id, subset)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+#
+# 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 describe_tags
+          response = Excon::Response.new
+          response.body = @tags
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def describe_tags
+          self.request(:account, :get_tags, :query => 'objectMask=mask[referenceCount]')
+        end
+      end
+    end
+  end
+end

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

@@ -11,8 +11,14 @@ module Fog
       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.body = @bare_metal_servers.map {|vm| vm if vm['id'] == identifier.to_s }.compact.first || {}
+          response.status = response.body.empty? ? 404 : 200
+          if response.status == 404
+            response.body = {
+                "error"=>"Unable to find object with id of '#{identifier}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
           response
         end
 
@@ -20,7 +26,7 @@ module Fog
 
       class Real
         def get_bare_metal_server(identifier)
-          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,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.passwords.password]')
         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,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
+          request(:account, :get_hardware, :query => 'objectMask=mask[datacenter,tagReferences,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
         end
       end
     end

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

@@ -0,0 +1,47 @@
+#
+# 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_tags(id)
+          response = Excon::Response.new
+
+          response.status = self.get_bare_metal_server(id).status
+
+          bmc = self.get_bare_metal_server(id).body
+          unless bmc['error']
+            tags = @tags.map do |tag|
+              tag if tag['resourceTableId'] == id
+            end.compact
+          end
+
+          bmc['tagReferences'] = tags
+          response.body = bmc
+
+          if response.status == 404
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+
+      end
+
+      class Real
+        def get_bare_metal_tags(id)
+          self.request(:hardware_server, id, :query => 'objectMask=id;tagReferences')
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/compute/get_references_by_tag_name.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 get_references_by_tag_name(tag_list)
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = tag_list.split(',').map do |tag|
+            refs = @tags.select { |ref| ref['tag']['name'] == tag }
+            unless refs.empty?
+              {
+                  'accountId' =>  Fog::Softlayer.mock_account_id,
+                  'id'=>Fog::Mock.random_numbers(7),
+                  'internal' => 0,
+                  'name' => tag,
+                  'references' => refs
+              }
+            end
+          end.compact
+          response
+        end
+
+      end
+
+      class Real
+        def get_references_by_tag_name(tag_list)
+          self.request(:tag, "get_tag_by_tag_name/#{tag_list}", :query => 'objectMask=references')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+#
+# 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_tag(id)
+          # TODO: Implement
+        end
+
+      end
+
+      class Real
+        def get_tag(id)
+          self.request(:tag, "#{id}/get_object", :query => "objectMask=references;references.tagType")
+        end
+      end
+    end
+  end
+end

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

@@ -11,8 +11,14 @@ module Fog
       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.body = @virtual_guests.map {|vm| vm if vm['id'] == identifier.to_s }.compact.first || {}
+          response.status = response.body.empty? ? 404 : 200
+          if response.status == 404
+            response.body = {
+              "error"=>"Unable to find object with id of '#{identifier}'.",
+              "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
           response
         end
 
@@ -20,7 +26,7 @@ module Fog
 
       class Real
         def get_vm(identifier)
-          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
+          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
         end
       end
     end

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

@@ -0,0 +1,47 @@
+#
+# 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_tags(id)
+          response = Excon::Response.new
+
+          response.status = self.get_vm(id).status
+
+          vm = self.get_vm(id).body
+          unless vm['error']
+            tags = @tags.map do |tag|
+              tag if tag['resourceTableId'] == id
+            end.compact
+          end
+
+          vm['tagReferences'] = tags
+          response.body = vm
+
+          if response.status == 404
+            response.body = {
+                "error"=>"Unable to find object with id of '#{id}'.",
+                "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+
+      end
+
+      class Real
+        def get_vm_tags(id)
+          self.request(:virtual_guest, id, :query => 'objectMask=mask[tagReferences]')
+        end
+      end
+    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,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
+          request(:account, :get_virtual_guests, :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
         end
       end
     end

data/lib/fog/softlayer/version.rb

@@ -6,6 +6,6 @@
 #
 module Fog
   module Softlayer
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

data/tests/softlayer/compute/schema.rb

@@ -72,6 +72,17 @@ class Softlayer
             "globalIdentifier" => String
         }
 
+        TAGS = {
+            'empRecordId'=>nil,
+            'id'=>String,
+            'resourceTableId'=>Integer,
+            'tagId'=> Fog::Nullable::String,
+            'tagTypeId'=>Fog::Nullable::Integer,
+            'usrRecordId'=>Fog::Nullable::Integer,
+            'tag'=>{'accountId'=>Integer, 'id'=>String, 'internal'=>Integer, 'name'=>String},
+            'tagType'=>{'description'=>String, 'keyName'=>String}
+        }
+
       end
 
       module VirtualGuest
@@ -95,6 +106,17 @@ class Softlayer
             "globalIdentifier" => String
         }
 
+        TAGS = {
+            'empRecordId'=>nil,
+            'id'=>String,
+            'resourceTableId'=>Integer,
+            'tagId'=> Fog::Nullable::String,
+            'tagTypeId'=>Fog::Nullable::Integer,
+            'usrRecordId'=>Fog::Nullable::Integer,
+            'tag'=>{'accountId'=>Integer, 'id'=>String, 'internal'=>Integer, 'name'=>String},
+            'tagType'=>{'description'=>String, 'keyName'=>String}
+        }
+
       end
 
       module Collected

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

@@ -0,0 +1,92 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+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'}
+  @vm = @sl_connection.servers.create(opts)
+
+  opts[:bare_metal] = true
+  @bmc = @sl_connection.servers.create(opts)
+
+  test_tags = ['foo', 'bar', 'baz']
+
+  tests('success') do
+
+    tests("#create_vm_tags('#{@vm.id}', #{test_tags})") do
+      returns(true, "returns true") { @sl_connection.create_vm_tags(@vm.id, test_tags).body}
+      end
+
+    tests("#create_bare_metal_tags('#{@bmc.id}', #{test_tags})") do
+      returns(true, "returns true") { @sl_connection.create_bare_metal_tags(@bmc.id, test_tags).body }
+    end
+
+    tests("#get_vm_tags('#{@vm.id}')") do
+      data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::TAGS, {:allow_extra_keys => true}) { @sl_connection.get_vm_tags(@vm.id).body['tagReferences'].first }
+    end
+
+    tests("#get_bare_metal_tags('#{@bmc.id}')") do
+      data_matches_schema(Softlayer::Compute::Formats::BareMetal::TAGS, {:allow_extra_keys => true}) { @sl_connection.get_bare_metal_tags(@bmc.id).body['tagReferences'].first }
+    end
+
+    tests("#delete_vm_tags('#{@vm.id}')") do
+      returns(3, "three tags for VM with id #{@vm.id}") { @sl_connection.get_vm_tags(@vm.id).body['tagReferences'].count }
+      returns(true, "returns true") { @sl_connection.delete_vm_tags(@vm.id, ['foo', 'bar']).body }
+      returns(1, "one tag remains for VM with id #{@vm.id}") { @sl_connection.get_vm_tags(@vm.id).body['tagReferences'].count }
+    end
+
+    tests("#delete_bare_metal_tags('#{@bmc.id}')") do
+      returns(3, "three tags for BM server with id #{@bmc.id}") { @sl_connection.get_bare_metal_tags(@bmc.id).body['tagReferences'].count }
+      returns(true, "returns true") { @sl_connection.delete_bare_metal_tags(@bmc.id, ['foo', 'bar']).body }
+      returns(1, "one tag remains for BM server with id #{@bmc.id}") { @sl_connection.get_bare_metal_tags(@bmc.id).body['tagReferences'].count }
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#create_vm_tags(123456789, #{test_tags})") do
+      returns(404, "server doesn't exist") { @sl_connection.create_vm_tags(123456789).status }
+    end
+
+    tests("#create_bare_metal_tags(123456789, #{test_tags})") do
+      returns(404, "server doesn't exist") { @sl_connection.create_bare_metal_tags(123456789).status }
+    end
+
+    tests("#get_vm_tags(123456789)") do
+      returns(404, "server doesn't exist") { @sl_connection.get_vm_tags(123456789).status }
+    end
+
+    tests("#get_bare_metal_tags(123456789)") do
+      returns(404, "server doesn't exist") { @sl_connection.get_bare_metal_tags(123456789).status }
+    end
+
+    tests("#delete_vm_tags(123456789, #{test_tags})") do
+      returns(404, "server doesn't exist") { @sl_connection.delete_vm_tags(123456789, test_tags).status }
+    end
+
+    tests("#delete_bare_metal_tags(123456789, #{test_tags})") do
+      returns(404, "server doesn't exist") { @sl_connection.delete_bare_metal_tags(123456789, test_tags).status }
+    end
+
+    tests("#delete_bare_metal_tags(123456789, #{test_tags})") do
+      returns(404, "server doesn't exist") { @sl_connection.delete_bare_metal_tags(123456789, test_tags).status }
+    end
+
+    tests("#create_vm_tags").raises(ArgumentError) do
+      @sl_connection.create_vm_tags(@vm.id, 'foo')
+    end
+
+    tests("#create_bare_metal_tags").raises(ArgumentError) do
+      @sl_connection.create_bare_metal_tags(@vm.id, 'foo')
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Matt Eldridge
@@ -235,6 +235,7 @@ files:
 - examples/compute.md
 - examples/dns.md
 - examples/storage.md
+- examples/tags.md
 - fog-softlayer.gemspec
 - gemfiles/Gemfile-edge
 - gemfiles/Gemfile-ruby-1.8.7
@@ -250,6 +251,8 @@ files:
 - lib/fog/softlayer/models/compute/images.rb
 - lib/fog/softlayer/models/compute/server.rb
 - lib/fog/softlayer/models/compute/servers.rb
+- lib/fog/softlayer/models/compute/tag.rb
+- lib/fog/softlayer/models/compute/tags.rb
 - lib/fog/softlayer/models/dns/domain.rb
 - lib/fog/softlayer/models/dns/domains.rb
 - lib/fog/softlayer/models/dns/record.rb
@@ -259,13 +262,22 @@ files:
 - lib/fog/softlayer/models/storage/file.rb
 - lib/fog/softlayer/models/storage/files.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_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_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_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/dns/create_domain.rb
 - lib/fog/softlayer/requests/dns/create_record.rb
@@ -328,6 +340,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/tag_tests.rb
 - tests/softlayer/requests/compute/vm_tests.rb
 - tests/softlayer/requests/storage/auth_tests.rb
 - tests/softlayer/requests/storage/container_tests.rb