Fixed the vs upgrade with flavor data

Author: Fernando Ojeda

SoftLayer/fixtures/SoftLayer_Product_Package.py

@@ -1367,3 +1367,5 @@
         "packageId": 835
     }
 ]
+
+getAccountRestrictedActivePresets = []

SoftLayer/fixtures/SoftLayer_Virtual_Guest.py

@@ -15,7 +15,8 @@
             {'nextInvoiceTotalRecurringAmount': 1},
         ],
         'package': {
-            "id": 835
+            "id": 835,
+            "keyName": "PUBLIC_CLOUD_SERVER"
         },
         'orderItem': {
             'order': {

SoftLayer/managers/vs.py

@@ -227,7 +227,7 @@ def get_instance(self, instance_id, **kwargs):
                 'hourlyBillingFlag,'
                 'userData,'
                 '''billingItem[id,nextInvoiceTotalRecurringAmount,
-                               package['id'],
+                               package[id,keyName],
                                children[categoryCode,nextInvoiceTotalRecurringAmount],
                                orderItem[id,
                                          order.userRecord[username],
@@ -834,13 +834,11 @@ def upgrade(self, instance_id, cpus=None, memory=None,
 
         if cpus is not None and preset is not None:
             raise exceptions.SoftLayerError("Do not use cpu, private and memory if you are using flavors")
-        else:
-            data['cpus'] = cpus
+        data['cpus'] = cpus
 
         if memory is not None and preset is not None:
             raise exceptions.SoftLayerError("Do not use memory, private or cpu if you are using flavors")
-        else:
-            data['memory'] = memory
+        data['memory'] = memory
 
         maintenance_window = datetime.datetime.now(utils.UTC())
         order = {
@@ -869,49 +867,14 @@ def upgrade(self, instance_id, cpus=None, memory=None,
         order['prices'] = prices
 
         if preset is not None:
-            presetId = self._get_active_presets(preset, instance_id)
-            order['presetId'] = presetId
+            vs_object = self.get_instance(instance_id)['billingItem']['package']
+            order['presetId'] = self.ordering_manager.get_preset_by_key(vs_object['keyName'], preset)['id']
 
         if prices or preset:
             self.client['Product_Order'].placeOrder(order)
             return True
         return False
 
-    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': {
-                'keyName': {
-                    'operation': preset
-                }
-            },
-            'accountRestrictedActivePresets': {
-                'keyName': {
-                    'operation': preset
-                }
-            }
-        }
-
-        vs_object = self.get_instance(instance_id, mask='mask[billingItem[package[id]]]')
-        package = vs_object['billingItem']['package']
-        packageId = package['id']
-
-        mask = 'mask[id]'
-        active_presets = self.package_svc.getActivePresets(id=packageId, mask=mask, filter=_filter)
-
-        if len(active_presets) == 0:
-            raise exceptions.SoftLayerError(
-                "Preset {} does not exist in package {}".format(preset,
-                                                                packageId))
-
-        for presetId in active_presets:
-            id = presetId['id']
-        return id
-
     def _get_package_items(self):
         """Following Method gets all the item ids related to VS.
 

tests/CLI/modules/vs_tests.py

@@ -909,7 +909,7 @@ 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.assertEqual(801, order_container['presetId'])
+        self.assertEqual(799, order_container['presetId'])
         self.assertIn({'id': 100}, order_container['virtualGuests'])
         self.assertEqual(order_container['virtualGuests'], [{'id': 100}])
 

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.assertEqual(801, order_container['presetId'])
+        self.assertEqual(799, order_container['presetId'])
         self.assertIn({'id': 1}, order_container['virtualGuests'])
         self.assertIn({'id': 1122}, order_container['prices'])
         self.assertEqual(order_container['virtualGuests'], [{'id': 1}])