From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Thu, 16 Apr 2020 13:37:25 +0000 (+0200)
Subject: lock/cli: fix broken teuthology-lock --summary for py3
X-Git-Tag: 1.1.0~127^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce2302ea366659ff8b86c42267b6dda010fbfe61;p=teuthology.git

lock/cli: fix broken teuthology-lock --summary for py3

Convert None type to empty str in sorted key lambda
The usage of .format method is also adjusted for empty
machine type values

Fixes: https://tracker.ceph.com/issues/45105

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/teuthology/lock/cli.py b/teuthology/lock/cli.py
index b5adbb5a..ecb8374a 100644
--- a/teuthology/lock/cli.py
+++ b/teuthology/lock/cli.py
@@ -253,8 +253,9 @@ def do_summary(ctx):
         lockd[who][1] += 1 if l['up'] else 0
         lockd[who][2] = l['machine_type']
 
+    # sort locks by machine type and count
     locks = sorted([p for p in lockd.items()
-                    ], key=lambda sort: (sort[1][2], sort[1][0]))
+                    ], key=lambda sort: (sort[1][2] or '', sort[1][0]))
     total_count, total_up = 0, 0
     print("TYPE     COUNT  UP  OWNER")
 
@@ -262,7 +263,7 @@ def do_summary(ctx):
             # if machinetype == spectype:
             print("{machinetype:8s} {count:3d}  {up:3d}  {owner}".format(
                 count=count, up=upcount, owner=owner[0],
-                machinetype=machinetype))
+                machinetype=machinetype or '(none)'))
             total_count += count
             total_up += upcount