From 2391dfd446df7b53404f6d87378073ae6301b875 Mon Sep 17 00:00:00 2001
From: Benjamin Collet <ben@clt.tf>
Date: Wed, 16 Jan 2019 16:48:18 +0100
Subject: [PATCH] Refactoring in Python3, interface refresh

---
 client.py | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/client.py b/client.py
index 4cba396..e39abe4 100755
--- a/client.py
+++ b/client.py
@@ -1,19 +1,23 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import requests
 import yaml
 import argparse
 import os
+import shutil
 
 config = os.path.join(os.path.dirname(os.path.realpath(__file__)),"config.yml")
 
 with open(config, "r") as ymlfile:
     cfg = yaml.load(ymlfile)
 
+term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
+
 def call_api(params, path):
     url = '/'.join((params['base_url'],params['api_path'],path))
     try:
-        response = requests.get(url, auth=(params['username'], params['password']))
+        response = requests.get(url, auth=(params['username'],
+                                params['password']))
     except:
         return
 
@@ -24,51 +28,60 @@ def call_api(params, path):
 
 def print_data(key, value, suffix = None):
     if suffix is not None:
-        print "%-20s %s %s" % (key, value, suffix)
+        print("(0x(B %-18s (0x(B %s %-*s (0x(B" %
+            (key, value, term_cols - 26 - len(value) , suffix))
     else:
-        print "%-20s %s" % (key, value)
+        print("(0x(B %-18s (0x(B %-*s (0x(B" %
+            (key, term_cols - 25, value))
 
 # Test instances
-for instance in cfg['instances'].keys():
+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
+        print("Instance %s is not working, disabling" % instance)
         cfg['instances'].pop(instance)
     else:
-        print "Instance %s is working" % instance
+        print("Instance %s is working" % instance)
 
 def search_ports(args):
-    for instance, params in cfg['instances'].iteritems():
+    for instance, params in cfg['instances'].items():
         data = call_api(params, 'ports/?ifAlias=%s' % args.string)
 
         if data['count'] < 1:
-            print "No port found for description %s on instance %s" \
-                % (args.string, instance)
+            print("No port found for description %s on instance %s" %
+                (args.string, instance))
             return
 
-        for port in data['ports'].itervalues():
+        for port in data['ports'].values():
             device = call_api(params, 'devices/%s' % port['device_id'])
 
             if device['device']['disabled'] == "1": continue
             if port['disabled'] == "1": continue
             if port['deleted'] == "1": continue
 
-            print "=" * 80
+            print("(0l" + "q" * 20 + "w" + "q" * (term_cols - 23) + "k(B")
+
             print_data("Device", device['device']['hostname'])
-            print_data("", "%s/device/device=%s" % (params['base_url'], port['device_id']))
+            print_data("", "%s/device/device=%s" %
+                (params['base_url'], port['device_id']))
+            print_data("Hardware", device['device']['hardware'])
             print_data("Port", port['port_label_short'])
             print_data("", "%s/device/device=%s/tab=port/port=%s/" %
                 (params['base_url'], port['device_id'], port['port_id']))
             print_data("Description", port['ifAlias'])
-            print_data("Port status", "%s (Admin) / %s (Oper)" % (port['ifAdminStatus'], port['ifOperStatus']))
-            print_data("Last flap", port['ifLastChange'])
+            print_data("Port status", "%s (Admin) / %s (Oper)" %
+                (port['ifAdminStatus'], port['ifOperStatus']))
+            print_data("Last change", port['ifLastChange'])
             print_data("Speed", port['ifHighSpeed'], "Mbps")
             print_data("Duplex", port['ifDuplex'])
+            print_data("MTU", port['ifMtu'])
             print_data("Input rate", port['ifInOctets_rate'], "octets")
             print_data("Output rate", port['ifOutOctets_rate'], "octets")
             print_data("Input errors rate", port['ifInErrors_rate'])
             print_data("Output errors rate", port['ifOutErrors_rate'])
 
+            print("(0m" + "q" * 20 + "v" + "q" * (term_cols - 23) + "j(B")
+
 # Argument parsing
 parser = argparse.ArgumentParser()
 subparsers = parser.add_subparsers(help='Action to perform',dest='action')