external/HyperProxmox
1
0
Fork 0
mirror of https://github.com/ThomasGsp/HyperProxmox.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

- Add unique ID in the description

Browse source 
- Add openvz
This commit is contained in:
Tlams 2018-03-20 15:46:46 +00:00
parent d506fb7158
commit f74257cc2b
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
code/scripts/main/core/modules/mod_analyst.py
View file

@ -17,6 +17,7 @@ import operator
import random import random
import base64 import base64
import re import re
import random
def add_token(tokens_in_slots, slot_distributions): def add_token(tokens_in_slots, slot_distributions):
@ -93,19 +94,21 @@ class Analyse:
nodes_list = proxmox.get_nodes("{0}:{1}".format(cluster["url"], int(cluster["port"]))) nodes_list = proxmox.get_nodes("{0}:{1}".format(cluster["url"], int(cluster["port"])))
if nodes_list["result"] == "OK": if nodes_list["result"] == "OK":
for value_nodes_list in nodes_list["value"]["data"]: for value_nodes_list in nodes_list["value"]["data"]:
# if value_nodes_list["node"] not in exclude_nodes: node_status = proxmox.get_status("{0}:{1}".format(cluster["url"], int(cluster["port"])),
value_nodes_list["node"])["value"]["data"]
node_status = proxmox.get_status("{0}:{1}".format(cluster["url"], int(cluster["port"])), value_nodes_list["node"])["value"]["data"] # pve-manager/5.1-42/724a6cb3
list_instances = {"data": []}
list_instances = { "data" : []}
""" TOTAL COUNT CPU and RAM allocate """ """ TOTAL COUNT CPU and RAM allocate """
if (instancetype == "all"): if (instancetype == "all"):
types = ["lxc", "qemu"] # vz... # Revoir cette partie - version proxmox !
types = ["lxc", "qemu", "openvz"]
for type in types: for type in types:
list_instances["data"] = list_instances["data"] + \ list_instances["data"] = list_instances["data"] + \
proxmox.get_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])), proxmox.get_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])),
value_nodes_list["node"], type)["value"]["data"] value_nodes_list["node"], type)["value"]["data"]
else: else:
list_instances = \ list_instances = \
proxmox.get_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])), proxmox.get_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])),
@ -145,6 +148,24 @@ class Analyse:
maclist.append(mac) maclist.append(mac)
instance["macaddr"] = maclist instance["macaddr"] = maclist
""" Following instance ID """
uniqid = re.search('/^id=\"([a-z]+)\"$/', instance["description"])
# Set unique id if not found
if not uniqid:
""" General description """
randtext = ''.join(random.choice('AZERTYUIOPQSDFGHJKLMWXCVBN') for i in range(8))
uniqid = "Please, do not change or delete this ID \n" \
"id={0}_{1}\n{2}".format(insert_time, randtext,
instance["description"])
""" INSTANCE DEFINITION """
datadesc = {
'description': uniqid,
'vmid': instance["vmid"],
'node': value_nodes_list["node"]
}
resultsetdesc = proxmox.change_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])),
value_nodes_list["node"], instance["type"], instance["vmid"], datadesc)["value"]
self.mongo.insert_instances(instance) self.mongo.insert_instances(instance)
""" """