fix tox Christopher commet code review

Author: caberos

SoftLayer/managers/vs.py

@@ -883,6 +883,11 @@ def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=Tr
                                                                      public)
                     disk_number = disk_number + 1
 
+                if price_id is None:
+                    raise exceptions.SoftLayerAPIError(500,
+                                                       'Unable to find %s option with value %s' % (
+                                                           ('disk', disk_guest.get('capacity'))))
+
                 category = {'categories': [{
                     'categoryCode': 'guest_disk' + str(disk_number),
                     'complexType': "SoftLayer_Product_Item_Category"}],

tests/CLI/modules/vs/vs_tests.py

@@ -583,6 +583,14 @@ def test_upgrade_disk(self, confirm_mock):
         self.assertIn({'id': 100}, order_container['virtualGuests'])
         self.assertEqual(order_container['virtualGuests'], [{'id': 100}])
 
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_upgrade_disk_error(self, confirm_mock):
+        confirm_mock.return_value = True
+        result = self.run_command(['vs', 'upgrade', '100', '--flavor=M1_64X512X100',
+                                   '--resize-disk=1000', '1', '--resize-disk=10', '2'])
+        self.assertEqual(result.exit_code, 1)
+        self.assertIsInstance(result.exception, SoftLayerAPIError)
+
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_upgrade_with_flavor(self, confirm_mock):
         confirm_mock.return_value = True