From e34fc73d5518bcd8acb7b86a16c0cd9e253393b7 Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Sun, 29 Oct 2023 09:37:06 +0100
Subject: [PATCH] Minor changes

---
 clusterman/commands/node.py | 10 ++--------
 clusterman/utils.py         | 13 +++++++++++++
 2 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 clusterman/utils.py

diff --git a/clusterman/commands/node.py b/clusterman/commands/node.py
index 9c7be5f..24e37ba 100644
--- a/clusterman/commands/node.py
+++ b/clusterman/commands/node.py
@@ -1,5 +1,6 @@
 import os, json, time, re, sys, subprocess
 from clusterman.config import CONF
+from clusterman.utils import ssh_exec
 
 def get_node_list():
     nodes_path=CONF.NODE_FILE
@@ -84,15 +85,8 @@ def check(timeout):
         print("Error: Some of your nodes are not reachable")
 
 def exec(command, group=None):
-    user="root" if len(CONF["ssh"]["user"]) <= 0 else CONF["ssh"]["user"]
-    key_path=CONF["ssh"]["key_path"]
     nodes=get_node_list() if group is None else get_node_in_group(group)
     for ip in nodes:
         print("----- Node {} -----".format(ip))
-        if len(key_path)>0:
-            output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "-o", "PasswordAuthentication=no", "-i", CONF["ssh"]["key_path"],"{}@{}".format(user,ip), " ".join(command)])
-            print(output.decode("utf-8"),end="")
-        else:
-            output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "-o", "PasswordAuthentication=no", "{}@{}".format(user,ip), " ".join(command)])
-            print(output.decode("utf-8"),end="")
+        print(ssh_exec(ip," ".join(command)))
 
diff --git a/clusterman/utils.py b/clusterman/utils.py
new file mode 100644
index 0000000..ad79bd2
--- /dev/null
+++ b/clusterman/utils.py
@@ -0,0 +1,13 @@
+import subprocess
+from clusterman.config import CONF
+
+def ssh_exec(host,command,use_key=True):
+    user="root" if len(CONF["ssh"]["user"]) <= 0 else CONF["ssh"]["user"]
+    key_path=CONF["ssh"]["key_path"]
+    if use_key:
+        output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "-o", "PasswordAuthentication=no", "-i", CONF["ssh"]["key_path"],"{}@{}".format(user,ip), command])
+        return output.decode("utf-8")
+    else:
+        output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "{}@{}".format(user,ip), command])
+        return output.decode("utf-8")
+