Merge pull request #1549 from ATGE/issues/1541-loadbal-details

Issues/1541 loadbal details

Author: allmightyspiff

SoftLayer/CLI/loadbal/detail.py

@@ -29,12 +29,33 @@ def lbaas_table(this_lb):
     table.align['value'] = 'l'
     table.add_row(['Id', this_lb.get('id')])
     table.add_row(['UUI', this_lb.get('uuid')])
+    table.add_row(['Name', this_lb.get('name')])
     table.add_row(['Address', this_lb.get('address')])
+    table.add_row(['Type', SoftLayer.LoadBalancerManager.TYPE.get(this_lb.get('type'))])
     table.add_row(['Location', utils.lookup(this_lb, 'datacenter', 'longName')])
     table.add_row(['Description', this_lb.get('description')])
-    table.add_row(['Name', this_lb.get('name')])
     table.add_row(['Status', "{} / {}".format(this_lb.get('provisioningStatus'), this_lb.get('operatingStatus'))])
 
+    listener_table, pools = get_listener_table(this_lb)
+    table.add_row(['Protocols', listener_table])
+
+    member_table = get_member_table(this_lb, pools)
+    table.add_row(['Members', member_table])
+
+    hp_table = get_hp_table(this_lb)
+    table.add_row(['Health Checks', hp_table])
+
+    l7pool_table = get_l7pool_table(this_lb)
+    table.add_row(['L7 Pools', l7pool_table])
+
+    ssl_table = get_ssl_table(this_lb)
+    table.add_row(['Ciphers', ssl_table])
+
+    return table
+
+
+def get_hp_table(this_lb):
+    """Generates a table from a list of LBaaS devices"""
     # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_HealthMonitor/
     hp_table = formatting.Table(['UUID', 'Interval', 'Retries', 'Type', 'Timeout', 'Modify', 'Active'])
     for health in this_lb.get('healthMonitors', []):
@@ -47,44 +68,17 @@ def lbaas_table(this_lb):
             utils.clean_time(health.get('modifyDate')),
             health.get('provisioningStatus')
         ])
-    table.add_row(['Checks', hp_table])
+    return hp_table
 
-    # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_L7Pool/
-    l7_table = formatting.Table(['Id', 'UUID', 'Balancer', 'Name', 'Protocol', 'Modify', 'Active'])
-    for layer7 in this_lb.get('l7Pools', []):
-        l7_table.add_row([
-            layer7.get('id'),
-            layer7.get('uuid'),
-            layer7.get('loadBalancingAlgorithm'),
-            layer7.get('name'),
-            layer7.get('protocol'),
-            utils.clean_time(layer7.get('modifyDate')),
-            layer7.get('provisioningStatus')
-        ])
-    table.add_row(['L7 Pools', l7_table])
-
-    pools = {}
-    # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_Listener/
-    listener_table = formatting.Table(['UUID', 'Max Connection', 'Mapping', 'Balancer', 'Modify', 'Active'])
-    for listener in this_lb.get('listeners', []):
-        pool = listener.get('defaultPool')
-        priv_map = "{}:{}".format(pool['protocol'], pool['protocolPort'])
-        pools[pool['uuid']] = priv_map
-        mapping = "{}:{} -> {}".format(listener.get('protocol'), listener.get('protocolPort'), priv_map)
-        listener_table.add_row([
-            listener.get('uuid'),
-            listener.get('connectionLimit', 'None'),
-            mapping,
-            pool.get('loadBalancingAlgorithm', 'None'),
-            utils.clean_time(listener.get('modifyDate')),
-            listener.get('provisioningStatus')
-        ])
-    table.add_row(['Pools', listener_table])
 
+def get_member_table(this_lb, pools):
+    """Generates a members table from a list of LBaaS devices"""
     # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_Member/
     member_col = ['UUID', 'Address', 'Weight', 'Modify', 'Active']
+    counter = 0
     for uuid in pools.values():
