From 93bc1ca47568d1e1a7e2a4dbb4cd2ff100332d00 Mon Sep 17 00:00:00 2001
From: Lukas Plevac <lukas@plevac.eu>
Date: Mon, 9 Dec 2024 11:09:04 +0100
Subject: [PATCH] Bether list output

---
 saturnDiscover | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/saturnDiscover b/saturnDiscover
index 7b0800f..3ec8f71 100755
--- a/saturnDiscover
+++ b/saturnDiscover
@@ -128,11 +128,20 @@ elif (sys.argv[1] == "list"):
 
     if (sys.argv[2] == "res"):
         res = json.loads(tryReadFile("/etc/slurm-llnl/localRes", "[]"))
-        print(res)
+        print(",".join(res["res"]))
 
     if (sys.argv[2] == "nodes"):
         nodes = loadHosts()
-        print(nodes)
+
+        print("NAME    MASTER    IP                MAC                CPUs    RAM[GB]    VERSION    GRES")
+        print("SELF")
+
+        for node in nodes.values():
+            isMaster = ""
+            if node["type"] == "master":
+                isMaster = "YES"
+
+            print(f'{node["name"]: <8}{isMaster: <10}{node["ip"]: <18}{node["mac"]: <19}{node["cpus"]: <8}{node["rams"]: <11}{node["version"]: <11}{",".join(node["res"])}')
 
 elif (sys.argv[1] == "get"):
     if (argc != 3):