loic/clusterman
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/clusterman.git synced 2025-04-06 03:56:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loïc Guégan 2023-10-31 16:30:19 +01:00
parent ed8337414c
commit 9d1fe3b046
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clusterman/commands/node.py
View file

@ -4,7 +4,6 @@ import clusterman.utils as utils
def ls(group=None): def ls(group=None):
nodes_path=CONF.NODE_FILE
nodes=utils.get_node_list() nodes=utils.get_node_list()
if len(nodes)<=0: if len(nodes)<=0:
print("Please perform a scan before") print("Please perform a scan before")
@ -21,7 +20,7 @@ def scan(timeout):
from_split=[int(n) for n in CONF["cluster"]["ip4_from"].split(".")] from_split=[int(n) for n in CONF["cluster"]["ip4_from"].split(".")]
to_split=[int(n) for n in CONF["cluster"]["ip4_to"].split(".")] to_split=[int(n) for n in CONF["cluster"]["ip4_to"].split(".")]
ignore_list=[ip.strip(" ") for ip in CONF["cluster"]["ip4_ignore"]] ignore_list=[ip.strip(" ") for ip in CONF["cluster"]["ip4_ignore"]]
nodes=list() nodes=dict()
print("----- Starting node scan (timeout={}s) -----".format(timeout)) print("----- Starting node scan (timeout={}s) -----".format(timeout))
for W in range(from_split[0],to_split[0]+1): for W in range(from_split[0],to_split[0]+1):
for X in range(from_split[1],to_split[1]+1): for X in range(from_split[1],to_split[1]+1):
@ -33,7 +32,7 @@ def scan(timeout):
continue continue
print("Contacting {}...".format(ip),end='') print("Contacting {}...".format(ip),end='')
if not utils.ping_test(ip): if not utils.ping_test(ip):
nodes.append(ip) nodes[ip]={"hostname":""}
print("=> Found!!") print("=> Found!!")
else: else:
print() print()

2
clusterman/utils.py
View file

@ -26,7 +26,7 @@ def get_node_list():
if os.path.exists(nodes_path): if os.path.exists(nodes_path):
with open(nodes_path) as f: with open(nodes_path) as f:
nodes=json.load(f) nodes=json.load(f)
return nodes return nodes.keys()
return list() return list()
def get_node_in_group(group): def get_node_in_group(group):