Merge the 2.2.2 changes into the 3.0 branch

Conflicts:
	CHANGELOG.textile
	lib/softlayer/VirtualServer.rb
	lib/softlayer/base.rb

Author: SLsthompson

CHANGELOG.textile

@@ -6,8 +6,12 @@
 * Added a method to reboot servers.
 * The routine to retreive the open tickets on an account has been moved from the Ticket class. The set of open tickets is now a dynamic property of an account object.
 
+*2.2.2*
+* Fixed a bug in BareMetalServerOrder_Package.rb where the order template did not use an array for the "hardware" key.  This lead to an order template that would be accepted by verifyOrder, but rejected by placeOrder.  An internal issue to review verifyOrder has also been generated. (reported by Rohit Singh)
+
 *2.2*
-* Added the ability to set a timout for network requests.  The timeout is given when a client is created by passing the :timeout hash parameter when creating a client. The value of the parameter is an integer number of seconds.
+* Added the ability to set a timout for network requests. The timeout is given when a client is created by passing the :timeout hash parameter when creating a client. The value of the parameter is an integer number of seconds.
+* Fixed a bug in VirtualServer#capture_image
 
 *2.1.1*
 * Virtual server upgrades no longer raise exceptions

lib/softlayer/BareMetalServerOrder_Package.rb

@@ -118,10 +118,10 @@ def hardware_order
       product_order = {
         'packageId' => @package.id,
         'useHourlyPricing' => false,
-        'hardware' => {
+        'hardware' => [{
           'hostname' => @hostname,
           'domain' => @domain
-        }
+          }]
       }
 
       product_order['location'] = @datacenter.id if @datacenter

lib/softlayer/VirtualServer.rb

@@ -87,13 +87,16 @@ def cancel!
     # 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)
+    def capture_image(image_name, include_attached_storage = false, image_notes = '')
+      image_notes = '' if !image_notes
+      image_name = 'Captured Image' if !image_name
+
       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, notes ? notes : "") if disks && !disks.empty?
+      self.service.createArchiveTransaction(image_name, disks, image_notes) if disks && !disks.empty?
 
       image_templates = SoftLayer::ImageTemplate.find_private_templates(:name => image_name)
       image_templates[0] if !image_templates.empty?

spec/BareMetalServerOrder_Package_spec.rb

@@ -55,15 +55,15 @@
   end
 
   it "places its :hostname attribute into the hardware template in the order" do
-    expect(test_order.hardware_order['hardware']['hostname']).to be_nil
+    expect(test_order.hardware_order['hardware'][0]['hostname']).to be_nil
     test_order.hostname = "testhostname"
-    expect(test_order.hardware_order['hardware']['hostname']).to eq "testhostname"
+    expect(test_order.hardware_order['hardware'][0]['hostname']).to eq "testhostname"
   end
 
   it "places its :domain attribute into into the hardware template in the order" do
-    expect(test_order.hardware_order['hardware']['domain']).to be_nil
+    expect(test_order.hardware_order['hardware'][0]['domain']).to be_nil
     test_order.domain = "softlayer.com"
-    expect(test_order.hardware_order['hardware']['domain']).to eq "softlayer.com"
+    expect(test_order.hardware_order['hardware'][0]['domain']).to eq "softlayer.com"
   end
 
   it "places config options as prices in the order" do