refactor(proxmox): unify ProxmoxClient construction via from_server
Collapse four duplicated host+auth client-building blocks into a single ProxmoxClient.from_server() classmethod (the canonical source of truth): - _helpers._get_proxmox_client now delegates to from_server (107 callers untouched) - ipam._build_proxmox_client removed; its one call site uses from_server - task_queue_service keeps its per-server cache pool, builds via from_server - monitoring_worker keeps its ValueError-on-missing-auth contract, builds via from_server Behaviour preserved (token-first, then password; non-default port appended). Verified: containers rebuild healthy, smoke test of both auth paths passes. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -740,16 +740,6 @@ async def cleanup_orphan_allocations(
|
||||
}
|
||||
|
||||
|
||||
def _build_proxmox_client(server: ProxmoxServer) -> ProxmoxClient:
|
||||
"""Build ProxmoxClient from ProxmoxServer model."""
|
||||
host = server.ip_address or server.hostname
|
||||
if server.port and server.port != 8006:
|
||||
host = f"{host}:{server.port}"
|
||||
if server.use_password and server.password:
|
||||
return ProxmoxClient(host=host, user=server.api_user, password=server.password, verify_ssl=server.verify_ssl)
|
||||
return ProxmoxClient(host=host, user=server.api_user, token_name=server.api_token_name, token_value=server.api_token_value, verify_ssl=server.verify_ssl)
|
||||
|
||||
|
||||
def _extract_primary_ipv4(interfaces: list, parsed_networks: list):
|
||||
"""Extract first IPv4 that belongs to any IPAM network from interface list."""
|
||||
for iface in interfaces:
|
||||
@@ -900,7 +890,7 @@ def link_allocations_to_vms(
|
||||
continue
|
||||
|
||||
try:
|
||||
client = _build_proxmox_client(server)
|
||||
client = ProxmoxClient.from_server(server)
|
||||
if not client.is_connected():
|
||||
logger.warning(f"[IPAM link] Server {server.name} not reachable, skipping")
|
||||
for vm in server_vms:
|
||||
|
||||
@@ -72,24 +72,7 @@ def require_vm_access(db: Session, current_user: User, server_id: int, vmid: int
|
||||
|
||||
def _get_proxmox_client(server: ProxmoxServer) -> ProxmoxClient:
|
||||
"""Build a ProxmoxClient from a ProxmoxServer model (password or token auth)."""
|
||||
host = server.ip_address or getattr(server, 'hostname', '')
|
||||
if hasattr(server, 'port') and server.port and server.port != 8006:
|
||||
host = f"{host}:{server.port}"
|
||||
|
||||
if getattr(server, 'use_password', False) and getattr(server, 'password', ''):
|
||||
return ProxmoxClient(
|
||||
host=host,
|
||||
user=server.api_user,
|
||||
password=server.password,
|
||||
verify_ssl=server.verify_ssl
|
||||
)
|
||||
return ProxmoxClient(
|
||||
host=host,
|
||||
user=server.api_user,
|
||||
token_name=server.api_token_name,
|
||||
token_value=server.api_token_value,
|
||||
verify_ssl=server.verify_ssl
|
||||
)
|
||||
return ProxmoxClient.from_server(server)
|
||||
|
||||
|
||||
def get_next_vmid(db: Session, server_id: int) -> int:
|
||||
|
||||
Reference in New Issue
Block a user