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 id regex group (miss)

Browse source 
- add version pve checking
This commit is contained in:
Tlams 2018-03-20 17:07:01 +00:00
parent 868c6509f2
commit 235bc489b5
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,11 +98,20 @@ class Analyse:
value_nodes_list["node"])["value"]["data"] value_nodes_list["node"])["value"]["data"]
# pve-manager/5.1-42/724a6cb3 # pve-manager/5.1-42/724a6cb3
# return something like: "5.1"
pveversion = float(re.search('\/([\d]{1}\.[\d]{1})\-[\d]{1,4}+\/', value_nodes_list["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"):
# Revoir cette partie - version proxmox ! """ Select types // version dependant """
types = ["lxc", "qemu", "openvz"] if pveversion < 4:
""" Proxmox versions before 4 """
types = ["qemu", "openvz"]
else:
""" Proxmox versions after 4 """
types = ["qemu", "lxc"]
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"])),
@ -149,7 +158,7 @@ class Analyse:
instance["macaddr"] = maclist instance["macaddr"] = maclist
""" Following instance ID """ """ Following instance ID """
uniqid = re.search('/^id=\"([a-z]+)\"$/', instance["description"]) uniqid = re.search('/^id=\"([a-z]+)\"$/', instance["description"]).group(1)
# Set unique id if not found # Set unique id if not found
if not uniqid: if not uniqid:
""" General description """ """ General description """