fix: show friendly OS name for LXC deployed from CT template
Some checks failed
Backend Tests / pytest (Python 3.12) (push) Failing after 1m26s
Deploy to Production / Trigger production update (push) Failing after 12s
SonarCloud / SonarCloud Analysis (push) Failing after 12m14s

Derive a human-readable OS name (e.g. Debian 13, Ubuntu 24.04) from the
vztmpl volid instead of showing the raw template path like
local:vztmpl/debian-13-standard_13.1-2_amd64.tar.zst in the instances list.
Applied at the display layer, so existing instances are fixed too.
This commit is contained in:
2026-08-19 15:29:22 +05:00
parent 3225214e43
commit 67fe01e9b1
2 changed files with 81 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ from sqlalchemy.orm import Session
from sqlalchemy import func
from loguru import logger
from typing import List, Optional
import re
import ssl
import asyncio
import httpx
@@ -18,6 +19,76 @@ from ...logging_service import LoggingService
from ...ipam_service import IPAMService
# ==================== OS name derivation ====================
# Known LXC distro slugs → human-readable display name.
_LXC_DISTRO_NAMES = {
"debian": "Debian",
"ubuntu": "Ubuntu",
"alpine": "Alpine",
"fedora": "Fedora",
"centos": "CentOS",
"rockylinux": "Rocky Linux",
"rocky": "Rocky Linux",
"almalinux": "AlmaLinux",
"alma": "AlmaLinux",
"archlinux": "Arch Linux",
"arch": "Arch Linux",
"opensuse": "openSUSE",
"gentoo": "Gentoo",
"devuan": "Devuan",
"nixos": "NixOS",
"oracle": "Oracle Linux",
"oraclelinux": "Oracle Linux",
"kali": "Kali Linux",
"mint": "Linux Mint",
"slackware": "Slackware",
"void": "Void Linux",
}
def pretty_os_from_template(template_name: Optional[str]) -> Optional[str]:
"""Derive a friendly OS name (e.g. "Debian 13", "Ubuntu 24.04") from an
LXC CT template volid/filename such as
``local:vztmpl/debian-13-standard_13.1-2_amd64.tar.zst``.
Returns ``None`` if the input doesn't look like a CT template path, so the
caller can fall back to its previous value.
"""
if not template_name:
return None
# Only vztmpl-style paths carry a distro/version in the filename. VM clone
# templates keep their own descriptive names — leave those untouched.
if "vztmpl" not in template_name and "/" not in template_name and ".tar" not in template_name:
return None
# Strip storage prefix and directory: keep just the filename.
base = template_name.rsplit("/", 1)[-1]
# Head is everything before the first underscore, e.g.
# "debian-13-standard", "ubuntu-24.04-standard", "centos-9-stream-default".
head = base.split("_", 1)[0]
tokens = head.split("-")
if not tokens:
return None
distro = _LXC_DISTRO_NAMES.get(tokens[0].lower())
if not distro:
return None
# First token that looks like a version number (digits, optionally dotted).
version = next((t for t in tokens[1:] if re.match(r"^\d+(\.\d+)*$", t)), None)
# Preserve edition qualifiers like "stream" (CentOS Stream) when present.
edition = "Stream" if "stream" in (t.lower() for t in tokens[1:]) else None
parts = [distro]
if version:
parts.append(version)
if edition:
parts.append(edition)
return " ".join(parts)
# ==================== Helper Functions for User Isolation ====================
def can_view_all_instances(current_user: User) -> bool:

View File

@@ -22,7 +22,7 @@ from ...ipam_service import IPAMService
from ._helpers import (check_vm_access, require_vm_access, _get_proxmox_client,
get_next_vmid, archive_and_delete_snapshots,
save_vm_instance, get_vm_instance, soft_delete_vm_instance,
can_view_all_instances)
can_view_all_instances, pretty_os_from_template)
from ...services.metrics_history import query_instance_metrics, timeframe_to_range
router = APIRouter()
@@ -283,8 +283,15 @@ def get_all_virtual_machines(
if network:
ip_network_name = network.name
# OS type - prefer template_name, fallback to os_type
os_template = vm.template_name or vm.os_type or ("QEMU/KVM" if vm.vm_type == "qemu" else "Linux")
# OS type - prefer a friendly name derived from the CT template file
# (e.g. "Debian 13" instead of the raw "local:vztmpl/debian-13-...tar.zst"),
# then fall back to the raw template_name / os_type.
os_template = (
pretty_os_from_template(vm.template_name)
or vm.template_name
or vm.os_type
or ("QEMU/KVM" if vm.vm_type == "qemu" else "Linux")
)
if not vm.template_name and vm.vm_type == "lxc" and os_template:
os_template = os_template.capitalize()