Merge pull request #799 from camporter/improve_loadbalancer_detail_output

Change table formatting for load balancer detail

Author: allmightyspiff

SoftLayer/CLI/loadbal/detail.py

@@ -23,64 +23,59 @@ def cli(env, identifier):
     table = formatting.KeyValueTable(['name', 'value'])
     table.align['name'] = 'l'
     table.align['value'] = 'l'
-    table.add_row(['General properties', '----------'])
-    table.add_row([' ID', 'local:%s' % load_balancer['id']])
-    table.add_row([' IP Address', load_balancer['ipAddress']['ipAddress']])
+    table.add_row(['ID', 'local:%s' % load_balancer['id']])
+    table.add_row(['IP Address', load_balancer['ipAddress']['ipAddress']])
     name = load_balancer['loadBalancerHardware'][0]['datacenter']['name']
-    table.add_row([' Datacenter', name])
-    table.add_row([' Connections limit', load_balancer['connectionLimit']])
-    table.add_row([' Dedicated', load_balancer['dedicatedFlag']])
-    table.add_row([' HA', load_balancer['highAvailabilityFlag']])
-    table.add_row([' SSL Enabled', load_balancer['sslEnabledFlag']])
-    table.add_row([' SSL Active', load_balancer['sslActiveFlag']])
+    table.add_row(['Datacenter', name])
+    table.add_row(['Connections limit', load_balancer['connectionLimit']])
+    table.add_row(['Dedicated', load_balancer['dedicatedFlag']])
+    table.add_row(['HA', load_balancer['highAvailabilityFlag']])
+    table.add_row(['SSL Enabled', load_balancer['sslEnabledFlag']])
+    table.add_row(['SSL Active', load_balancer['sslActiveFlag']])
+
     index0 = 1
     for virtual_server in load_balancer['virtualServers']:
-        table.add_row(['Service group %s' % index0,
-                       '**************'])
-        index0 += 1
-        table2 = formatting.Table(['Service group ID',
-                                   'Port',
-                                   'Allocation',
-                                   'Routing type',
-                                   'Routing Method'])
-
         for group in virtual_server['serviceGroups']:
-            table2.add_row([
-                '%s:%s' % (load_balancer['id'], virtual_server['id']),
-                virtual_server['port'],
-                '%s %%' % virtual_server['allocation'],
-                '%s:%s' % (group['routingTypeId'],
-                           group['routingType']['name']),
-                '%s:%s' % (group['routingMethodId'],
-                           group['routingMethod']['name'])
-            ])
+            service_group_table = formatting.KeyValueTable(['name', 'value'])
+
+            table.add_row(['Service Group %s' % index0, service_group_table])
+            index0 += 1
 
-            table.add_row([' Group Properties', table2])
+            service_group_table.add_row(['Guest ID',
+                                         virtual_server['id']])
+            service_group_table.add_row(['Port', virtual_server['port']])
+            service_group_table.add_row(['Allocation',
+                                         '%s %%' %
+                                         virtual_server['allocation']])
+            service_group_table.add_row(['Routing Type',
+                                         '%s:%s' %
+                                         (group['routingTypeId'],
+                                          group['routingType']['name'])])
+            service_group_table.add_row(['Routing Method',
+                                         '%s:%s' %
+                                         (group['routingMethodId'],
+                                          group['routingMethod']['name'])])
 
-            table3 = formatting.Table(['Service_ID',
-                                       'IP Address',
-                                       'Port',
-                                       'Health Check',
-                                       'Weight',
-                                       'Enabled',
-                                       'Status'])
-            service_exist = False
+            index1 = 1
             for service in group['services']:
-                service_exist = True
+                service_table = formatting.KeyValueTable(['name', 'value'])
+
+                service_group_table.add_row(['Service %s' % index1,
+                                             service_table])
+                index1 += 1
+
                 health_check = service['healthChecks'][0]
-                table3.add_row([
-                    '%s:%s' % (load_balancer['id'], service['id']),
-                    service['ipAddress']['ipAddress'],
-                    service['port'],
-                    '%s:%s' % (health_check['healthCheckTypeId'],
-                               health_check['type']['name']),
-                    service['groupReferences'][0]['weight'],
-                    service['enabled'],
-                    service['status']
-                ])
-            if service_exist:
-                table.add_row([' Services', table3])
-            else:
-                table.add_row([' Services', 'None'])
+                service_table.add_row(['Service ID', service['id']])
+                service_table.add_row(['IP Address',
+                                       service['ipAddress']['ipAddress']])
+                service_table.add_row(['Port', service['port']])
+                service_table.add_row(['Health Check',
+                                       '%s:%s' %
+                                       (health_check['healthCheckTypeId'],
+                                        health_check['type']['name'])])
+                service_table.add_row(
+                    ['Weight', service['groupReferences'][0]['weight']])
+                service_table.add_row(['Enabled', service['enabled']])
+                service_table.add_row(['Status', service['status']])
 
     env.fout(table)