Adding -s flag for short display

client.py

@@ -40,37 +40,55 @@ def print_data(term_cols, key, value, suffix = None):
 for instance in list(cfg['instances']):
     test = call_api(cfg['instances'][instance], 'devices')
     if test is None:
-        print("Instance %s is not working, disabling" % instance)
+        if cfg['debug']: print("Instance %s is not working, disabling" % instance)
         cfg['instances'].pop(instance)
     else:
-        print("Instance %s is working" % instance)
+        if cfg['debug']: print("Instance %s is working" % instance)
 
 def search_ports(args):
     for instance, params in cfg['instances'].items():
         data = call_api(params, 'ports/?ifAlias=%s' % args.string)
+        data_devices = call_api(params, 'devices/')
+        devices = data_devices['devices']
 
         if data['count'] < 1:
             print("No port found for description %s on instance %s" %
                 (args.string, instance))
             return
 
+        if args.short:
+            term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
+            value_cols = term_cols - 51
+
+            print("(0l" + "q" * 27 + "w" + "q" * 18 + "w" + "q" * (term_cols - 49) + "k(B")
+            print("(0x(B %-25.25s (0x(B %-16.16s (0x(B %-*.*s (0x(B" %
+                ("Hostname", "Interface", value_cols, value_cols, "Description"))
+            print("(0t" + "q" * 27 + "n" + "q" * 18 + "n" + "q" * (term_cols - 49) + "u(B")
+
         for port in data['ports'].values():
-            device = call_api(params, 'devices/%s' % port['device_id'])
+            if port['disabled'] == "1": continue
+            if port['deleted'] == "1": continue
+            device = devices[port['device_id']]
+            if device['disabled'] == "1": continue
+
+            if args.short:
+                short_hostname = device['hostname'].split(".",1)[0]
+                print("(0x(B %-25.25s (0x(B %-16.16s (0x(B %-*.*s (0x(B" %
+                    (short_hostname, port['port_label_short'], value_cols,
+                     value_cols, port['port_descr_descr'] or port['ifAlias']))
+
+            else:
                 address = call_api(params, 'address/?device_id=%s&interface=%s' % (port['device_id'], port['port_label_short']))
                 address6 = call_api(params, 'address/?af=ipv6&device_id=%s&interface=%s' % (port['device_id'], port['port_label_short']))
 
                 term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
 
-            if device['device']['disabled'] == "1": continue
-            if port['disabled'] == "1": continue
-            if port['deleted'] == "1": continue
-
                 print("(0l" + "q" * 20 + "w" + "q" * (term_cols - 23) + "k(B")
 
-            print_data(term_cols, "Device", device['device']['hostname'])
+                print_data(term_cols, "Device", device['hostname'])
                 print_data(term_cols, "", "%s/device/device=%s" %
                     (params['base_url'], port['device_id']))
-            print_data(term_cols, "Hardware", device['device']['hardware'])
+                print_data(term_cols, "Hardware", device['hardware'])
                 print_data(term_cols, "Port", port['port_label_short'])
                 print_data(term_cols, "", "%s/device/device=%s/tab=port/port=%s/" %
                     (params['base_url'], port['device_id'], port['port_id']))
@@ -93,6 +111,9 @@ def search_ports(args):
 
                 print("(0m" + "q" * 20 + "v" + "q" * (term_cols - 23) + "j(B")
 
+        if args.short:
+            print("(0m" + "q" * 27 + "v" + "q" * 18 + "v" + "q" * (term_cols - 49) + "j(B")
+
 def search_devices(args):
     if args.field == "location":
         args.field = "location_text"
@@ -105,9 +126,25 @@ def search_devices(args):
                 (args.string, instance))
             return
 
+        if args.short:
+            term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
+            value_cols = term_cols - 61
+
+            print("(0l" + "q" * 27 + "w" + "q" * 28 + "w" + "q" * (term_cols - 59) + "k(B")
+            print("(0x(B %-25.25s (0x(B %-26.26s (0x(B %-*.*s (0x(B" %
+                ("Hostname", "Hardware", value_cols, value_cols, "Serial"))
+            print("(0t" + "q" * 27 + "n" + "q" * 28 + "n" + "q" * (term_cols - 59) + "u(B")
+
         for device in data['devices'].values():
             if device['disabled'] == "1": continue
 
+            if args.short:
+                short_hostname = device['hostname'].split(".",1)[0]
+                print("(0x(B %-25.25s (0x(B %-26.26s (0x(B %-*.*s (0x(B" %
+                (short_hostname,
+                 " ".join([device['vendor'] or "", device['hardware'] or ""]),
+                 value_cols, value_cols, device['serial']))
+            else:
                 term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
                 print("(0l" + "q" * 20 + "w" + "q" * (term_cols - 23) + "k(B")
                 print_data(term_cols, "Device", device['hostname'])
@@ -124,18 +161,22 @@ def search_devices(args):
                 print_data(term_cols, "Location", device['location'])
                 print("(0m" + "q" * 20 + "v" + "q" * (term_cols - 23) + "j(B")
 
+        if args.short:
+            print("(0m" + "q" * 27 + "v" + "q" * 28 + "v" + "q" * (term_cols - 59) + "j(B")
+
+
 # Argument parsing
 parser = argparse.ArgumentParser()
 subparsers = parser.add_subparsers(help='Action to perform',dest='action')
 
 parser_search_port_by_descr = subparsers.add_parser('search_ports', help="Search ports by description")
 parser_search_port_by_descr.add_argument('string', type=str, help="String to search")
+parser_search_port_by_descr.add_argument('-s', '--short', action='store_true')
 
 parser_search_device = subparsers.add_parser('search_devices', help="Search devices")
-
+parser_search_device.add_argument('field', choices=['hostname', 'location', 'hardware', 'serial'], help="Field to use for search")
-parser_search_device.add_argument('field', choices=['sysname', 'location', 'hardware', 'serial'], help="Field to use for search")
-
 parser_search_device.add_argument('string', type=str, help="String to search")
+parser_search_device.add_argument('-s', '--short', action='store_true')
 
 args = parser.parse_args()
 globals()[args.action](args)

config.yml.dist

@@ -1,3 +1,4 @@
+debug:        false
 instances:
   luxnetwork:
     base_url: 'https://noc1.luxnetwork.eu'