From a4d3e7134230b02387a8840660eb3de17ff0b88f Mon Sep 17 00:00:00 2001
From: Loic Guegan <loic.guegan@mailbox.org>
Date: Mon, 20 Nov 2023 18:57:52 +0100
Subject: [PATCH] Minor changes

---
 clusterman/commands/frontend.py | 6 +++---
 clusterman/commands/node.py     | 4 ++--
 clusterman/utils.py             | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 clusterman/utils.py

diff --git a/clusterman/commands/frontend.py b/clusterman/commands/frontend.py
index 4d7ecc4..6dee9bc 100644
--- a/clusterman/commands/frontend.py
+++ b/clusterman/commands/frontend.py
@@ -1,10 +1,10 @@
 import os, json, re
 from datetime import datetime
 from clusterman.config import CONF
-import clusterman.commands.node as node
+import clusterman.utils as utils 
 
 def info():
-    nodes=node.get_node_list()
+    nodes=utils.get_node_list()
     cache=None
     if os.path.exists(CONF.CACHE_FILE):
         with open(CONF.CACHE_FILE) as f:
@@ -18,7 +18,7 @@ def info():
     if len(CONF["cluster"]["groups"]) > 0:
         content=list()
         for group in CONF["cluster"]["groups"].keys():
-            content.append("{}({})".format(group,len(node.get_node_in_group(group))))
+            content.append("{}({})".format(group,len(utils.get_node_in_group(group))))
         print(", ".join(content))
     else:
         print("NA")
diff --git a/clusterman/commands/node.py b/clusterman/commands/node.py
index fba42ec..057c4d5 100644
--- a/clusterman/commands/node.py
+++ b/clusterman/commands/node.py
@@ -1,6 +1,6 @@
 import os, json, time, re, sys, subprocess
 from clusterman.config import CONF
-import clusterman.utils as utils
+import clusterman.utils as utils 
 
 
 def ls(group=None):
@@ -61,7 +61,7 @@ def check(timeout):
         print("Error: Some of your nodes are not reachable")
 
 def exec(command, group=None):
-    nodes=utils.get_node_list() if group is None else get_node_in_group(group)
+    nodes=utils.get_node_list() if group is None else utils.get_node_in_group(group)
     for ip in nodes:
         print("----- Node {} -----".format(ip))
         print(utils.ssh_exec(ip," ".join(command)))
diff --git a/clusterman/utils.py b/clusterman/utils.py
old mode 100644
new mode 100755
index 2ab37f0..c11883d
--- a/clusterman/utils.py
+++ b/clusterman/utils.py
@@ -1,14 +1,14 @@
-import subprocess, os, json
+import subprocess, os, json, re
 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])
+        output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "-o", "PasswordAuthentication=no", "-i", CONF["ssh"]["key_path"],"{}@{}".format(user,host), command])
         return output.decode("utf-8")
     else:
-        output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "{}@{}".format(user,ip), command])
+        output=subprocess.check_output(["ssh","-o", "StrictHostKeyChecking=no", "{}@{}".format(user,host), command])
         return output.decode("utf-8")
 
 def ping_test(host, timeout=None):