fixed vs upgrade using flavors

Author: Fernando Ojeda

SoftLayer/managers/vs.py

@@ -210,6 +210,7 @@ def get_instance(self, instance_id, **kwargs):
                 'maxMemory,'
                 'datacenter,'
                 'activeTransaction[id, transactionStatus[friendlyName,name]],'
+                'lastTransaction[transactionStatus],'
                 'lastOperatingSystemReload.id,'
                 'blockDevices,'
                 'blockDeviceTemplateGroup[id, name, globalIdentifier],'
@@ -878,6 +879,9 @@ def upgrade(self, instance_id, cpus=None, memory=None,
 
     def _get_active_presets(self, preset, instance_id):
         """Following Method gets the active presets.
+
+        :param string preset: preset data to be upgrade de vs.
+        :param int instance_id: To get the instance information.
         """
         _filter = {
             'activePresets': {

tests/CLI/modules/vs_tests.py

@@ -909,15 +909,14 @@ def test_upgrade_with_flavor(self, confirm_mock):
         self.assert_called_with('SoftLayer_Product_Order', 'placeOrder')
         call = self.calls('SoftLayer_Product_Order', 'placeOrder')[0]
         order_container = call.args[0]
-        self.assertEquals(801, order_container['presetId'])
+        self.assertEqual(801, order_container['presetId'])
         self.assertIn({'id': 100}, order_container['virtualGuests'])
         self.assertEqual(order_container['virtualGuests'], [{'id': 100}])
 
     def test_upgrade_with_cpu_memory_and_flavor(self):
         result = self.run_command(['vs', 'upgrade', '100', '--cpu=4',
                                    '--memory=1024', '--flavor=M1_64X512X100'])
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
+        self.assertEqual("Do not use cpu, private and memory if you are using flavors", str(result.exception))
 
     def test_edit(self):
         result = self.run_command(['vs', 'edit',

tests/managers/vs_tests.py

@@ -890,7 +890,7 @@ def test_upgrade_with_flavor(self):
         self.assert_called_with('SoftLayer_Product_Order', 'placeOrder')
         call = self.calls('SoftLayer_Product_Order', 'placeOrder')[0]
         order_container = call.args[0]
-        self.assertEquals(801, order_container['presetId'])
+        self.assertEqual(801, order_container['presetId'])
         self.assertIn({'id': 1}, order_container['virtualGuests'])
         self.assertIn({'id': 1122}, order_container['prices'])
         self.assertEqual(order_container['virtualGuests'], [{'id': 1}])