Патчер ресурсов существующих VM был защищён

Этот коммит содержится в:
Виктор
2026-05-07 10:09:10 +09:00
родитель d44a4a2b67
Коммит b567f0548f
+22 -26
Просмотреть файл
@@ -7,6 +7,7 @@ if not app_path.exists():
raise SystemExit(f'app.py not found: {app_path}') raise SystemExit(f'app.py not found: {app_path}')
changed = [] changed = []
warnings = []
text = app_path.read_text() text = app_path.read_text()
if 'import tempfile' not in text: if 'import tempfile' not in text:
@@ -144,27 +145,19 @@ def apply_vm_resources(name: str, memory_mb: int, vcpus: int, guest_arch: str) -
if 'def apply_vm_resources(name: str, memory_mb: int, vcpus: int, guest_arch: str)' not in text: if 'def apply_vm_resources(name: str, memory_mb: int, vcpus: int, guest_arch: str)' not in text:
marker = '\n\ndef vm_details(name: str) -> dict[str, Any]:' marker = '\n\ndef vm_details(name: str) -> dict[str, Any]:'
if marker not in text: if marker in text:
raise SystemExit('vm_details marker not found') text = text.replace(marker, helpers + marker, 1)
text = text.replace(marker, helpers + marker, 1) changed.append('existing VM resources helpers added')
changed.append('existing VM resources helpers added') else:
warnings.append('vm_details marker not found, helpers skipped')
else: else:
changed.append('existing VM resources helpers already present') changed.append('existing VM resources helpers already present')
if '"resource_settings": vm_resource_settings(name)' not in text: if '"resource_settings": vm_resource_settings(name)' not in text:
replacements = [ replacements = [
( ('"iso_message": request.query_params.get("iso_message", ""), "iso_error": request.query_params.get("iso_error", "")})', '"iso_message": request.query_params.get("iso_message", ""), "iso_error": request.query_params.get("iso_error", ""), "resource_settings": vm_resource_settings(name), "resource_message": request.query_params.get("resource_message", ""), "resource_error": request.query_params.get("resource_error", "")})'),
'"iso_message": request.query_params.get("iso_message", ""), "iso_error": request.query_params.get("iso_error", "")})', ('"boot_message": request.query_params.get("boot_message", ""), "boot_error": request.query_params.get("boot_error", "")})', '"boot_message": request.query_params.get("boot_message", ""), "boot_error": request.query_params.get("boot_error", ""), "resource_settings": vm_resource_settings(name), "resource_message": request.query_params.get("resource_message", ""), "resource_error": request.query_params.get("resource_error", "")})'),
'"iso_message": request.query_params.get("iso_message", ""), "iso_error": request.query_params.get("iso_error", ""), "resource_settings": vm_resource_settings(name), "resource_message": request.query_params.get("resource_message", ""), "resource_error": request.query_params.get("resource_error", "")})', ('"host_ip": system_summary()["ip"]})', '"host_ip": system_summary()["ip"], "resource_settings": vm_resource_settings(name), "resource_message": request.query_params.get("resource_message", ""), "resource_error": request.query_params.get("resource_error", "")})'),
),
(
'"boot_message": request.query_params.get("boot_message", ""), "boot_error": request.query_params.get("boot_error", "")})',
'"boot_message": request.query_params.get("boot_message", ""), "boot_error": request.query_params.get("boot_error", ""), "resource_settings": vm_resource_settings(name), "resource_message": request.query_params.get("resource_message", ""), "resource_error": request.query_params.get("resource_error", "")})',
),
(
'"host_ip": system_summary()["ip"]})',
'"host_ip": system_summary()["ip"], "resource_settings": vm_resource_settings(name), "resource_message": request.query_params.get("resource_message", ""), "resource_error": request.query_params.get("resource_error", "")})',
),
] ]
for old, new in replacements: for old, new in replacements:
if old in text: if old in text:
@@ -172,7 +165,7 @@ if '"resource_settings": vm_resource_settings(name)' not in text:
changed.append('vm detail context gets resource settings') changed.append('vm detail context gets resource settings')
break break
else: else:
raise SystemExit('vm detail context marker not found') warnings.append('vm detail context marker not found, resource context skipped')
else: else:
changed.append('vm detail context already has resource settings') changed.append('vm detail context already has resource settings')
@@ -190,15 +183,14 @@ def vm_resources_apply(request: Request, name: str, memory_mb: int = Form(...),
''' '''
if '@app.post("/vm/{name}/resources")' not in text: if '@app.post("/vm/{name}/resources")' not in text:
marker = '\n\n@app.post("/vm/{name}/boot-order")' markers = ['\n\n@app.post("/vm/{name}/boot-order")', '\n\n@app.post("/vm/{name}/iso/mount")', '\n\n@app.post("/vm/{name}/{action}")']
if marker not in text: for marker in markers:
marker = '\n\n@app.post("/vm/{name}/iso/mount")' if marker in text:
if marker not in text: text = text.replace(marker, route + marker, 1)
marker = '\n\n@app.post("/vm/{name}/{action}")' changed.append('existing VM resources route added')
if marker not in text: break
raise SystemExit('vm action marker not found') else:
text = text.replace(marker, route + marker, 1) warnings.append('vm action marker not found, resources route skipped')
changed.append('existing VM resources route added')
else: else:
changed.append('existing VM resources route already present') changed.append('existing VM resources route already present')
@@ -207,3 +199,7 @@ app_path.write_text(text)
print('existing VM resources patch applied:') print('existing VM resources patch applied:')
for item in changed: for item in changed:
print(f'- {item}') print(f'- {item}')
if warnings:
print('Warnings:')
for item in warnings:
print(f'- {item}')