Merge pull request #2008 from softlayer/jayasilan-issue2007

Multithreading implementation for slcli bandwidth pools command

Author: allmightyspiff

SoftLayer/CLI/bandwidth/pools.py

@@ -1,5 +1,9 @@
 """Displays information about the bandwidth pools"""
 # :license: MIT, see LICENSE for more details.
+import concurrent.futures as cf
+import logging
+import time
+
 import click
 
 from SoftLayer.CLI.command import SLCommand as SLCommand
@@ -8,6 +12,8 @@
 from SoftLayer.managers.account import AccountManager as AccountManager
 from SoftLayer import utils
 
+LOGGER = logging.getLogger(__name__)
+
 
 @click.command(cls=SLCommand, )
 @environment.pass_env
@@ -21,6 +27,7 @@ def cli(env):
     """
 
     manager = AccountManager(env.client)
+
     items = manager.get_bandwidth_pools()
 
     table = formatting.Table([
@@ -35,31 +42,39 @@ def cli(env):
         "Deletion"
     ], title="Bandwidth Pools")
     table.align = 'l'
-    for item in items:
-        id_bandwidth = item.get('id')
-        name = item.get('name')
-        region = utils.lookup(item, 'locationGroup', 'name')
-        servers = manager.get_bandwidth_pool_counts(identifier=item.get('id'))
-        allocation = f"{item.get('totalBandwidthAllocated', 0)} GB"
 
-        current = utils.lookup(item, 'billingCyclePublicBandwidthUsage', 'amountOut')
-        if current is not None:
-            current = f"{current} GB"
-        else:
-            current = "0 GB"
+    start_m = time.perf_counter()
+
+    with cf.ThreadPoolExecutor(max_workers=5) as executor:
+        for item, servers in zip(items, executor.map(manager.get_bandwidth_pool_counts,
+                                                     [item.get('id') for item in items])):
+
+            id_bandwidth = item.get('id')
+            name = item.get('name')
+            region = utils.lookup(item, 'locationGroup', 'name')
+
+            allocation = f"{item.get('totalBandwidthAllocated', 0)} GB"
+
+            current = utils.lookup(item, 'billingCyclePublicBandwidthUsage', 'amountOut')
+            if current is not None:
+                current = f"{current} GB"
+            else:
+                current = "0 GB"
 
-        projected = f"{item.get('projectedPublicBandwidthUsage', 0)} GB"
+            projected = f"{item.get('projectedPublicBandwidthUsage', 0)} GB"
 
-        cost = utils.lookup(item, 'billingItem', 'nextInvoiceTotalRecurringAmount')
-        if cost is not None:
-            cost = f"${cost}"
-        else:
-            cost = "$0.0"
+            cost = utils.lookup(item, 'billingItem', 'nextInvoiceTotalRecurringAmount')
+            if cost is not None:
+                cost = f"${cost}"
+            else:
+                cost = "$0.0"
 
-        deletion = utils.clean_time(item.get('endDate'))
+            deletion = utils.clean_time(item.get('endDate'))
+            if deletion == '':
+                deletion = formatting.blank()
 
-        if deletion == '':
-            deletion = formatting.blank()
+            table.add_row([id_bandwidth, name, region, servers, allocation, current, projected, cost, deletion])
 
-        table.add_row([id_bandwidth, name, region, servers, allocation, current, projected, cost, deletion])
+    end_m = time.perf_counter()
+    LOGGER.debug('Total API Call time %s', end_m - start_m)
     env.fout(table)

tests/CLI/modules/bandwidth_tests.py

@@ -77,6 +77,28 @@ def test_create_bandwidth_single_region(self):
         self.assertEqual('NewRegion', json_output['Name Pool'])
         self.assertEqual('AMS/LON/MAD/PAR', json_output['Region'])
 
+    def test_bandwidth_pools_no_amount(self):
+        bandwidth_mock = self.set_mock('SoftLayer_Account', 'getBandwidthAllotments')
+        bandwidth_mock.return_value = [{
+            'billingCyclePublicBandwidthUsage': {
+                'amountIn': '6.94517'
+                },
+            'id': 309961,
+            'locationGroup': {
+                'description': 'All Datacenters in Mexico',
+                'id': 262,
+                'locationGroupTypeId': 1,
+                'name': 'MEX',
+                'securityLevelId': None
+                },
+            'billingItem': {'nextInvoiceTotalRecurringAmount': 0.0},
+            'name': 'MexRegion',
+            'projectedPublicBandwidthUsage': 9.88,
+            'totalBandwidthAllocated': 3361
+            }]
+        result = self.run_command(['bandwidth', 'pools'])
+        self.assert_no_fail(result)
+
 
 def _bandwidth_advanced_search():
     result = [