diff --git a/backend/app/api/proxmox/vms.py b/backend/app/api/proxmox/vms.py index ccc6a1d..69633a6 100644 --- a/backend/app/api/proxmox/vms.py +++ b/backend/app/api/proxmox/vms.py @@ -1930,6 +1930,46 @@ async def resize_container_disk( raise HTTPException(status_code=500, detail=str(e)) +@router.post("/api/{server_id}/container/{vmid}/disk/move") +async def move_container_disk( + server_id: int, + vmid: int, + node: str, + request: Request, + db: Session = Depends(get_db), + current_user: User = Depends(PermissionChecker("server:manage")) +): + """Переместить том контейнера в другое хранилище (move_volume).""" + server = db.query(ProxmoxServer).filter(ProxmoxServer.id == server_id).first() + if not server: + raise HTTPException(status_code=404, detail="Proxmox server not found") + + data = await request.json() + disk = data.get('disk') + target_storage = data.get('target_storage') + if not disk or not target_storage: + raise HTTPException(status_code=400, detail="Требуются параметры disk и target_storage") + + try: + client = _get_proxmox_client(server) + if not client.is_connected(): + raise HTTPException(status_code=503, detail="Failed to connect to Proxmox server") + + result = client.move_container_disk( + node, vmid, disk, target_storage, + delete=bool(data.get('delete', True)), + ) + if result.get('success'): + logger.info(f"User {current_user.username} moved volume {disk} of container {vmid} to {target_storage}") + return JSONResponse(content={"status": "success", "upid": result.get('upid')}) + raise HTTPException(status_code=400, detail=result.get('error', 'Failed')) + except HTTPException: + raise + except Exception as e: + logger.error(f"Error moving container {vmid} disk: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + @router.get("/api/{server_id}/container/{vmid}/config") def get_container_config( server_id: int, diff --git a/backend/app/proxmox/client.py b/backend/app/proxmox/client.py index ef49e67..54ade4e 100644 --- a/backend/app/proxmox/client.py +++ b/backend/app/proxmox/client.py @@ -1541,6 +1541,34 @@ class ProxmoxClient(VmMixin, LxcMixin, ClusterMixin, StorageMixin, NetworkMixin, logger.info(f"Диск {disk} LXC {vmid} изменен на {size}") return True + def move_container_disk(self, node: str, vmid: int, disk: str, target_storage: str, + delete: bool = True) -> Dict: + """Переместить том LXC контейнера в другое хранилище (POST lxc/{vmid}/move_volume). + + Args: + disk: имя тома (rootfs, mp0, mp1, ...) + target_storage: целевое хранилище + delete: удалить исходный том после копирования + Returns: + {"success": bool, "upid"?: str, "error"?: str} + """ + if not self.proxmox: + return {"success": False, "error": "Not connected"} + try: + params = {"volume": disk, "storage": target_storage, "delete": 1 if delete else 0} + upid = self.proxmox.nodes(node).lxc(vmid).move_volume.post(**params) + if isinstance(upid, str): + if not self.wait_for_task(node, upid, timeout=3600): + status = self.get_task_status(node, upid) or {} + reason = status.get("exitstatus") or "move_volume task failed" + logger.error(f"Move тома {disk} LXC {vmid} провалился: {reason}") + return {"success": False, "error": f"Proxmox: {reason}"} + logger.info(f"Том {disk} LXC {vmid} перемещён в {target_storage}") + return {"success": True, "upid": upid if isinstance(upid, str) else None} + except Exception as e: + logger.error(f"Ошибка перемещения тома {disk} LXC {vmid}: {e}") + return {"success": False, "error": str(e)} + def get_vm_interfaces(self, node: str, vmid: int) -> List[Dict]: """ Получить сетевые интерфейсы VM через QEMU guest agent diff --git a/frontend/src/features/instances/tabs/HardwareTab.tsx b/frontend/src/features/instances/tabs/HardwareTab.tsx index 29081ee..6762e9d 100644 --- a/frontend/src/features/instances/tabs/HardwareTab.tsx +++ b/frontend/src/features/instances/tabs/HardwareTab.tsx @@ -326,21 +326,23 @@ function DiskManagementCard({ serverId, vmid, type, node }: Props) { const { t } = useTranslation(); const confirm = useConfirm(); const { data: config } = useVMConfig(serverId, vmid, type, node); - const { data: storages = [] } = useLXCStorages(serverId, node); - const moveDisk = useMoveDisk(serverId, vmid, node); + // Только хранилища, поддерживающие нужный тип контента (rootdir для LXC, images для VM) — + // иначе Proxmox отклонит задачу переноса уже после запуска. + const { data: storages = [] } = useLXCStorages(serverId, node, type === 'lxc' ? 'rootdir' : 'images'); + const moveDisk = useMoveDisk(serverId, vmid, type, node); const addDisk = useAddDisk(serverId, vmid, node); const detachDisk = useDetachDisk(serverId, vmid, node); // Реальные дисковые устройства (без cd-rom и cloudinit) const disks = useMemo(() => { if (!config) return [] as string[]; - const re = /^(scsi\d+|sata\d+|virtio\d+|ide\d+)$/; + const re = type === 'lxc' ? /^(rootfs|mp\d+)$/ : /^(scsi\d+|sata\d+|virtio\d+|ide\d+)$/; return Object.entries(config) .filter(([k, v]) => re.test(k) && typeof v === 'string' && !v.includes('media=cdrom') && !v.includes('cloudinit') && !v.startsWith('/dev/')) // проброшенные физдиски — управляются в блоке «Проброс устройств» .map(([k]) => k); - }, [config]); + }, [config, type]); const [moveDiskDev, setMoveDiskDev] = useState(''); const [moveStorage, setMoveStorage] = useState(''); diff --git a/frontend/src/features/instances/tabs/ResourceCards.tsx b/frontend/src/features/instances/tabs/ResourceCards.tsx index cfe4295..b0f4c45 100644 --- a/frontend/src/features/instances/tabs/ResourceCards.tsx +++ b/frontend/src/features/instances/tabs/ResourceCards.tsx @@ -12,7 +12,9 @@ import { SelectTrigger, SelectValue, } from '@/components/ui/select'; -import { useVMConfig, useUpdateConfig, useResizeDisk } from '@/hooks/use-instances'; +import { useVMConfig, useUpdateConfig, useResizeDisk, useMoveDisk } from '@/hooks/use-instances'; +import { useLXCStorages } from '@/hooks/use-lxc-templates'; +import { Checkbox } from '@/components/ui/checkbox'; import { toast } from 'sonner'; interface Props { @@ -264,3 +266,75 @@ export function DiskResizeCard({ serverId, vmid, type, node }: Props) { ); } + +// ==================== Move disk to another storage ==================== + +export function DiskMoveCard({ serverId, vmid, type, node }: Props) { + const { t } = useTranslation(); + const { data: config } = useVMConfig(serverId, vmid, type, node); + // Только хранилища, поддерживающие нужный тип контента (rootdir для LXC, images для VM) — + // иначе Proxmox отклонит задачу переноса уже после запуска. + const { data: storages = [] } = useLXCStorages(serverId, node, type === 'lxc' ? 'rootdir' : 'images'); + const moveDisk = useMoveDisk(serverId, vmid, type, node); + + const diskDevices = useMemo(() => { + if (!config) return [] as string[]; + const re = type === 'lxc' ? /^(rootfs|mp\d+)$/ : /^(scsi\d+|sata\d+|virtio\d+|ide\d+)$/; + return Object.entries(config) + .filter(([k, v]) => re.test(k) && typeof v === 'string' && !v.includes('media=cdrom')) + .map(([k]) => k); + }, [config, type]); + + const [moveDiskDev, setMoveDiskDev] = useState(''); + const [moveStorage, setMoveStorage] = useState(''); + const [moveDelete, setMoveDelete] = useState(true); + + useEffect(() => { + if (diskDevices.length && !diskDevices.includes(moveDiskDev)) setMoveDiskDev(diskDevices[0]); + }, [diskDevices, moveDiskDev]); + + const doMove = () => { + if (!moveDiskDev || !moveStorage) return; + moveDisk.mutate( + { disk: moveDiskDev, target_storage: moveStorage, delete: moveDelete }, + { + onSuccess: () => { toast.success(t('instances.disk_moved')); setMoveStorage(''); }, + onError: (e: Error) => toast.error(e.message), + } + ); + }; + + return ( + + + {t('instances.disk_move')} + + + + + {t('instances.disk_device')} + v && setMoveDiskDev(v)}> + + {diskDevices.map((d) => {d})} + + + + {t('instances.migrate_target_storage')} + v && setMoveStorage(v)}> + + {storages.map((s) => {s.storage} ({s.type}))} + + + + + setMoveDelete(e.target.checked)} /> + {t('instances.disk_move_delete')} + + + {moveDisk.isPending && } + {t('instances.disk_move')} + + + + ); +} diff --git a/frontend/src/features/instances/tabs/SettingsTab.tsx b/frontend/src/features/instances/tabs/SettingsTab.tsx index 3ae2c11..4cc7cc8 100644 --- a/frontend/src/features/instances/tabs/SettingsTab.tsx +++ b/frontend/src/features/instances/tabs/SettingsTab.tsx @@ -10,7 +10,7 @@ import { useVMConfig, useUpdateConfig, useVMOwner, useSetVMOwner, useExecuteScri import { useProfile } from '@/hooks/use-settings'; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { toast } from 'sonner'; -import { ComputeResourcesCard, DiskResizeCard } from './ResourceCards'; +import { ComputeResourcesCard, DiskResizeCard, DiskMoveCard } from './ResourceCards'; interface Props { serverId: number; @@ -736,6 +736,8 @@ export default function SettingsTab({ serverId, vmid, type, node }: Props) { {type === 'lxc' && } + {type === 'lxc' && } + {/* Raw Config */} diff --git a/frontend/src/hooks/use-instances.ts b/frontend/src/hooks/use-instances.ts index 055a0e1..55c980e 100644 --- a/frontend/src/hooks/use-instances.ts +++ b/frontend/src/hooks/use-instances.ts @@ -592,11 +592,12 @@ export function useUpdateCloudInit(serverId: number, vmid: number, node: string) }); } -export function useMoveDisk(serverId: number, vmid: number, node: string) { +export function useMoveDisk(serverId: number, vmid: number, type: string, node: string) { const qc = useQueryClient(); + const prefix = type === 'lxc' ? 'container' : 'vm'; return useMutation({ mutationFn: (body: { disk: string; target_storage: string; delete?: boolean; format?: string }) => - apiClient.post(`/proxmox/api/${serverId}/vm/${vmid}/disk/move?node=${node}`, body), + apiClient.post(`/proxmox/api/${serverId}/${prefix}/${vmid}/disk/move?node=${node}`, body), onSuccess: () => qc.invalidateQueries({ queryKey: vmKeys.config(serverId, vmid) }), }); }