Show line implementation (sonic-net#285)

consutil/lib.py

@@ -29,14 +29,6 @@ def run_command(cmd):
         sys.exit(ERR_CMD)
     return output
 
-# exits if inputted line number does not correspond to a device
-# input: linenum
-def checkDevice(linenum):
-    devices = getAllDevices()
-    if DEVICE_PREFIX + str(linenum) not in devices:
-        click.echo("Line number {} does not exist".format(linenum))
-        sys.exit(ERR_DEV)
-
 # returns a sorted list of all devices (whose name matches DEVICE_PREFIX)
 def getAllDevices():
     cmd = "ls " + DEVICE_PREFIX + "*"
@@ -48,6 +40,14 @@ def getAllDevices():
 
     return devices
 
+# exits if inputted line number does not correspond to a device
+# input: linenum
+def checkDevice(linenum):
+    devices = getAllDevices()
+    if DEVICE_PREFIX + str(linenum) not in devices:
+        click.echo("Line number {} does not exist".format(linenum))
+        sys.exit(ERR_DEV)
+
 # returns a dictionary of busy devices and their info
 #     maps line number to (pid, process start time)
 def getBusyDevices():

consutil/main.py

@@ -9,6 +9,7 @@
     import click
     import re
     import subprocess
+    from tabulate import tabulate
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
 
@@ -22,9 +23,25 @@ def consutil():
 
 # 'show' subcommand
 @consutil.command()
-def line():
-    """Show all /dev/ttyUSB lines"""
-    click.echo("show line")
+def show():
+    """Show all /dev/ttyUSB lines and their info"""
+    devices = getAllDevices()
+    busyDevices = getBusyDevices()
+
+    header = ["Line", "Baud", "PID", "Start Time"]
+    body = []
+    for device in devices:
+        lineNum = device[11:]
+        busy = " "
+        pid = ""
+        date = ""
+        if lineNum in busyDevices:
+            pid, date = busyDevices[lineNum]
+            busy = "*"
+        baud = getBaud(lineNum)
+        body.append([busy+lineNum, baud, pid, date])
+
+    click.echo(tabulate(body, header, stralign="right"))
 
 # 'clear' subcommand
 @consutil.command()

show/main.py

@@ -1135,9 +1135,8 @@ def reboot_cause():
 @cli.command('line')
 def line():
     """Show all /dev/ttyUSB lines and their info"""
-    # TODO: Stub
-    return
-
+    cmd = "consutil show"
+    run_command(cmd, display_cmd=verbose)
 
 if __name__ == '__main__':
     cli()