softlayer_api 2.2.2 → 3.0.b1

data/lib/softlayer/ObjectMaskParser.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 require "softlayer/ObjectMaskTokenizer"
 require "softlayer/ObjectMaskProperty"

data/lib/softlayer/ObjectMaskProperty.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 module SoftLayer
   #

data/lib/softlayer/ObjectMaskToken.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 module SoftLayer
   #

data/lib/softlayer/ObjectMaskTokenizer.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 require 'softlayer/ObjectMaskToken'
 require 'strscan'

data/lib/softlayer/ProductItemCategory.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 module SoftLayer
   # This struct represents a configuration option that can be included in
@@ -26,8 +10,7 @@ module SoftLayer
   # the product order is the price_id, the rest of the information is provided
   # to make the object friendly to humans who may be searching for the
   # meaning of a given price_id.
-  ProductConfigurationOption = Struct.new(:price_id, :description, :capacity, :units, :setupFee, :laborFee, :oneTimeFee, :recurringFee, :hourlyRecurringFee) do
-
+  class ProductConfigurationOption < Struct.new(:price_id, :description, :capacity, :units, :setupFee, :laborFee, :oneTimeFee, :recurringFee, :hourlyRecurringFee)
     # Is it evil, or just incongruous to give methods to a struct?
 
     # returns true if the configurtion option has no fees associated with it.
@@ -48,13 +31,13 @@ module SoftLayer
   # service.
   class ProductItemCategory < ModelBase
     include ::SoftLayer::DynamicAttribute
-    
+
     ##
     # :attr_reader:
     # The categoryCode is a primary identifier for a particular
     # category.  It is a string like 'os' or 'ram'
     sl_attr :categoryCode
-    
+
     ##
     # :attr_reader:
     # The name of a category is a friendly, readable string

data/lib/softlayer/ProductPackage.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 require 'json'
 
@@ -59,7 +43,7 @@ module SoftLayer
 
     ##
     # The list of locations where this product package is available.
-    sl_attr :availableLocations
+    sl_attr :available_locations, 'availableLocations'
 
     ##
     # The set of product categories needed to make an order for this product package.
@@ -119,15 +103,7 @@ module SoftLayer
     end
 
     def datacenter_options
-      availableLocations.collect { |location_data| location_data["location"]["name"] }
-    end
-
-    ##
-    # Given a datacenter name that was returned by datacenter_options, use information
-    # in the package to retrieve a location id.
-    def location_id_for_datacenter_name(datacenter_name)
-      location_data = availableLocations.find { |location_data| location_data["location"]["name"]  == datacenter_name }
-      location_data["locationId"]
+      available_locations.collect { |location_data| Datacenter::datacenter_named(location_data["location"]["name"], self.softlayer_client) }.compact
     end
 
     def service
@@ -141,8 +117,11 @@ module SoftLayer
     def self.packages_with_key_name(key_name, client = nil)
       softlayer_client = client || Client.default_client
       raise "#{__method__} requires a client but none was given and Client::default_client is not set" if !softlayer_client
-      
-      filter = SoftLayer::ObjectFilter.build('type.keyName', key_name)
+
+      filter = SoftLayer::ObjectFilter.new do |filter|
+        filter.accept('type.keyName').when_it is(key_name)
+      end
+
       filtered_service = softlayer_client['Product_Package'].object_filter(filter).object_mask(self.default_object_mask('mask'))
       packages_data = filtered_service.getAllObjects
       packages_data.collect { |package_data| ProductPackage.new(softlayer_client, package_data) }
@@ -155,7 +134,7 @@ module SoftLayer
     def self.package_with_id(package_id, client = nil)
       softlayer_client = client || Client.default_client
       raise "#{__method__} requires a client but none was given and Client::default_client is not set" if !softlayer_client
-      
+
       package_data = softlayer_client['Product_Package'].object_with_id(package_id).object_mask(self.default_object_mask('mask')).getObject
       ProductPackage.new(softlayer_client, package_data)
     end

data/lib/softlayer/Server.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 module SoftLayer
   # Server is the base class for VirtualServer and BareMetalServer.
@@ -83,6 +67,25 @@ module SoftLayer
       end
     end
 
