Merge pull request #844 from sergiocarlosmorales/fix-vsi-private-upgrades

Fix dedicated/private VSI price retrieval for upgrades

Author: allmightyspiff

SoftLayer/fixtures/SoftLayer_Product_Package.py

@@ -348,7 +348,8 @@
     {
         'id': 1240,
         'capacity': '4',
-        'description': 'Private Computing Instance',
+        'units': 'PRIVATE_CORE',
+        'description': 'Computing Instance (Dedicated)',
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 1007,
                     'categories': [{'id': 80,
@@ -358,6 +359,7 @@
     {
         'id': 1250,
         'capacity': '4',
+        'units': 'CORE',
         'description': 'Computing Instance',
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 1144,
@@ -369,6 +371,7 @@
     {
         'id': 112233,
         'capacity': '55',
+        'units': 'CORE',
         'description': 'Computing Instance',
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 332211,

SoftLayer/managers/vs.py

@@ -819,6 +819,7 @@ def _get_package_items(self):
         mask = [
             'description',
             'capacity',
+            'units',
             'prices[id,locationGroupId,categories[name,id,categoryCode]]'
         ]
         mask = "mask[%s]" % ','.join(mask)
@@ -848,7 +849,7 @@ def _get_price_id_for_upgrade(self, package_items, option, value,
         }
         category_code = option_category[option]
         for item in package_items:
-            is_private = str(item['description']).startswith('Private')
+            is_private = (item.get('units') == 'PRIVATE_CORE')
             for price in item['prices']:
                 if 'locationGroupId' in price and price['locationGroupId']:
                     # Skip location based prices