Merge pull request #1865 from allmightyspiff/issues1864

fixed an issue showing block/file snapshot prices

Author: allmightyspiff

SoftLayer/API.py

@@ -177,7 +177,7 @@ def __init__(self, auth=None, transport=None, config_file=None):
                     endpoint_url=url,
                     proxy=self.settings['softlayer'].get('proxy'),
                     # prevents an exception incase timeout is a float number.
-                    timeout=int(self.settings['softlayer'].getfloat('timeout')),
+                    timeout=int(self.settings['softlayer'].getfloat('timeout', 0)),
                     user_agent=consts.USER_AGENT,
                     verify=self.settings['softlayer'].getboolean('verify'),
                 )
@@ -186,7 +186,7 @@ def __init__(self, auth=None, transport=None, config_file=None):
                 transport = transports.XmlRpcTransport(
                     endpoint_url=url,
                     proxy=self.settings['softlayer'].get('proxy'),
-                    timeout=int(self.settings['softlayer'].getfloat('timeout')),
+                    timeout=int(self.settings['softlayer'].getfloat('timeout', 0)),
                     user_agent=consts.USER_AGENT,
                     verify=self.settings['softlayer'].getboolean('verify'),
                 )

SoftLayer/CLI/block/options.py

@@ -22,7 +22,7 @@ def cli(env, prices, location=None):
     """List all options for ordering a block storage"""
 
     order_manager = SoftLayer.OrderingManager(env.client)
-    items = order_manager.get_items(PACKAGE_STORAGE)
+    items = order_manager.get_items(PACKAGE_STORAGE, mask="mask[categories]")
     datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
 
     tables = []
@@ -67,7 +67,7 @@ def _block_ios_get_table(items, prices):
             if block_item['itemCategory']['categoryCode'] == 'storage_tier_level':
                 table.add_row([block_item.get('id'), block_item.get('description'),
                                block_item.get('keyName')])
-    table.sortby = 'Id'
+    table.sortby = 'KeyName'
     table.align = 'l'
     return table
 
@@ -86,7 +86,7 @@ def _block_storage_table(items, prices):
             if block_item['itemCategory']['categoryCode'] == 'performance_storage_space':
                 table.add_row([block_item.get('id'), block_item.get('description'),
                                block_item.get('keyName'), block_item.get('capacityMinimum') or '-', ])
-    table.sortby = 'Id'
+    table.sortby = 'KeyName'
     table.align = 'l'
     return table
 
@@ -101,9 +101,16 @@ def _block_snapshot_get_table(items, prices):
     else:
         table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
         for block_item in items:
-            if block_item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
-                table.add_row([block_item.get('id'), block_item.get('description'),
-                               block_item.get('keyName')])
-    table.sortby = 'Id'
+            if is_snapshot_category(block_item.get('categories', [])):
+                table.add_row([block_item.get('id'), block_item.get('description'), block_item.get('keyName')])
+    table.sortby = 'KeyName'
     table.align = 'l'
     return table
+
+
+def is_snapshot_category(categories):
+    """Checks if storage_snapshot_space is one of the categories"""
+    for item in categories:
+        if item.get('categoryCode') == "storage_snapshot_space":
+            return True
+    return False

SoftLayer/managers/ordering.py

@@ -717,7 +717,7 @@ def resolve_location_name(self, location_key):
                 return location_name
         raise exceptions.SoftLayerError("Location {} does not exist".format(location_key))
 
-    def get_items(self, package_id, storage_filter=None):
+    def get_items(self, package_id, storage_filter=None, mask=None):
         """"Returns the items .
 
 
@@ -726,7 +726,7 @@ def get_items(self, package_id, storage_filter=None):
         """
 
         return self.client.call('SoftLayer_Product_Package', 'getItems', filter=storage_filter,
-                                id=package_id)
+                                id=package_id, mask=mask)
 
     def get_regions(self, package_id, location=None):
         """returns the all regions.

tests/CLI/modules/config_tests.py

@@ -31,12 +31,21 @@ def set_up(self):
     def test_show(self):
         result = self.run_command(['config', 'show'])
         self.assert_no_fail(result)
-        self.assertEqual(json.loads(result.output),
-                         {'Username': 'username',
-                          'API Key': 'api-key',
-                          'Endpoint URL': 'http://endpoint-url',
-                          'Timeout': 'not set',
-                          'Theme': 'dark'})
+        default_config = {
+            'Username': 'username',
+            'API Key': 'api-key',
+            'Endpoint URL': 'http://endpoint-url',
+            'Timeout': 'not set',
+            'Theme': 'dark'
+        }
+        result_config = json.loads(result.output)
+
+        self.assertEqual(result_config.get('Username'), default_config.get('Username'))
+        self.assertEqual(result_config.get('API Key'), default_config.get('API Key'))
+        self.assertEqual(result_config.get('Endpoint URL'), default_config.get('Endpoint URL'))
+        self.assertEqual(result_config.get('Timeout'), default_config.get('Timeout'))
+        # Could be either theme since were not setting it in this test
+        self.assertIn(result_config.get('Theme'), ['dark', 'light'])
 
 
 class TestHelpSetup(testing.TestCase):