#!/usr/bin/env python3
from pathlib import Path
import re
import sys
app_path = Path(sys.argv[1]) if len(sys.argv) > 1 else Path('/opt/virtuality/web/app.py')
if not app_path.exists():
raise SystemExit(f'app.py not found: {app_path}')
dashboard_template_path = app_path.parent / 'templates' / 'dashboard.html'
if not dashboard_template_path.exists():
raise SystemExit(f'dashboard.html not found: {dashboard_template_path}')
changed: list[str] = []
text = app_path.read_text(encoding='utf-8')
# Remove helper blocks injected by older versions of this patch. They were too invasive
# and could leave stale references on servers that had several hotfixes applied.
text, removed_helpers = re.subn(
r"\n\ndef parse_dhcp_leases_output\(output: str\).*?\n\ndef parse_virsh_list\(\) -> list\[dict\[str, str\]\]:",
"\n\ndef parse_virsh_list() -> list[dict[str, str]]:",
text,
count=1,
flags=re.S,
)
if removed_helpers:
changed.append('old VM IP helper block was removed')
new_parse_virsh_list = '''def parse_virsh_list() -> list[dict[str, str]]:
def resolve_ip(name: str) -> str:
if not name:
return "—"
try:
result = run_cmd(["virsh", "domifaddr", name], timeout=8)
if result.get("ok"):
for ip in re.findall(r"\\b(\\d{1,3}(?:\\.\\d{1,3}){3})/\\d+", result.get("stdout", "")):
if not ip.startswith("127.") and not ip.startswith("169.254."):
return ip
except Exception:
pass
try:
resolved = network_core.resolve_vm_ip(name)
if resolved:
return str(resolved)
except Exception:
pass
return "—"
result = run_cmd(["virsh", "list", "--all"])
rows = []
if not result["ok"]:
return rows
for line in result["stdout"].splitlines()[2:]:
parts = line.strip().split(None, 2)
if len(parts) == 3:
rows.append({"id": parts[0], "name": parts[1], "state": parts[2]})
elif len(parts) == 2:
rows.append({"id": "-", "name": parts[0], "state": parts[1]})
for row in rows:
row["ip"] = resolve_ip(row.get("name", ""))
return rows
'''
text, replaced = re.subn(
r"def parse_virsh_list\(\) -> list\[dict\[str, str\]\]:.*?\n\ndef parse_pool_list\(\) -> list\[dict\[str, str\]\]:",
new_parse_virsh_list + "\n\ndef parse_pool_list() -> list[dict[str, str]]:",
text,
count=1,
flags=re.S,
)
if not replaced:
raise SystemExit('parse_virsh_list block not found')
changed.append('parse_virsh_list was replaced with a safe inline IP resolver')
app_path.write_text(text, encoding='utf-8')
dashboard_html = dashboard_template_path.read_text(encoding='utf-8')
if '| IP | ' not in dashboard_html:
dashboard_html = dashboard_html.replace(
'| ID | Name | State | Actions |
|---|
',
'| ID | Name | IP | State | Actions |
|---|
'
)
dashboard_html = dashboard_html.replace(
'{{ vm.name }} | \n {{ vm.name }} | \n {{ vm.ip|default(\'—\') }} | \n Виртуальных машин пока нет', 'colspan="5" class="muted">Виртуальных машин пока нет')
changed.append('Dashboard VM IP column was added')
elif "vm.ip" not in dashboard_html:
dashboard_html = dashboard_html.replace(
'| {{ vm.name }} | \n {{ vm.name }} | \n {{ vm.ip|default(\'—\') }} | \n | |