Merge pull request softlayer#674 from camporter/remove-hardcoded-category-ids

underscorephil · underscorephil · commit c2d1eef3fdc4 · 2016-01-26T13:59:28.000-06:00
Remove hardcoded category ids for category codes
diff --git a/SoftLayer/CLI/virt/upgrade.py b/SoftLayer/CLI/virt/upgrade.py
@@ -33,9 +33,12 @@ def cli(env, identifier, cpu, private, memory, network):
             "Continue?")):
         raise exceptions.CLIAbort('Aborted')
 
+    if memory:
+        memory = int(memory / 1024)
+
     if not vsi.upgrade(vs_id,
                        cpus=cpu,
-                       memory=memory/1024,
+                       memory=memory,
                        nic_speed=network,
                        public=not private):
         raise exceptions.CLIAbort('VS Upgrade Failed')
diff --git a/SoftLayer/fixtures/SoftLayer_Product_Package.py b/SoftLayer/fixtures/SoftLayer_Product_Package.py
@@ -188,39 +188,49 @@
         'description': 'Public & Private Networks',
         'itemCategory': {'categoryCode': 'Uplink Port Speeds'},
         'prices': [{'id': 1122,
-                    'categories': [{'id': 26, 'name': 'Uplink Port Speeds'}]}],
+                    'categories': [{'id': 26,
+                                    'name': 'Uplink Port Speeds',
+                                    'categoryCode': 'port_speed'}]}],
     },
     {
         'id': 2233,
         'capacity': '1000',
         'description': 'Public & Private Networks',
         'itemCategory': {'categoryCode': 'Uplink Port Speeds'},
         'prices': [{'id': 4477,
-                    'categories': [{'id': 26, 'name': 'Uplink Port Speeds'}]}],
+                    'categories': [{'id': 26,
+                                    'name': 'Uplink Port Speeds',
+                                    'categoryCode': 'port_speed'}]}],
     },
     {
         'id': 1239,
         'capacity': '2',
         'description': 'RAM',
         'itemCategory': {'categoryCode': 'RAM'},
         'prices': [{'id': 1133,
-                    'categories': [{'id': 3, 'name': 'RAM'}]}],
+                    'categories': [{'id': 3,
+                                    'name': 'RAM',
+                                    'categoryCode': 'ram'}]}],
     },
     {
         'id': 1240,
         'capacity': '4',
         'description': 'Private Computing Instance',
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 1007,
-                    'categories': [{'id': 80, 'name': 'Computing Instance'}]}],
+                    'categories': [{'id': 80,
+                                    'name': 'Computing Instance',
+                                    'categoryCode': 'guest_core'}]}],
     },
     {
         'id': 1250,
         'capacity': '4',
         'description': 'Computing Instance',
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 1144,
-                    'categories': [{'id': 80, 'name': 'Computing Instance'}]}],
+                    'categories': [{'id': 80,
+                                    'name': 'Computing Instance',
+                                    'categoryCode': 'guest_core'}]}],
     },
     {
         'id': 4439,
diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py
@@ -697,7 +697,7 @@ def capture(self, instance_id, name, additional_disks=False, notes=None):
 
         :param integer instance_id: the instance ID to edit
         :param string name: name assigned to the image
-        :param string additional_disks: set to true to include all additional
+        :param bool additional_disks: set to true to include all additional
                                         attached storage devices
         :param string notes: notes about this particular image
 
@@ -780,7 +780,13 @@ def upgrade(self, instance_id, cpus=None, memory=None,
 
     def _get_package_items(self):
         """Following Method gets all the item ids related to VS."""
-        mask = "mask[description,capacity,prices[id,categories[name,id]]]"
+        mask = [
+            'description',
+            'capacity',
+            'prices[id,categories[name,id,categoryCode]]'
+        ]
+        mask = "mask[%s]" % ','.join(mask)
+
         package_type = "VIRTUAL_SERVER_INSTANCE"
         package_id = self.ordering_manager.get_package_id_by_type(package_type)
         package_service = self.client['Product_Package']
@@ -796,12 +802,17 @@ def _get_item_id_for_upgrade(self, package_items, option, value,
         :param int value: The value of the parameter to be upgraded
         :param bool public: CPU will be in Private/Public Node.
         """
-        vs_id = {'memory': 3, 'cpus': 80, 'nic_speed': 26}
+        option_category = {
+            'memory': 'ram',
+            'cpus': 'guest_core',
+            'nic_speed': 'port_speed'
+        }
+
         for item in package_items:
             categories = item['prices'][0]['categories']
             for category in categories:
-                if not (category['id'] == vs_id[option] and
-                        item['capacity'] == str(value)):
+                if not (category['categoryCode'] == option_category[option] and
+                        str(item['capacity']) == str(value)):
                     continue
                 if option == 'cpus':
                     if public and ('Private' not in item['description']):
