fixed vs upgrade using flavors

Author: Fernando Ojeda

SoftLayer/fixtures/SoftLayer_Virtual_Guest.py

@@ -14,6 +14,9 @@
             {'nextInvoiceTotalRecurringAmount': 1},
             {'nextInvoiceTotalRecurringAmount': 1},
         ],
+        'package': {
+            "id": 835
+        },
         'orderItem': {
             'order': {
                 'userRecord': {

SoftLayer/managers/vs.py

@@ -226,6 +226,7 @@ def get_instance(self, instance_id, **kwargs):
                 'hourlyBillingFlag,'
                 'userData,'
                 '''billingItem[id,nextInvoiceTotalRecurringAmount,
+                               package['id'],
                                children[categoryCode,nextInvoiceTotalRecurringAmount],
                                orderItem[id,
                                          order.userRecord[username],
@@ -867,19 +868,17 @@ def upgrade(self, instance_id, cpus=None, memory=None,
         order['prices'] = prices
 
         if preset is not None:
-            presetId = self._get_active_presets(preset)
+            presetId = self._get_active_presets(preset, instance_id)
             order['presetId'] = presetId
 
         if prices or preset:
             self.client['Product_Order'].placeOrder(order)
             return True
         return False
 
-    def _get_active_presets(self, preset):
+    def _get_active_presets(self, preset, instance_id):
         """Following Method gets the active presets.
         """
-        packageId = 835
-
         _filter = {
             'activePresets': {
                 'keyName': {
@@ -893,6 +892,10 @@ def _get_active_presets(self, 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)