Merge pull request #1705 from caberos/issue1694

block/file volume-options improvement 3

Author: allmightyspiff

SoftLayer/CLI/block/options.py

@@ -6,60 +6,104 @@
 import SoftLayer
 from SoftLayer.CLI.command import SLCommand
 from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 
 PACKAGE_STORAGE = 759
 
 
 @click.command(cls=SLCommand)
+@click.argument('location', required=False)
+@click.option('--prices', '-p', is_flag=True,
+              help='Use --prices to list the server item prices, and to list the Item Prices by location,'
+                   'add it to the --prices option using location short name, e.g. --prices dal13')
 @environment.pass_env
-def cli(env):
+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)
-    datacenters = order_manager.get_regions(PACKAGE_STORAGE)
+    datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
 
+    tables = []
     network = SoftLayer.NetworkManager(env.client)
-
     pods = network.get_closed_pods()
 
-    iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
-    snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
-    storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
-    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
-
-    storage_table.align['Description'] = 'l'
-    storage_table.align['KeyName'] = 'l'
-    storage_table.sortby = 'Id'
-
-    for datacenter in datacenters:
-        closure = []
-        for pod in pods:
-            if datacenter['location']['location']['name'] in str(pod['name']):
-                closure.append(pod['name'])
-
-        notes = '-'
-        if len(closure) > 0:
-            notes = 'closed soon: %s' % (', '.join(closure))
-        datacenter_table.add_row([datacenter['location']['locationId'],
-                                  datacenter.get('description'),
-                                  datacenter['keyname'], notes])
-
-    for item in items:
-        if item['itemCategory']['categoryCode'] == 'performance_storage_space':
-            storage_table.add_row([item.get('id'), item.get('description'),
-                                   item.get('keyName'), item.get('capacityMinimum') or '-'])
-
-        if item['itemCategory']['categoryCode'] == 'storage_tier_level':
-            iops_table.add_row([item.get('id'), item.get('description'),
-                                item.get('keyName')])
-
-        if item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
-            snapshot_table.add_row([item.get('id'), item.get('description'),
-                                    item.get('keyName')])
-
-    env.fout(datacenter_table)
-    env.fout(iops_table)
-    env.fout(storage_table)
-    env.fout(snapshot_table)
+    if datacenters != []:
+        datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
+
+        for datacenter in datacenters:
+            closure = []
+            for pod in pods:
+                if datacenter['location']['location']['name'] in str(pod['name']):
+                    closure.append(pod['name'])
+
+            notes = '-'
+            if len(closure) > 0:
+                notes = 'closed soon: %s' % (', '.join(closure))
+            datacenter_table.add_row([datacenter['location']['locationId'],
+                                      datacenter.get('description'),
+                                      datacenter['keyname'], notes])
+        tables.append(datacenter_table)
+    else:
+        raise exceptions.CLIAbort('Location does not exit.')
+
+    tables.append(_block_ios_get_table(items, prices))
+    tables.append(_block_storage_table(items, prices))
+    tables.append(_block_snapshot_get_table(items, prices))
+    env.fout(tables)
+
+
+def _block_ios_get_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Prices'], title='IOPS')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'storage_tier_level':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName'), block_item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
+        for block_item in items:
+            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.align = 'l'
+    return table
+
+
+def _block_storage_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum', 'Prices'], title='Storage')
+        for block_item in items:
+            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 '-',
+                               block_item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum'], title='Storage')
+        for block_item in items:
+            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.align = 'l'
+    return table
+
+
+def _block_snapshot_get_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Prices'], 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'), block_item['prices'][0]['recurringFee']])
+    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'
+    table.align = 'l'
+    return table

SoftLayer/CLI/file/options.py

@@ -6,60 +6,105 @@
 import SoftLayer
 from SoftLayer.CLI.command import SLCommand
 from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 
 PACKAGE_STORAGE = 759
 
 
 @click.command(cls=SLCommand)
+@click.argument('location', required=False)
+@click.option('--prices', '-p', is_flag=True,
+              help='Use --prices to list the server item prices, and to list the Item Prices by location,'
+                   'add it to the --prices option using location short name, e.g. --prices dal13')
 @environment.pass_env
-def cli(env):
-    """List all options for ordering a file storage"""
+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)
-    datacenters = order_manager.get_regions(PACKAGE_STORAGE)
+    datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
 
+    tables = []
     network = SoftLayer.NetworkManager(env.client)
 
     pods = network.get_closed_pods()
 
