#1575 fixed some style and output issues

Author: allmightyspiff

SoftLayer/CLI/account/bandwidth_pools.py

@@ -7,20 +7,18 @@
 from SoftLayer.managers.account import AccountManager as AccountManager
 from SoftLayer import utils
 
-from pprint import pprint as pp
 
 @click.command()
 @environment.pass_env
 def cli(env):
-    """Lists billing items with some other useful information.
+    """Displays bandwidth pool information
 
-    Similiar to https://cloud.ibm.com/billing/billing-items
+    Similiar to https://cloud.ibm.com/classic/network/bandwidth/vdr
     """
 
     manager = AccountManager(env.client)
     items = manager.get_bandwidth_pools()
-    # table = item_table(items)
-    pp(items)
+
     table = formatting.Table([
         "Pool Name",
         "Region",
@@ -35,9 +33,9 @@ def cli(env):
         name = item.get('name')
         region = utils.lookup(item, 'locationGroup', 'name')
         servers = manager.get_bandwidth_pool_counts(identifier=item.get('id'))
-        allocation = item.get('totalBandwidthAllocated', 0)
-        current = item.get('billingCyclePublicUsageTotal', 0)
-        projected = item.get('projectedPublicBandwidthUsage', 0)
+        allocation = "{} GB".format(item.get('totalBandwidthAllocated', 0))
+        current = "{} GB".format(utils.lookup(item, 'billingCyclePublicBandwidthUsage', 'amountOut'))
+        projected = "{} GB".format(item.get('projectedPublicBandwidthUsage', 0))
 
-        table.add_row([name, region, servers, allocation, current, projected,])
+        table.add_row([name, region, servers, allocation, current, projected])
     env.fout(table)

SoftLayer/CLI/report/bandwidth.py

@@ -9,7 +9,6 @@
 from SoftLayer.CLI import formatting
 from SoftLayer import utils
 
-from pprint import pprint as pp 
 
 # pylint: disable=unused-argument
 def _validate_datetime(ctx, param, value):

SoftLayer/managers/account.py

@@ -331,18 +331,22 @@ def get_bandwidth_pools(self, mask=None):
         """Gets all the bandwidth pools on an account"""
 
         if mask is None:
-            mask = """mask[totalBandwidthAllocated,locationGroup, id, name, billingCyclePublicUsageTotal,
-                      projectedPublicBandwidthUsage]
+            mask = """mask[totalBandwidthAllocated,locationGroup, id, name, projectedPublicBandwidthUsage,
+                      billingCyclePublicBandwidthUsage[amountOut,amountIn]]
                    """
 
         return self.client.call('SoftLayer_Account', 'getBandwidthAllotments', mask=mask, iter=True)
 
     def get_bandwidth_pool_counts(self, identifier):
-        """Gets a count of all servers in a bandwidth pool"""
+        """Gets a count of all servers in a bandwidth pool
+
+        Getting the server counts individually is significantly faster than pulling them in
+        with the get_bandwidth_pools api call.
+        """
         mask = "mask[id, bareMetalInstanceCount, hardwareCount, virtualGuestCount]"
         counts = self.client.call('SoftLayer_Network_Bandwidth_Version1_Allotment', 'getObject',
                                   id=identifier, mask=mask)
         total = counts.get('bareMetalInstanceCount', 0) + \
-                counts.get('hardwareCount', 0) + \
-                counts.get('virtualGuestCount', 0)
-        return total
+            counts.get('hardwareCount', 0) + \
+            counts.get('virtualGuestCount', 0)
+        return total