Переписан для Open Web UI: плоские функции вместо класса, префикс pve1_
This commit is contained in:
+91
-341
@@ -5,11 +5,10 @@ Description: Full toolset for Proxmox VE management (second server):
|
||||
- LXC (create, start, stop, delete)
|
||||
- VM (clone from template, create from ISO, manage)
|
||||
- Monitoring (nodes, storage, resources, tasks)
|
||||
Usage:
|
||||
from proxmox_tools_pve1 import ToolsPVE1
|
||||
tools = ToolsPVE1()
|
||||
print(tools.connection())
|
||||
print(tools.vm_create(vmid=200, name="ubuntu", ciuser="ubuntu", cipassword="1234567"))
|
||||
|
||||
Usage: Import and call functions directly.
|
||||
import proxmox_tools_pve1 as pve1
|
||||
print(pve1.pve1_connection())
|
||||
"""
|
||||
|
||||
import json
|
||||
@@ -29,9 +28,6 @@ DEFAULT_NODE = "pve1"
|
||||
DEFAULT_STORAGE = "local"
|
||||
DEFAULT_BRIDGE = "vmbr0"
|
||||
|
||||
# ============================================================
|
||||
# INTERNAL HELPERS
|
||||
# ============================================================
|
||||
_base_url = PROXMOX_HOST.rstrip("/") + "/api2/json"
|
||||
_auth_header = {
|
||||
"Authorization": f"PVEAPIToken={PROXMOX_USER}!{PROXMOX_TOKEN_NAME}={PROXMOX_TOKEN_VALUE}"
|
||||
@@ -92,10 +88,7 @@ def _uptime(s):
|
||||
|
||||
|
||||
def _wait_for_task(upid, timeout=60):
|
||||
"""
|
||||
Wait for a Proxmox task to complete by UPID.
|
||||
Returns (ok: bool, message: str).
|
||||
"""
|
||||
"""Wait for a Proxmox task to complete by UPID."""
|
||||
if not upid or not isinstance(upid, str) or not upid.startswith("UPID:"):
|
||||
return True, "no UPID to wait"
|
||||
node = DEFAULT_NODE
|
||||
@@ -107,10 +100,7 @@ def _wait_for_task(upid, timeout=60):
|
||||
if t.get("upid") == upid:
|
||||
status = t.get("status", "")
|
||||
if status == "stopped":
|
||||
if t.get("exitstatus") == "OK":
|
||||
return True, "OK"
|
||||
else:
|
||||
return False, str(t)
|
||||
return (True, "OK") if t.get("exitstatus") == "OK" else (False, str(t))
|
||||
break
|
||||
except Exception:
|
||||
pass
|
||||
@@ -119,45 +109,33 @@ def _wait_for_task(upid, timeout=60):
|
||||
|
||||
|
||||
# ============================================================
|
||||
# MAIN TOOLS CLASS
|
||||
# FUNCTIONS
|
||||
# ============================================================
|
||||
class ToolsPVE1:
|
||||
"""Proxmox VE management toolset for PVE1 (192.168.31.4)."""
|
||||
|
||||
# ---- CONNECTION & NODES --------------------------------------------
|
||||
|
||||
@staticmethod
|
||||
def connection():
|
||||
def pve1_connection():
|
||||
"""Check Proxmox connection."""
|
||||
try:
|
||||
v = _api("GET", "/version")
|
||||
return (
|
||||
"OK Proxmox VE "
|
||||
+ v.get("version", "?")
|
||||
+ " | node: pve1 | IP: 192.168.31.4"
|
||||
)
|
||||
return "OK Proxmox VE " + v.get("version", "?") + " | node: pve1 | IP: 192.168.31.4"
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def nodes():
|
||||
|
||||
def pve1_nodes():
|
||||
"""Show all cluster nodes."""
|
||||
try:
|
||||
items = _api("GET", "/nodes")
|
||||
out = ["Nodes:"]
|
||||
for n in items:
|
||||
out.append(f"- {n.get('node', '?')} ({n.get('status', '?')})")
|
||||
out.append(
|
||||
f" CPU: {n.get('cpu', 0)*100:.1f}% | "
|
||||
f"RAM: {_pct(n.get('mem'), n.get('maxmem'))}"
|
||||
)
|
||||
out.append(f" CPU: {n.get('cpu', 0)*100:.1f}% | RAM: {_pct(n.get('mem'), n.get('maxmem'))}")
|
||||
out.append(f" Uptime: {_uptime(n.get('uptime'))}")
|
||||
return "\n".join(out)
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def node_status(node=DEFAULT_NODE):
|
||||
|
||||
def pve1_node_status(node=DEFAULT_NODE):
|
||||
"""Show detailed node status."""
|
||||
try:
|
||||
s = _api("GET", f"/nodes/{node}/status")
|
||||
@@ -184,8 +162,8 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def cluster():
|
||||
|
||||
def pve1_cluster():
|
||||
"""Show cluster status (quorum, members)."""
|
||||
try:
|
||||
items = _api("GET", "/cluster/status")
|
||||
@@ -195,15 +173,9 @@ class ToolsPVE1:
|
||||
t = item.get("type", "")
|
||||
if t == "cluster":
|
||||
has_cluster_info = True
|
||||
out.append(
|
||||
f"Cluster: {item.get('name', '?')} | "
|
||||
f"Quorum: {'OK' if item.get('quorate') else 'FAIL'}"
|
||||
)
|
||||
out.append(f"Cluster: {item.get('name', '?')} | Quorum: {'OK' if item.get('quorate') else 'FAIL'}")
|
||||
elif t == "node":
|
||||
out.append(
|
||||
f" {item.get('name', '?')} - {item.get('status', '?')} "
|
||||
f"({item.get('ip', '-')})"
|
||||
)
|
||||
out.append(f" {item.get('name', '?')} - {item.get('status', '?')} ({item.get('ip', '-')})")
|
||||
if not has_cluster_info:
|
||||
node_count = sum(1 for i in items if i.get("type") == "node")
|
||||
out.append("Cluster: single-node | Quorum: OK (N/A)")
|
||||
@@ -212,26 +184,17 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
# ---- RESOURCES & STORAGE ------------------------------------------
|
||||
|
||||
@staticmethod
|
||||
def resources(ftype=""):
|
||||
"""Show all cluster resources (VMs, LXC, nodes, storage)."""
|
||||
def pve1_resources(ftype=""):
|
||||
"""Show all cluster resources."""
|
||||
try:
|
||||
p = {}
|
||||
if ftype:
|
||||
p["type"] = ftype
|
||||
p = {"type": ftype} if ftype else {}
|
||||
items = _api("GET", "/cluster/resources", params=p)
|
||||
out = ["Resources:"]
|
||||
g = {}
|
||||
for r in items:
|
||||
g.setdefault(r.get("type", "?"), []).append(r)
|
||||
labels = {
|
||||
"node": "Nodes",
|
||||
"qemu": "QEMU",
|
||||
"lxc": "LXC",
|
||||
"storage": "Storage",
|
||||
}
|
||||
labels = {"node": "Nodes", "qemu": "QEMU", "lxc": "LXC", "storage": "Storage"}
|
||||
for t, lst in g.items():
|
||||
out.append(f"{labels.get(t, t)}: {len(lst)}")
|
||||
for r in lst[:25]:
|
||||
@@ -250,8 +213,8 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def storage():
|
||||
|
||||
def pve1_storage():
|
||||
"""Show all storages."""
|
||||
try:
|
||||
items = _api("GET", "/storage")
|
||||
@@ -270,8 +233,8 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def tasks(limit=10, node=DEFAULT_NODE):
|
||||
|
||||
def pve1_tasks(limit=10, node=DEFAULT_NODE):
|
||||
"""Show recent tasks on node."""
|
||||
try:
|
||||
items = _api("GET", f"/nodes/{node}/tasks", params={"limit": limit})
|
||||
@@ -280,18 +243,13 @@ class ToolsPVE1:
|
||||
out = [f"Tasks on {node}:"]
|
||||
for t in items:
|
||||
start = time.ctime(t.get("starttime", 0)) if t.get("starttime") else "?"
|
||||
out.append(
|
||||
f"- {t.get('type', '?')} | {t.get('status', '?')} | "
|
||||
f"{t.get('user', '?')} | {start}"
|
||||
)
|
||||
out.append(f"- {t.get('type', '?')} | {t.get('status', '?')} | {t.get('user', '?')} | {start}")
|
||||
return "\n".join(out)
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
# ---- LXC CONTAINERS -----------------------------------------------
|
||||
|
||||
@staticmethod
|
||||
def lxc_list(node=DEFAULT_NODE):
|
||||
def pve1_lxc_list(node=DEFAULT_NODE):
|
||||
"""Show LXC container list."""
|
||||
try:
|
||||
items = _api("GET", f"/nodes/{node}/lxc")
|
||||
@@ -299,10 +257,7 @@ class ToolsPVE1:
|
||||
return f"No LXC on {node}"
|
||||
out = [f"LXC on {node}:"]
|
||||
for c in items:
|
||||
out.append(
|
||||
f"- {c.get('name', '?')} (ID:{c.get('vmid', '?')}) - "
|
||||
f"{c.get('status', '?')}"
|
||||
)
|
||||
out.append(f"- {c.get('name', '?')} (ID:{c.get('vmid', '?')}) - {c.get('status', '?')}")
|
||||
if c.get("cpu"):
|
||||
out.append(f" CPU:{c['cpu']*100:.1f}%")
|
||||
if c.get("maxmem"):
|
||||
@@ -316,18 +271,15 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def lxc_detail(vmid, node=DEFAULT_NODE):
|
||||
|
||||
def pve1_lxc_detail(vmid, node=DEFAULT_NODE):
|
||||
"""Show detailed LXC info."""
|
||||
try:
|
||||
s = _api("GET", f"/nodes/{node}/lxc/{vmid}/status/current")
|
||||
c = _api("GET", f"/nodes/{node}/lxc/{vmid}/config")
|
||||
name = s.get("name", c.get("hostname", "?"))
|
||||
out = [f"LXC #{vmid}: {name} - {s.get('status', '?')}"]
|
||||
out.append(
|
||||
f"OS: {c.get('ostype', '?')} | CPU: {c.get('cores', '?')} | "
|
||||
f"RAM: {c.get('memory', '?')}MB"
|
||||
)
|
||||
out.append(f"OS: {c.get('ostype', '?')} | CPU: {c.get('cores', '?')} | RAM: {c.get('memory', '?')}MB")
|
||||
out.append(f"Disk: {c.get('rootfs', '?')} | SWAP: {c.get('swap', '?')}MB")
|
||||
out.append(f"Hostname: {c.get('hostname', '?')}")
|
||||
nets = [f" {k}: {v}" for k, v in c.items() if k.startswith("net")]
|
||||
@@ -343,21 +295,12 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def lxc_action(vmid, action, node=DEFAULT_NODE):
|
||||
"""
|
||||
Manage LXC: start, stop, shutdown, restart, suspend, resume, delete.
|
||||
"""
|
||||
|
||||
def pve1_lxc_action(vmid, action, node=DEFAULT_NODE):
|
||||
"""Manage LXC: start, stop, shutdown, restart, suspend, resume, delete."""
|
||||
try:
|
||||
acts = {
|
||||
"start": "start",
|
||||
"stop": "stop",
|
||||
"shutdown": "shutdown",
|
||||
"restart": "reboot",
|
||||
"suspend": "suspend",
|
||||
"resume": "resume",
|
||||
"delete": "del",
|
||||
}
|
||||
acts = {"start": "start", "stop": "stop", "shutdown": "shutdown", "restart": "reboot",
|
||||
"suspend": "suspend", "resume": "resume", "delete": "del"}
|
||||
if action not in acts:
|
||||
return f"Unknown action: {action}. Allowed: {', '.join(acts.keys())}"
|
||||
if action == "delete":
|
||||
@@ -368,8 +311,8 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def templates(storage="local", node=DEFAULT_NODE):
|
||||
|
||||
def pve1_templates(storage="local", node=DEFAULT_NODE):
|
||||
"""Show available LXC templates in storage."""
|
||||
try:
|
||||
content = _api("GET", f"/nodes/{node}/storage/{storage}/content")
|
||||
@@ -383,50 +326,24 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def lxc_create(
|
||||
vmid,
|
||||
hostname,
|
||||
ostemplate,
|
||||
password="",
|
||||
sshkey="",
|
||||
storage=DEFAULT_STORAGE,
|
||||
cores=1,
|
||||
memory=512,
|
||||
swap=0,
|
||||
disk="8G",
|
||||
bridge=DEFAULT_BRIDGE,
|
||||
ip="dhcp",
|
||||
netmask=24,
|
||||
gw="",
|
||||
dns="",
|
||||
domain="",
|
||||
node=DEFAULT_NODE,
|
||||
unpriv=True,
|
||||
start_now=True,
|
||||
):
|
||||
|
||||
def pve1_lxc_create(vmid, hostname, ostemplate, password="", sshkey="", storage=DEFAULT_STORAGE,
|
||||
cores=1, memory=512, swap=0, disk="8G", bridge=DEFAULT_BRIDGE,
|
||||
ip="dhcp", netmask=24, gw="", dns="", domain="", node=DEFAULT_NODE,
|
||||
unpriv=True, start_now=True):
|
||||
"""Create a new LXC container."""
|
||||
try:
|
||||
if not hostname:
|
||||
return "Error: hostname required"
|
||||
if not ostemplate:
|
||||
return "Error: ostemplate required"
|
||||
if not password and not sshkey:
|
||||
return "Error: password or sshkey required"
|
||||
exist = [str(x.get("vmid")) for x in _api("GET", f"/nodes/{node}/lxc")]
|
||||
exist += [str(x.get("vmid")) for x in _api("GET", f"/nodes/{node}/qemu")]
|
||||
if str(vmid) in exist:
|
||||
return f"Error: VMID {vmid} already exists"
|
||||
params = {
|
||||
"vmid": vmid,
|
||||
"hostname": hostname,
|
||||
"ostemplate": ostemplate,
|
||||
"storage": storage,
|
||||
"cores": cores,
|
||||
"memory": memory,
|
||||
"swap": swap,
|
||||
"unprivileged": 1 if unpriv else 0,
|
||||
}
|
||||
params = {"vmid": vmid, "hostname": hostname, "ostemplate": ostemplate,
|
||||
"storage": storage, "cores": cores, "memory": memory, "swap": swap,
|
||||
"unprivileged": 1 if unpriv else 0}
|
||||
params["rootfs"] = disk if ":" in disk else f"{storage}:{disk}"
|
||||
net = f"name=eth0,bridge={bridge}"
|
||||
if ip and ip.lower() != "dhcp":
|
||||
@@ -447,24 +364,17 @@ class ToolsPVE1:
|
||||
if start_now:
|
||||
params["start"] = 1
|
||||
result = _api("POST", f"/nodes/{node}/lxc", data=params)
|
||||
out = [f"OK LXC #{vmid} creating!"]
|
||||
out.append(f" Name: {hostname}")
|
||||
out.append(f" Template: {ostemplate}")
|
||||
out.append(f" CPU: {cores} cores, RAM: {memory}MB, Disk: {disk}")
|
||||
if ip and ip.lower() != "dhcp":
|
||||
out.append(f" Net: {bridge}, IP: {ip}/{netmask}")
|
||||
else:
|
||||
out.append(f" Net: {bridge}, IP: DHCP")
|
||||
out = [f"OK LXC #{vmid} creating!", f" Name: {hostname}", f" Template: {ostemplate}",
|
||||
f" CPU: {cores} cores, RAM: {memory}MB, Disk: {disk}"]
|
||||
out.append(f" Net: {bridge}, IP: {'DHCP' if ip == 'dhcp' else f'{ip}/{netmask}'}")
|
||||
if isinstance(result, str) and result:
|
||||
out.append(f"UPID: {result}")
|
||||
return "\n".join(out)
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
# ---- VIRTUAL MACHINES (QEMU) -------------------------------------
|
||||
|
||||
@staticmethod
|
||||
def vm_list(node=DEFAULT_NODE):
|
||||
def pve1_vm_list(node=DEFAULT_NODE):
|
||||
"""Show all VM (QEMU) list."""
|
||||
try:
|
||||
items = _api("GET", f"/nodes/{node}/qemu")
|
||||
@@ -472,10 +382,7 @@ class ToolsPVE1:
|
||||
return f"No VMs on {node}"
|
||||
out = [f"VMs on {node}:"]
|
||||
for v in items:
|
||||
out.append(
|
||||
f"- {v.get('name', '?')} (ID:{v.get('vmid', '?')}) - "
|
||||
f"{v.get('status', '?')}"
|
||||
)
|
||||
out.append(f"- {v.get('name', '?')} (ID:{v.get('vmid', '?')}) - {v.get('status', '?')}")
|
||||
if v.get("cpu"):
|
||||
out.append(f" CPU:{v['cpu']*100:.1f}%")
|
||||
if v.get("maxmem"):
|
||||
@@ -487,13 +394,12 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def vm_detail(vmid, node=DEFAULT_NODE):
|
||||
|
||||
def pve1_vm_detail(vmid, node=DEFAULT_NODE):
|
||||
"""Show detailed VM info."""
|
||||
try:
|
||||
s = _api("GET", f"/nodes/{node}/qemu/{vmid}/status/current")
|
||||
out = [f"VM #{vmid}: {s.get('name', '?')}"]
|
||||
out.append(f"Status: {s.get('status', '?')}")
|
||||
out = [f"VM #{vmid}: {s.get('name', '?')}", f"Status: {s.get('status', '?')}"]
|
||||
if s.get("maxmem"):
|
||||
out.append(f"RAM: {_pct(s.get('mem'), s.get('maxmem'))}")
|
||||
if s.get("cpu"):
|
||||
@@ -506,109 +412,54 @@ class ToolsPVE1:
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def vm_action(vmid, action, node=DEFAULT_NODE):
|
||||
"""
|
||||
Manage VM: start, stop, shutdown, restart, suspend, resume, delete.
|
||||
"""
|
||||
|
||||
def pve1_vm_action(vmid, action, node=DEFAULT_NODE):
|
||||
"""Manage VM: start, stop, shutdown, restart, suspend, resume, delete."""
|
||||
try:
|
||||
acts = {
|
||||
"start": "start",
|
||||
"stop": "stop",
|
||||
"shutdown": "shutdown",
|
||||
"restart": "reboot",
|
||||
"suspend": "suspend",
|
||||
"resume": "resume",
|
||||
"delete": "del",
|
||||
}
|
||||
acts = {"start": "start", "stop": "stop", "shutdown": "shutdown", "restart": "reboot",
|
||||
"suspend": "suspend", "resume": "resume", "delete": "del"}
|
||||
if action not in acts:
|
||||
return f"Unknown action: {action}. Allowed: {', '.join(acts.keys())}"
|
||||
if action == "delete":
|
||||
result = _api("DELETE", f"/nodes/{node}/qemu/{vmid}")
|
||||
else:
|
||||
result = _api(
|
||||
"POST", f"/nodes/{node}/qemu/{vmid}/status/{acts[action]}"
|
||||
)
|
||||
result = _api("POST", f"/nodes/{node}/qemu/{vmid}/status/{acts[action]}")
|
||||
return f"OK VM #{vmid} {action}\n{result}"
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def vm_create_from_template(
|
||||
vmid,
|
||||
name,
|
||||
template_vmid=1000,
|
||||
full=True,
|
||||
memory=None,
|
||||
cores=None,
|
||||
storage=None,
|
||||
target_node=None,
|
||||
pool=None,
|
||||
start_now=True,
|
||||
ciuser="",
|
||||
cipassword="",
|
||||
sshkeys="",
|
||||
node=DEFAULT_NODE,
|
||||
):
|
||||
"""
|
||||
Create a new VM by cloning from a template.
|
||||
Default template: VM #1000 (cloud-init).
|
||||
|
||||
Cloud-init params (for guest OS user setup):
|
||||
ciuser: username in the guest (e.g. "ubuntu")
|
||||
cipassword: password for the user
|
||||
sshkeys: SSH public keys (newline-separated string)
|
||||
|
||||
FIXED: "start" parameter is NOT sent to /clone -
|
||||
startup is done via separate API call after clone completes.
|
||||
"""
|
||||
def pve1_vm_create_from_template(vmid, name, template_vmid=1000, full=True, memory=None,
|
||||
cores=None, storage=None, target_node=None, pool=None,
|
||||
start_now=True, ciuser="", cipassword="", sshkeys="", node=DEFAULT_NODE):
|
||||
"""Create a new VM by cloning from template. Default: VM #1000 (cloud-init)."""
|
||||
try:
|
||||
if not vmid:
|
||||
return "Error: vmid required"
|
||||
if not name:
|
||||
return "Error: name required"
|
||||
|
||||
# Check VMID availability
|
||||
exist_vm = [str(x.get("vmid")) for x in _api("GET", f"/nodes/{node}/qemu")]
|
||||
exist_lxc = [str(x.get("vmid")) for x in _api("GET", f"/nodes/{node}/lxc")]
|
||||
if str(vmid) in exist_vm + exist_lxc:
|
||||
return f"Error: VMID {vmid} already exists"
|
||||
|
||||
# Step 1: Clone (WITHOUT "start" parameter!)
|
||||
params = {
|
||||
"newid": vmid,
|
||||
"name": name,
|
||||
"full": 1 if full else 0,
|
||||
}
|
||||
params = {"newid": vmid, "name": name, "full": 1 if full else 0}
|
||||
if storage:
|
||||
params["storage"] = storage
|
||||
if target_node:
|
||||
params["target"] = target_node
|
||||
if pool:
|
||||
params["pool"] = pool
|
||||
|
||||
result = _api(
|
||||
"POST", f"/nodes/{node}/qemu/{template_vmid}/clone", data=params
|
||||
)
|
||||
|
||||
out = [f"OK VM #{vmid}: {name} cloning from template #{template_vmid}!"]
|
||||
out.append(f" Type: {'full' if full else 'linked'} clone")
|
||||
result = _api("POST", f"/nodes/{node}/qemu/{template_vmid}/clone", data=params)
|
||||
out = [f"OK VM #{vmid}: {name} cloning from template #{template_vmid}!",
|
||||
f" Type: {'full' if full else 'linked'} clone"]
|
||||
if storage:
|
||||
out.append(f" Storage: {storage}")
|
||||
|
||||
upid = result if isinstance(result, str) else ""
|
||||
if upid:
|
||||
out.append(f"UPID: {upid}")
|
||||
|
||||
# Step 2: Wait for clone to finish
|
||||
out.append("Waiting for clone to finish...")
|
||||
ok, msg = _wait_for_task(upid, timeout=120)
|
||||
if not ok:
|
||||
out.append(f" WARN Clone may not have finished: {msg}")
|
||||
else:
|
||||
out.append(" Clone done")
|
||||
|
||||
# Step 3: Apply settings (resources + cloud-init)
|
||||
out.append(f" {'Clone done' if ok else f'WARN Clone may not have finished: {msg}'}")
|
||||
config_params = {}
|
||||
if memory is not None:
|
||||
config_params["memory"] = memory
|
||||
@@ -620,15 +471,10 @@ class ToolsPVE1:
|
||||
config_params["cipassword"] = cipassword
|
||||
if sshkeys:
|
||||
config_params["sshkeys"] = sshkeys
|
||||
|
||||
if config_params:
|
||||
out.append("Applying settings...")
|
||||
try:
|
||||
_api(
|
||||
"PUT",
|
||||
f"/nodes/{node}/qemu/{vmid}/config",
|
||||
data=config_params,
|
||||
)
|
||||
_api("PUT", f"/nodes/{node}/qemu/{vmid}/config", data=config_params)
|
||||
if memory is not None:
|
||||
out.append(f" RAM -> {memory} MB")
|
||||
if cores is not None:
|
||||
@@ -642,8 +488,6 @@ class ToolsPVE1:
|
||||
out.append(" Settings applied")
|
||||
except Exception as e2:
|
||||
out.append(f" WARN Could not apply settings: {e2}")
|
||||
|
||||
# Step 4: Start VM (separate call!)
|
||||
if start_now:
|
||||
out.append("Starting VM...")
|
||||
try:
|
||||
@@ -653,119 +497,34 @@ class ToolsPVE1:
|
||||
out.append(f" WARN Could not start: {e3}")
|
||||
else:
|
||||
out.append(f" VM #{vmid} created (not started)")
|
||||
|
||||
return "\n".join(out)
|
||||
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@staticmethod
|
||||
def vm_create(
|
||||
vmid,
|
||||
name,
|
||||
template_vmid=1000,
|
||||
memory=4096,
|
||||
cores=2,
|
||||
disk_size="32G",
|
||||
disk_storage="local-lvm",
|
||||
iso="",
|
||||
bridge=DEFAULT_BRIDGE,
|
||||
ip="dhcp",
|
||||
netmask=24,
|
||||
gw="",
|
||||
ostype="l26",
|
||||
agent=1,
|
||||
ciuser="",
|
||||
cipassword="",
|
||||
sshkeys="",
|
||||
node=DEFAULT_NODE,
|
||||
start_now=True,
|
||||
):
|
||||
"""
|
||||
Universal VM creation.
|
||||
|
||||
Modes:
|
||||
1. From template (default): clones VM #1000 (cloud-init)
|
||||
2. From ISO: template_vmid=None, iso="local:iso/image.iso"
|
||||
|
||||
Cloud-init params (for mode 1):
|
||||
ciuser: guest OS username
|
||||
cipassword: guest OS password
|
||||
sshkeys: SSH public keys
|
||||
|
||||
Examples:
|
||||
# Clone from template with cloud-init user:
|
||||
tools.vm_create(
|
||||
vmid=200,
|
||||
name="web-server",
|
||||
memory=8192,
|
||||
cores=4,
|
||||
ciuser="ubuntu",
|
||||
cipassword="mypassword",
|
||||
start_now=True,
|
||||
)
|
||||
|
||||
# Create from ISO:
|
||||
tools.vm_create(
|
||||
vmid=202,
|
||||
name="debian-server",
|
||||
template_vmid=None,
|
||||
iso="local:iso/debian-12.iso",
|
||||
ip="192.168.31.60",
|
||||
gw="192.168.31.1",
|
||||
)
|
||||
"""
|
||||
def pve1_vm_create(vmid, name, template_vmid=1000, memory=4096, cores=2,
|
||||
disk_size="32G", disk_storage="local-lvm", iso="",
|
||||
bridge=DEFAULT_BRIDGE, ip="dhcp", netmask=24, gw="",
|
||||
ostype="l26", agent=1, ciuser="", cipassword="", sshkeys="",
|
||||
node=DEFAULT_NODE, start_now=True):
|
||||
"""Universal VM creation. Mode 1: clone from template. Mode 2: from ISO (template_vmid=None)."""
|
||||
try:
|
||||
# Mode 1: clone from template
|
||||
if template_vmid:
|
||||
return ToolsPVE1.vm_create_from_template(
|
||||
vmid=vmid,
|
||||
name=name,
|
||||
template_vmid=template_vmid,
|
||||
full=True,
|
||||
memory=memory,
|
||||
cores=cores,
|
||||
storage=disk_storage,
|
||||
start_now=start_now,
|
||||
ciuser=ciuser,
|
||||
cipassword=cipassword,
|
||||
sshkeys=sshkeys,
|
||||
node=node,
|
||||
)
|
||||
|
||||
# Mode 2: create from scratch (ISO)
|
||||
if not name:
|
||||
return "Error: name required"
|
||||
if not vmid:
|
||||
return "Error: vmid required"
|
||||
|
||||
return pve1_vm_create_from_template(vmid=vmid, name=name, template_vmid=template_vmid,
|
||||
full=True, memory=memory, cores=cores, storage=disk_storage,
|
||||
start_now=start_now, ciuser=ciuser, cipassword=cipassword, sshkeys=sshkeys, node=node)
|
||||
if not name or not vmid:
|
||||
return "Error: name and vmid required"
|
||||
exist_vm = [str(x.get("vmid")) for x in _api("GET", f"/nodes/{node}/qemu")]
|
||||
exist_lxc = [str(x.get("vmid")) for x in _api("GET", f"/nodes/{node}/lxc")]
|
||||
if str(vmid) in exist_vm + exist_lxc:
|
||||
return f"Error: VMID {vmid} already exists"
|
||||
|
||||
params = {
|
||||
"vmid": vmid,
|
||||
"name": name,
|
||||
"memory": memory,
|
||||
"cores": cores,
|
||||
"sockets": 1,
|
||||
"ostype": ostype,
|
||||
"agent": str(agent),
|
||||
}
|
||||
|
||||
# Disk
|
||||
if ":" in disk_size:
|
||||
params["virtio0"] = disk_size
|
||||
else:
|
||||
params["virtio0"] = f"{disk_storage}:{disk_size}"
|
||||
|
||||
# ISO
|
||||
params = {"vmid": vmid, "name": name, "memory": memory, "cores": cores,
|
||||
"sockets": 1, "ostype": ostype, "agent": str(agent)}
|
||||
params["virtio0"] = disk_size if ":" in disk_size else f"{disk_storage}:{disk_size}"
|
||||
if iso:
|
||||
params["ide2"] = f"{iso},media=cdrom"
|
||||
params["boot"] = "order=ide2;virtio0"
|
||||
|
||||
# Network
|
||||
net = f"name=eth0,bridge={bridge}"
|
||||
if ip and ip.lower() != "dhcp":
|
||||
net += f",ip={ip}/{netmask}"
|
||||
@@ -774,26 +533,18 @@ class ToolsPVE1:
|
||||
else:
|
||||
net += ",ip=dhcp"
|
||||
params["net0"] = net
|
||||
|
||||
if start_now:
|
||||
params["start"] = 1
|
||||
|
||||
result = _api("POST", f"/nodes/{node}/qemu", data=params)
|
||||
|
||||
out = [f"OK VM #{vmid}: {name} creating!"]
|
||||
out.append(f" CPU: {cores} cores, RAM: {memory} MB")
|
||||
out.append(f" Disk: {params['virtio0']}")
|
||||
out = [f"OK VM #{vmid}: {name} creating!", f" CPU: {cores} cores, RAM: {memory} MB",
|
||||
f" Disk: {params['virtio0']}"]
|
||||
if iso:
|
||||
out.append(f" ISO: {iso}")
|
||||
out.append(
|
||||
f" Net: {bridge}, "
|
||||
f"IP: {'DHCP' if ip == 'dhcp' else f'{ip}/{netmask}'}"
|
||||
)
|
||||
out.append(f" Net: {bridge}, IP: {'DHCP' if ip == 'dhcp' else f'{ip}/{netmask}'}")
|
||||
out.append(f" QEMU Agent: {'on' if agent else 'off'}")
|
||||
if isinstance(result, str) and result:
|
||||
out.append(f"UPID: {result}")
|
||||
return "\n".join(out)
|
||||
|
||||
except Exception as e:
|
||||
return "ERR " + str(e)
|
||||
|
||||
@@ -802,9 +553,8 @@ class ToolsPVE1:
|
||||
# TEST
|
||||
# ============================================================
|
||||
if __name__ == "__main__":
|
||||
tools = ToolsPVE1()
|
||||
print(tools.connection())
|
||||
print(pve1_connection())
|
||||
print()
|
||||
print(tools.vm_list())
|
||||
print(pve1_vm_list())
|
||||
print()
|
||||
print(tools.storage())
|
||||
print(pve1_storage())
|
||||
|
||||
Reference in New Issue
Block a user