+    ##
+    # Reboot the server.  This action is taken immediately.
+    # Servers can be rebooted in three different ways:
+    # :default_reboot - (Try soft, then hard) Attempts to reboot a server using the :os_reboot technique then, if that is not successful, tries the :power_cycle method
+    # :os_reboot - (aka. soft rebot) instructs the server's host operating system to reboot
+    # :power_cycle - (aka. hard reboot) The actual (for hardware) or metaphorical (for virtual servers) equivalent to pulling the plug on the server then plugging it back in.
+    def reboot!(reboot_technique = :default_reboot)
+      case reboot_technique
+      when :default_reboot
+        self.service.rebootDefault
+      when :os_reboot
+        self.service.rebootSoft
+      when :power_cycle
+        self.service.rebootHard
+      else
+        raise RuntimeError, "Unrecognized reboot technique in SoftLayer::Server#reboot!}"
+      end
+    end
+
     ##
     # Make an API request to SoftLayer and return the latest properties hash
     # for this object.

data/lib/softlayer/Ticket.rb

@@ -1,24 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 module SoftLayer
 	class Ticket < SoftLayer::ModelBase
@@ -32,10 +16,10 @@ module SoftLayer
     # :attr_reader:
     # The ticket system maintains a fixed set of subjects for tickets that are used to ensure tickets make it to the right folks quickly
     sl_attr :subject
-    
+
     ##
     # :attr_reader:
-    # The date the ticket was last updated. 
+    # The date the ticket was last updated.
     sl_attr :lastEditDate
 
     ##
@@ -99,7 +83,7 @@ module SoftLayer
           'awaitingUserResponseFlag',   # This comes in from the server as a Boolean value
           'serverAdministrationFlag',   # This comes in from the server as an integer :-(
         ]
-      }
+      }.to_sl_object_mask
 		end
 
     ##
@@ -118,29 +102,6 @@ module SoftLayer
 			@ticket_subjects
 		end
 
-    ##
-    # Returns the set of currently open tickets
-    #
-    # Options should contain:
-    #
-    # <b>+:client+</b> - the client in which to search for the ticket
-    #
-    # If a client is not provided then the routine will search Client::default_client
-    # If Client::default_client is also nil the routine will raise an error.    
-    def self.open_tickets(options = {})
-      softlayer_client = options[:client] || Client.default_client
-      raise "#{__method__} requires a client but none was given and Client::default_client is not set" if !softlayer_client
-
-      if options.has_key?(:object_mask)
-        object_mask = options[:object_mask]
-      else
-        object_mask = default_object_mask.to_sl_object_mask
-      end
-
-      open_tickets_data = softlayer_client["Account"].object_mask(object_mask).getOpenTickets
-      open_tickets_data.collect { |ticket_data| new(softlayer_client, ticket_data) }
-    end
-    
     ##
     # Find the ticket with the given ID and return it
     #

data/lib/softlayer/VirtualServer.rb

@@ -1,26 +1,8 @@
-#
+#--
 # Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-
-require 'time'
+# For licensing information see the LICENSE.md file in the project root.
+#++
 
 module SoftLayer
   ##
@@ -90,49 +72,6 @@ module SoftLayer
       self.service.deleteObject()
     end
 
-    ##
-    # This routine submits an order to upgrade the cpu count of the virtual server.
-    # The order may result in additional charges being applied to SoftLayer account
-    #
-    # This routine can also "downgrade" servers (set their cpu count lower)
-    #
-    # The routine returns true if the order is placed and false if it is not
-    #
-    def upgrade_cores!(num_cores)
-      upgrade_item_price = _item_price_in_category("guest_core", num_cores)
-      _order_upgrade_item!(upgrade_item_price) if upgrade_item_price
-      nil != upgrade_item_price
-    end
-
-    ##
-    # This routine submits an order to change the RAM available to the virtual server.
-    # Pass in the desired amount of RAM for the server in Gigabytes
-    #
-    # The order may result in additional charges being applied to SoftLayer account
-    #
-    # The routine returns true if the order is placed and false if it is not
-    #
-    def upgrade_RAM!(ram_in_GB)
-      upgrade_item_price = _item_price_in_category("ram", ram_in_GB)
-      _order_upgrade_item!(upgrade_item_price) if upgrade_item_price
-      nil != upgrade_item_price
-    end
-
-    ##
-    # This routine submits an order to change the maximum nic speed of the server
-    # Pass in the desired speed in Megabits per second (typically 10, 100, or 1000)
-    # (since you may choose a slower speed this routine can also be used for "downgrades")
-    #
-    # The order may result in additional charges being applied to SoftLayer account
-    #
-    # The routine returns true if the order is placed and false if it is not
-    #
-    def upgrade_max_port_speed!(network_speed_in_Mbps)
-      upgrade_item_price = _item_price_in_category("port_speed", network_speed_in_Mbps)
-      _order_upgrade_item!(upgrade_item_price) if upgrade_item_price
-      nil != upgrade_item_price
-    end
-
     ##
     # Capture a disk image of this virtual server for use with other servers.
     #