-        member_col.append(uuid)
+        member_col.append(f'P{counter}-> {uuid}')
+        counter += 1
     member_table = formatting.Table(member_col)
     for member in this_lb.get('members', []):
         row = [
@@ -97,14 +91,54 @@ def lbaas_table(this_lb):
         for uuid in pools:
             row.append(get_member_hp(this_lb.get('health'), member.get('uuid'), uuid))
         member_table.add_row(row)
-    table.add_row(['Members', member_table])
+    return member_table
+
 
+def get_ssl_table(this_lb):
+    """Generates a ssl table from a list of LBaaS devices"""
     # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_SSLCipher/
     ssl_table = formatting.Table(['Id', 'Name'])
     for ssl in this_lb.get('sslCiphers', []):
         ssl_table.add_row([ssl.get('id'), ssl.get('name')])
-    table.add_row(['Ciphers', ssl_table])
-    return table
+    return ssl_table
+
+
+def get_listener_table(this_lb):
+    """Generates a protocols table from a list of LBaaS devices"""
+    pools = {}
+    # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_Listener/
+    listener_table = formatting.Table(['UUID', 'Max Connection', 'Mapping', 'Balancer', 'Modify', 'Active'])
+    for listener in this_lb.get('listeners', []):
+        pool = listener.get('defaultPool')
+        priv_map = "{}:{}".format(pool['protocol'], pool['protocolPort'])
+        pools[pool['uuid']] = priv_map
+        mapping = "{}:{} -> {}".format(listener.get('protocol'), listener.get('protocolPort'), priv_map)
+        listener_table.add_row([
+            listener.get('uuid'),
+            listener.get('connectionLimit', 'None'),
+            mapping,
+            pool.get('loadBalancingAlgorithm', 'None'),
+            utils.clean_time(listener.get('modifyDate')),
+            listener.get('provisioningStatus')
+        ])
+    return listener_table, pools
+
+
+def get_l7pool_table(this_lb):
+    """Generates a l7Pools table from a list of LBaaS devices"""
+    # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_L7Pool/
+    l7_table = formatting.Table(['Id', 'UUID', 'Balancer', 'Name', 'Protocol', 'Modify', 'Active'])
+    for layer7 in this_lb.get('l7Pools', []):
+        l7_table.add_row([
+            layer7.get('id'),
+            layer7.get('uuid'),
+            layer7.get('loadBalancingAlgorithm'),
+            layer7.get('name'),
+            layer7.get('protocol'),
+            utils.clean_time(layer7.get('modifyDate')),
+            layer7.get('provisioningStatus')
+        ])
+    return l7_table
 
 
 def get_member_hp(checks, member_uuid, pool_uuid):

SoftLayer/fixtures/SoftLayer_Network_LBaaS_LoadBalancer.py

@@ -58,6 +58,17 @@
                 'uuid': 'ab1a1abc-0e83-4690-b5d4-1359625dba8f',
             }
         },
+        {
+            'clientTimeout': 15,
+            'defaultPool': {
+                'healthMonitor': {
+                    'uuid': '222222ab-bbcc-4f32-9b31-1b6d3a1959c0'
+                },
+                'protocol': 'HTTP',
+                'protocolPort': 256,
+                'uuid': 'ab1a1abc-0e83-4690-b5d4-1359625dba8x',
+            }
+        },
         {'connectionLimit': None,
          'createDate': '2019-08-21T17:19:25-04:00',
          'defaultPool': {'createDate': '2019-08-21T17:19:25-04:00',

SoftLayer/managers/load_balancer.py

@@ -18,6 +18,11 @@ class LoadBalancerManager(utils.IdentifierMixin, object):
     :param SoftLayer.API.BaseClient client: the client instance
 
     """
+    TYPE = {
+        1: "Public to Private",
+        0: "Private to Private",
+        2: "Public to Public",
+    }
 
     def __init__(self, client):
         self.client = client

tests/CLI/modules/loadbal_tests.py

@@ -215,6 +215,9 @@ def test_lb_health_update_fails(self, update_lb_health_monitors):
     def test_lb_detail(self):
         result = self.run_command(['lb', 'detail', '1111111'])
         self.assert_no_fail(result)
+        self.assertIn('Id', result.output)
+        self.assertIn('UUI', result.output)
+        self.assertIn('Address', result.output)
 
     def test_lb_detail_by_name(self):
         name = SoftLayer_Network_LBaaS_LoadBalancer.getObject.get('name')