Discovered that packages now have a type I can use for filtering out unnecessary packages. Removed hardcoded package IDs.

Nathan Beittenmiller · Nathan Beittenmiller · commit 193afe24c9de · 2014-04-07T10:45:11.000-05:00
diff --git a/SoftLayer/CLI/modules/server.py b/SoftLayer/CLI/modules/server.py
@@ -457,8 +457,11 @@ def execute(self, args):
         if args['--cpu'] or show_all:
             results = self.get_create_options(ds_options, 'cpu')
 
-            cpu_table = Table(['id', 'description'])
-            for result in sorted(results):
+            cpu_table = Table(['ID', 'Description'])
+            cpu_table.align['ID'] = 'r'
+            cpu_table.align['Description'] = 'l'
+
+            for result in sorted(results, key=lambda x: x[1]):
                 cpu_table.add_row([result[1], result[0]])
             table.add_row(['cpu', cpu_table])
 
@@ -520,7 +523,7 @@ def get_create_options(self, ds_options, section, pretty=True):
             datacenters = [loc['keyname']
                            for loc in ds_options['locations']]
             return [('datacenter', datacenters)]
-        elif 'cpu' == section:
+        elif 'cpu' == section and 'server' in ds_options['categories']:
             results = []
 
             for item in ds_options['categories']['server']['items']:
@@ -530,7 +533,7 @@ def get_create_options(self, ds_options, section, pretty=True):
                 ))
 
             return results
-        elif 'memory' == section:
+        elif 'memory' == section and 'ram' in ds_options['categories']:
             ram = []
             for option in ds_options['categories']['ram']['items']:
                 ram.append((int(option['capacity']), option['price_id']))
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -184,21 +184,25 @@ def get_available_dedicated_server_packages(self):
                   the form (id, name, description)
         """
 
-        # Note - This currently returns a hard coded list until the API is
-        # updated to allow filtering on packages to just those for ordering
-        # servers.
-        package_ids = [13, 15, 23, 25, 26, 27, 29, 32, 41, 42, 43, 44, 49, 51,
-                       52, 53, 54, 55, 56, 57, 126, 140, 141, 142, 143, 144,
-                       145, 146, 147, 148, 158]
-
         package_obj = self.client['Product_Package']
         packages = []
 
-        for package_id in package_ids:
-            package = package_obj.getObject(id=package_id,
-                                            mask='mask[id, name, description]')
+        # Pull back only server packages
+        mask = 'id,name,description,type'
+        _filter = {
+            'type': {
+                'keyName': {
+                    'operation': 'in',
+                    'options': [{'name': 'data', 'value': ['BARE_METAL_CPU']}],
+                },
+            },
+        }
 
-            if package.get('name'):
+        for package in package_obj.getAllObjects(mask=mask, filter=_filter):
+            # Filter out packages without a name or that are designated as
+            # 'OUTlET.' The outlet packages are missing some necessary data
+            # and their orders will fail.
+            if package.get('name') and 'OUTLET' not in package['description']:
                 packages.append((package['id'], package['name'],
                                  package['description']))
 