@@ -143,15 +82,21 @@ module SoftLayer
     #
     # The image_notes should be a string and will be added to the image as notes.
     #
-    def capture_image(image_name, include_attached_storage = false, image_notes = '')
-      image_notes = '' if !image_notes
-
+    # The routine returns the instance of SoftLayer::ImageTemplate that is
+    # created.  That image template will probably not be available immediately, however.
+    # You may use the wait_until_ready routine of SoftLayer::ImageTemplate to
+    # wait on it.
+    #
+    def capture_image(image_name, include_attached_storage = false, image_notes = nil)
       disk_filter = lambda { |disk| disk['device'] == '0' }
       disk_filter = lambda { |disk| disk['device'] != '1' } if include_attached_storage
 
       disks = self.blockDevices.select(&disk_filter)
 
-      self.service.createArchiveTransaction(image_name, disks, image_notes) if disks && !disks.empty?
+      self.service.createArchiveTransaction(image_name, disks, notes ? notes : "") if disks && !disks.empty?
+
+      image_templates = SoftLayer::ImageTemplate.find_private_templates(:name => image_name)
+      image_templates[0] if !image_templates.empty?
     end
 
     ##
@@ -260,10 +205,15 @@ module SoftLayer
       softlayer_client = options_hash[:client] || Client.default_client
       raise "#{__method__} requires a client but none was given and Client::default_client is not set" if !softlayer_client
 
-      object_filter = {}
+      if(options_hash.has_key? :object_filter)
+        object_filter = options_hash[:object_filter]
+        raise "Expected an instance of SoftLayer::ObjectFilter" unless object_filter.kind_of?(SoftLayer::ObjectFilter)
+      else
+        object_filter = ObjectFilter.new()
+      end
 
       option_to_filter_path = {
-        :cpus => "virtualGuests.maxCpu",
+        :cores => "virtualGuests.maxCpu",
         :memory => "virtualGuests.maxMemory",
         :hostname => "virtualGuests.hostname",
         :domain => "virtualGuests.domain",
@@ -282,18 +232,18 @@ module SoftLayer
       # that particular option, add a clause to the object filter that filters for the matching
       # value
       option_to_filter_path.each do |option, filter_path|
-        object_filter.merge!(SoftLayer::ObjectFilter.build(filter_path, options_hash[option])) if options_hash.has_key?(option)
+        object_filter.modify { |filter| filter.accept(filter_path).when_it is(options_hash[option])} if options_hash[option]
       end
 
       # Tags get a much more complex object filter operation so we handle them separately
       if options_hash.has_key?(:tags)
-        object_filter.merge!(SoftLayer::ObjectFilter.build("virtualGuests.tagReferences.tag.name", {
+        object_filter.set_criteria_for_key_path("virtualGuests.tagReferences.tag.name", {
           'operation' => 'in',
           'options' => [{
             'name' => 'data',
-            'value' => options_hash[:tags]
+            'value' => options_hash[:tags].collect{ |tag_value| tag_value.to_s }
             }]
-          } ));
+          } );
       end
 
       required_properties_mask = 'mask.id'
@@ -359,32 +309,5 @@ module SoftLayer
     def service
       return softlayer_client["Virtual_Guest"].object_with_id(self.id)
     end
-
-    private
-
-    ##
-    # Searches through the upgrade items pricess known to this server for the one that is in a particular category
-    # and whose capacity matches the value given. Returns the item_price or nil
-    #
-    def _item_price_in_category(which_category, capacity)
-      item_prices_in_category = self.upgrade_options.select { |item_price| item_price["categories"].find { |category| category["categoryCode"] == which_category } }
-      item_prices_in_category.find { |ram_item| ram_item["item"]["capacity"].to_i == capacity}
-    end
-
-    ##
-    # Constructs an upgrade order to order the given item price.
-    # The order is built to execute immediately
-    #
-    def _order_upgrade_item!(upgrade_item_price)
-      # put together an order
-      upgrade_order = {
-        'complexType' => 'SoftLayer_Container_Product_Order_Virtual_Guest_Upgrade',
-        'virtualGuests' => [{'id' => self.id }],
-        'properties' => [{'name' => 'MAINTENANCE_WINDOW', 'value' => Time.now.iso8601}],
-        'prices' => [ upgrade_item_price ]
-      }
-
-      self.softlayer_client["Product_Order"].placeOrder(upgrade_order)
-    end
   end #class VirtualServer
 end