-    iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
-    snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
-    file_storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
-    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
-
-    file_storage_table.align['Description'] = 'l'
-    file_storage_table.align['KeyName'] = 'l'
-    file_storage_table.sortby = 'Id'
-
-    for datacenter in datacenters:
-        closure = []
-        for pod in pods:
-            if datacenter['location']['location']['name'] in str(pod['name']):
-                closure.append(pod['name'])
-
-        notes = '-'
-        if len(closure) > 0:
-            notes = 'closed soon: %s' % (', '.join(closure))
-        datacenter_table.add_row([datacenter['location']['locationId'],
-                                  datacenter.get('description'),
-                                  datacenter['keyname'], notes])
-
-    for item_file in items:
-        if item_file['itemCategory']['categoryCode'] == 'performance_storage_space':
-            file_storage_table.add_row([item_file.get('id'), item_file.get('description'),
-                                        item_file.get('keyName')])
-
-        if item_file['itemCategory']['categoryCode'] == 'storage_tier_level':
-            iops_table.add_row([item_file.get('id'), item_file.get('description'),
-                                item_file.get('keyName')])
-
-        if item_file['itemCategory']['categoryCode'] == 'storage_snapshot_space':
-            snapshot_table.add_row([item_file.get('id'), item_file.get('description'),
-                                    item_file.get('keyName')])
-
-    env.fout(datacenter_table)
-    env.fout(iops_table)
-    env.fout(file_storage_table)
-    env.fout(snapshot_table)
+    if datacenters != []:
+        datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
+
+        for datacenter in datacenters:
+            closure = []
+            for pod in pods:
+                if datacenter['location']['location']['name'] in str(pod['name']):
+                    closure.append(pod['name'])
+
+            notes = '-'
+            if len(closure) > 0:
+                notes = 'closed soon: %s' % (', '.join(closure))
+            datacenter_table.add_row([datacenter['location']['locationId'],
+                                      datacenter.get('description'),
+                                      datacenter['keyname'], notes])
+        tables.append(datacenter_table)
+    else:
+        raise exceptions.CLIAbort('Location does not exit.')
+
+    tables.append(_file_ios_get_table(items, prices))
+    tables.append(_file_storage_table(items, prices))
+    tables.append(_file_snapshot_get_table(items, prices))
+    env.fout(tables)
+
+
+def _file_ios_get_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Prices'], title='IOPS')
+        for item in items:
+            if item['itemCategory']['categoryCode'] == 'storage_tier_level':
+                table.add_row([item.get('id'), item.get('description'),
+                               item.get('keyName'), item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
+        for item in items:
+            if item['itemCategory']['categoryCode'] == 'storage_tier_level':
+                table.add_row([item.get('id'), item.get('description'),
+                               item.get('keyName')])
+    table.sortby = 'Id'
+    table.align = 'l'
+    return table
+
+
+def _file_storage_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum', 'Prices'], title='Storage')
+        for item in items:
+            if item['itemCategory']['categoryCode'] == 'performance_storage_space':
+                table.add_row([item.get('id'), item.get('description'),
+                               item.get('keyName'), item.get('capacityMinimum') or '-',
+                               item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum'], title='Storage')
+        for item in items:
+            if item['itemCategory']['categoryCode'] == 'performance_storage_space':
+                table.add_row([item.get('id'), item.get('description'),
+                               item.get('keyName'), item.get('capacityMinimum') or '-', ])
+    table.sortby = 'Id'
+    table.align = 'l'
+    return table
+
+
+def _file_snapshot_get_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Prices'], title='Snapshot')
+        for item in items:
+            if item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
+                table.add_row([item.get('id'), item.get('description'),
+                               item.get('keyName'), item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
+        for item in items:
+            if item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
+                table.add_row([item.get('id'), item.get('description'),
+                               item.get('keyName')])
+    table.sortby = 'Id'
+    table.align = 'l'
+    return table

SoftLayer/managers/ordering.py

@@ -728,9 +728,12 @@ def get_items(self, package_id, storage_filter=None):
         return self.client.call('SoftLayer_Product_Package', 'getItems', filter=storage_filter,
                                 id=package_id)
 
-    def get_regions(self, package_id):
+    def get_regions(self, package_id, location=None):
         """returns the all regions.
 
         :param int package_id: The package for which to get the items.
         """
-        return self.client.call('SoftLayer_Product_Package', 'getRegions', id=package_id)
+        _filter = ''
+        if location:
+            _filter = {"regions": {"location": {"location": {"name": {"operation": location}}}}}
+        return self.client.call('SoftLayer_Product_Package', 'getRegions', id=package_id, filter=_filter)