Fixed a bug in virtual servers that was preventing upgrades from working properly.

Added unit tests to preemptively check virtual server upgrade functionality
Allow the use of symbols to locate services

Author: SLsthompson

lib/softlayer/Client.rb

@@ -116,20 +116,18 @@ def authentication_headers
     def service_named(service_name, service_options = {})
       raise ArgumentError,"Please provide a service name" if service_name.nil? || service_name.empty?
 
-      # strip whitespace from service_name and
-      # ensure that it start with "SoftLayer_".
-      #
-      # if it does not, then add it
-      service_name.strip!
-      if not service_name =~ /\ASoftLayer_/
-        service_name = "SoftLayer_#{service_name}"
+      # Strip whitespace from service_name and ensure that it starts with "SoftLayer_".
+      # If it does not, then add the prefix.
+      full_name = service_name.to_s.strip
+      if not full_name =~ /\ASoftLayer_/
+        full_name = "SoftLayer_#{service_name}"
       end
 
       # if we've already created this service, just return it
       # otherwise create a new service
-      service_key = service_name.to_sym
+      service_key = full_name.to_sym
       if !@services.has_key?(service_key)
-        @services[service_key] = SoftLayer::Service.new(service_name, {:client => self}.merge(service_options))
+        @services[service_key] = SoftLayer::Service.new(full_name, {:client => self}.merge(service_options))
       end
 
       @services[service_key]

lib/softlayer/VirtualServer.rb

@@ -75,7 +75,7 @@ class VirtualServer < Server
     #
     sl_dynamic_attr :upgrade_options do |resource|
       resource.should_update? do
-        @upgrade_items == nil
+        @upgrade_options == nil
       end
 
       resource.to_update do
@@ -365,7 +365,7 @@ def service
     # 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_items.select { |item_price| item_price["categories"].find { |category| category["categoryCode"] == which_category } }
+      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
 

spec/Client_spec.rb

@@ -164,5 +164,20 @@
 
       expect(first_account_service).to be(second_account_service)
     end
+    
+    it "recognizes a symbol as an acceptable service name" do
+      account_service = test_client[:Account]
+      expect(account_service).to_not be_nil
+      
+      trying_again = test_client['Account']
+      expect(trying_again).to be(account_service)
+      
+      yet_again = test_client['SoftLayer_Account']
+      expect(yet_again).to be(account_service)
+      
+      once_more = test_client[:SoftLayer_Account]
+      expect(once_more).to be(account_service)
+    end
+    
   end
 end

spec/VirtualServer_spec.rb

@@ -68,4 +68,60 @@
   it_behaves_like "server with mutable hostname" do
 		let (:server) { sample_server }
   end
+  
+  describe "component upgrades" do
+    let(:mock_client) do
+  		mock_client = SoftLayer::Client.new(:username => "fakeuser", :api_key => "DEADBEEFBADF00D")
+      virtual_guest_service = mock_client[:Virtual_Guest]
+    
+      allow(virtual_guest_service).to receive(:call_softlayer_api_with_params) do |api_method, parameters, api_arguments|
+        api_return = nil
+
+        case api_method
+        when :getUpgradeItemPrices
+          api_return = fixture_from_json('virtual_server_upgrade_options')
+        else
+          fail "Unexpected call to the SoftLayer_Virtual_Guest service"
+        end
+        
+        api_return
+      end
+
+      mock_client
+    end
+
+    it "retrieves the item upgrades for a server from the API once" do
+      fake_virtual_server = SoftLayer::VirtualServer.new(mock_client, {"id" => 12345})
+      expect(fake_virtual_server.upgrade_options).to eq fixture_from_json('virtual_server_upgrade_options')
+
+      # once we've retrieve the options once, we shouldn't be calling back into the service to get them again
+      expect(mock_client[:Virtual_Guest]).to_not receive(:call_softlayer_api_with_params)
+      fake_virtual_server.upgrade_options
+    end
+
+    describe "individual component upgrades" do
+      before(:each) do
+        expect(mock_client[:Product_Order]).to receive(:call_softlayer_api_with_params) do |api_method, parameters, api_arguments|
+          expect(api_method).to be(:placeOrder)
+          expect(parameters).to be_nil
+          expect(api_method).to_not be_empty
+        end
+      end
+      
+      it "upgrades cores" do
+        fake_virtual_server = SoftLayer::VirtualServer.new(mock_client, {"id" => 12345})
+        fake_virtual_server.upgrade_cores!(8)
+      end
+      
+      it "upgrades ram" do
+        fake_virtual_server = SoftLayer::VirtualServer.new(mock_client, {"id" => 12345})
+        fake_virtual_server.upgrade_RAM!(4)
+      end
+      
+      it "upgrades max port speed" do
+        fake_virtual_server = SoftLayer::VirtualServer.new(mock_client, {"id" => 12345})
+        fake_virtual_server.upgrade_max_port_speed!(100)
+      end
+    end # individual component upgrades
+  end  
 end