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

Fix codes errors

Browse source
This commit is contained in:
Tlams 2018-03-20 19:26:27 +00:00
parent d7a687d30c
commit dfd8640910
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,13 +99,13 @@ class Analyse:
# pve-manager/5.1-42/724a6cb3 # pve-manager/5.1-42/724a6cb3
# return something like: "5.1" # return something like: "5.1"
pveversion = float(re.search('\/([\d]{1}\.[\d]{1})\-[\d]{1,4}+\/', value_nodes_list["pveversion"]).group(1)) pveversion = re.search("([\d]{1}\.[\d]{1})\-[\d]{1,4}", node_status["pveversion"]).group(1)
list_instances = {"data": []} list_instances = {"data": []}
""" TOTAL COUNT CPU and RAM allocate """ """ TOTAL COUNT CPU and RAM allocate """
if (instancetype == "all"): if (instancetype == "all"):
""" Select types // version dependant """ """ Select types // version dependant """
if pveversion < 4: if float(pveversion) < float(4.0):
""" Proxmox versions before 4 """ """ Proxmox versions before 4 """
types = ["qemu", "openvz"] types = ["qemu", "openvz"]
else: else:
@ -134,7 +134,6 @@ class Analyse:
""" """
for key_list_instances, value_list_instances in list_instances.items(): for key_list_instances, value_list_instances in list_instances.items():
for instance in value_list_instances: for instance in value_list_instances:
""" Update cpu and ram for node """ """ Update cpu and ram for node """
totalcpu = totalcpu + instance["cpus"] totalcpu = totalcpu + instance["cpus"]
totalram = totalram + instance["maxmem"] totalram = totalram + instance["maxmem"]
@ -151,30 +150,33 @@ class Analyse:
maclist = [] maclist = []
currentdesc = ""
for key, value in config_av['data'].items(): for key, value in config_av['data'].items():
if 'net' in key: if 'net' in key:
mac = re.search(r'([0-9A-F]{2}[:-]){5}([0-9A-F]{2})', value, re.I).group() mac = re.search(r'([0-9A-F]{2}[:-]){5}([0-9A-F]{2})', value, re.I).group()
maclist.append(mac) maclist.append(mac)
if 'description' in key:
currentdesc = value
instance["macaddr"] = maclist instance["macaddr"] = maclist
""" Following instance ID """ """ Following instance ID """
uniqid = re.search('/^id=\"([a-z]+)\"$/', instance["description"]).group(1) getidfromdesc = re.search("id=\"([A-Z\.\d\_]+)\"", currentdesc)
# Set unique id if not found # Set unique id if not found
if not uniqid: if getidfromdesc is None:
""" General description """ """ General description """
randtext = ''.join(random.choice('AZERTYUIOPQSDFGHJKLMWXCVBN') for i in range(8)) randtext = ''.join(random.choice('AZERTYUIOPQSDFGHJKLMWXCVBN') for i in range(8))
uniqid = "Please, do not change or delete this ID \n" \ uniqid = "-- Please, do not change or delete this ID -- \n" \
"id={0}_{1}\n{2}".format(insert_time, randtext, "id=\"{0}_{1}\"\n------------------\n{2}".format(insert_time, randtext,
instance["description"]) currentdesc)
instance["description"] = uniqid
""" INSTANCE DEFINITION """ """ INSTANCE DEFINITION """
datadesc = { datadesc = {'description': uniqid}
'description': uniqid,
'vmid': instance["vmid"],
'node': value_nodes_list["node"]
}
resultsetdesc = proxmox.change_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])), resultsetdesc = proxmox.change_instances("{0}:{1}".format(cluster["url"], int(cluster["port"])),
value_nodes_list["node"], instance["type"], instance["vmid"], datadesc)["value"] value_nodes_list["node"], instance["type"], instance["vmid"], datadesc)
print(resultsetdesc)
self.mongo.insert_instances(instance) self.mongo.insert_instances(instance)
""" """