diff --git a/agent/app/dto/vm.go b/agent/app/dto/vm.go index 99464d0bc..71e68fb66 100644 --- a/agent/app/dto/vm.go +++ b/agent/app/dto/vm.go @@ -49,24 +49,30 @@ type VMHealthCheckResult struct { Items []VMHealthCheckItem `json:"items"` } +type VMDataDisk struct { + SizeGiB int64 `json:"sizeGiB" validate:"required,min=1,max=8388607"` + StoragePool string `json:"storagePool"` +} + type VMCreate struct { - TaskID string `json:"taskID"` - Name string `json:"name" validate:"required,vm_name"` - CPU int `json:"cpu" validate:"required,min=1"` - Memory int64 `json:"memory" validate:"required,min=1"` - DiskSize int64 `json:"diskSize" validate:"required,min=1"` - OSType string `json:"osType" validate:"omitempty,oneof=windows linux other"` - DiskBus string `json:"diskBus" validate:"omitempty,oneof=sata virtio"` - TemplateID uint `json:"templateID"` - DiskPath string `json:"diskPath"` - StoragePool string `json:"storagePool"` - ISOPaths []string `json:"isoPaths"` - ImagePath string `json:"imagePath"` - Network string `json:"network" validate:"required,vm_common"` - BootOrder string `json:"bootOrder"` - StartAfterCreate bool `json:"startAfterCreate"` - AutoStart bool `json:"autoStart"` - Description string `json:"description"` + DataDisks []VMDataDisk `json:"dataDisks" validate:"max=9,dive"` + TaskID string `json:"taskID"` + Name string `json:"name" validate:"required,vm_name"` + CPU int `json:"cpu" validate:"required,min=1"` + Memory int64 `json:"memory" validate:"required,min=1"` + DiskSize int64 `json:"diskSize" validate:"required,min=1"` + OSType string `json:"osType" validate:"omitempty,oneof=windows linux other"` + DiskBus string `json:"diskBus" validate:"omitempty,oneof=sata virtio"` + TemplateID uint `json:"templateID"` + DiskPath string `json:"diskPath"` + StoragePool string `json:"storagePool"` + ISOPaths []string `json:"isoPaths"` + ImagePath string `json:"imagePath"` + Network string `json:"network" validate:"required,vm_common"` + BootOrder string `json:"bootOrder"` + StartAfterCreate bool `json:"startAfterCreate"` + AutoStart bool `json:"autoStart"` + Description string `json:"description"` } type VMTemplateCreate struct { @@ -172,16 +178,22 @@ type VMSnapshotSearch struct { Name string `json:"name" validate:"required,vm_name"` } +type VMSnapshotDisk struct { + Target string `json:"target"` + Path string `json:"path"` +} + type VMSnapshotInfo struct { - Name string `json:"name"` - Description string `json:"description"` - CreatedAt int64 `json:"createdAt"` - State string `json:"state"` - Parent string `json:"parent"` - Path string `json:"path"` - Size int64 `json:"size"` - Current bool `json:"current"` - Children int `json:"children"` + Disks []VMSnapshotDisk `json:"disks"` + Name string `json:"name"` + Description string `json:"description"` + CreatedAt int64 `json:"createdAt"` + State string `json:"state"` + Parent string `json:"parent"` + Path string `json:"path"` + Size int64 `json:"size"` + Current bool `json:"current"` + Children int `json:"children"` } type VMIsoSearch struct { @@ -286,24 +298,26 @@ type VMNetworkUpdate struct { } type VMNetworkItem struct { - ID uint `json:"id"` - Name string `json:"name"` - Type string `json:"type"` - BridgeName string `json:"bridgeName"` - SourceInterface string `json:"sourceInterface"` - CIDR string `json:"cidr"` - Gateway string `json:"gateway"` - DHCPStart string `json:"dhcpStart"` - DHCPEnd string `json:"dhcpEnd"` - AutoStart bool `json:"autoStart"` - Description string `json:"description"` - CreatedAt string `json:"createdAt"` - Status string `json:"status"` - VMCount int `json:"vmCount"` - VMs []VMResourceRef `json:"vms"` - Registered bool `json:"registered"` - UsedIPs []VMNetworkIPUsage `json:"usedIPs"` - Error string `json:"error"` + Addresses []string `json:"addresses"` + Interfaces []VMNetworkInterfaceItem `json:"interfaces"` + ID uint `json:"id"` + Name string `json:"name"` + Type string `json:"type"` + BridgeName string `json:"bridgeName"` + SourceInterface string `json:"sourceInterface"` + CIDR string `json:"cidr"` + Gateway string `json:"gateway"` + DHCPStart string `json:"dhcpStart"` + DHCPEnd string `json:"dhcpEnd"` + AutoStart bool `json:"autoStart"` + Description string `json:"description"` + CreatedAt string `json:"createdAt"` + Status string `json:"status"` + VMCount int `json:"vmCount"` + VMs []VMResourceRef `json:"vms"` + Registered bool `json:"registered"` + UsedIPs []VMNetworkIPUsage `json:"usedIPs"` + Error string `json:"error"` } type VMResourceRef struct { @@ -387,6 +401,7 @@ type VMInfo struct { } type VMDisk struct { + System bool `json:"system"` Capacity int64 `json:"capacity"` Format string `json:"format"` ReadOnly bool `json:"readOnly"` diff --git a/agent/app/model/vm.go b/agent/app/model/vm.go index 3c46c1c38..0364ad2d4 100644 --- a/agent/app/model/vm.go +++ b/agent/app/model/vm.go @@ -3,23 +3,24 @@ package model type VirtualMachine struct { BaseModel - Name string `json:"name"` - UUID string `json:"uuid"` - CPU int `json:"cpu"` - Memory int64 `json:"memory"` - DiskSize int64 `json:"diskSize"` - DiskBus string `json:"diskBus"` - DiskPath string `json:"diskPath"` - StoragePool string `json:"storagePool"` - ISOPaths []string `json:"isoPaths" gorm:"serializer:json"` - ImagePath string `json:"imagePath"` - Network string `json:"network"` - BootOrder string `json:"bootOrder"` - AutoStart bool `json:"autoStart"` - Status string `json:"status"` - TaskID string `json:"taskID"` - CreateTaskID string `json:"createTaskID"` - Description string `json:"description"` + Name string `json:"name"` + UUID string `json:"uuid"` + CPU int `json:"cpu"` + Memory int64 `json:"memory"` + DiskSize int64 `json:"diskSize"` + DiskBus string `json:"diskBus"` + DiskPath string `json:"diskPath"` + StoragePool string `json:"storagePool"` + DataStoragePools []string `json:"dataStoragePools" gorm:"serializer:json"` + ISOPaths []string `json:"isoPaths" gorm:"serializer:json"` + ImagePath string `json:"imagePath"` + Network string `json:"network"` + BootOrder string `json:"bootOrder"` + AutoStart bool `json:"autoStart"` + Status string `json:"status"` + TaskID string `json:"taskID"` + CreateTaskID string `json:"createTaskID"` + Description string `json:"description"` } type VMTemplate struct { diff --git a/agent/app/repo/vm.go b/agent/app/repo/vm.go index 6411144eb..6958bfc93 100644 --- a/agent/app/repo/vm.go +++ b/agent/app/repo/vm.go @@ -95,12 +95,14 @@ func (v *VMRepo) Create(vm *model.VirtualMachine) error { } func (v *VMRepo) Update(id uint, vars map[string]interface{}) error { - if paths, ok := vars["iso_paths"].([]string); ok { - data, err := json.Marshal(paths) - if err != nil { - return err + for _, key := range []string{"iso_paths", "data_storage_pools"} { + if paths, ok := vars[key].([]string); ok { + data, err := json.Marshal(paths) + if err != nil { + return err + } + vars[key] = string(data) } - vars["iso_paths"] = string(data) } return global.DB.Model(&model.VirtualMachine{}).Where("id = ?", id).Updates(vars).Error } diff --git a/agent/app/service/vm-network.go b/agent/app/service/vm-network.go index 4e88ddacd..63d87fa77 100644 --- a/agent/app/service/vm-network.go +++ b/agent/app/service/vm-network.go @@ -15,6 +15,7 @@ import ( "github.com/1Panel-dev/1Panel/agent/app/repo" "github.com/1Panel-dev/1Panel/agent/buserr" "github.com/1Panel-dev/1Panel/agent/constant" + "github.com/1Panel-dev/1Panel/agent/global" "github.com/1Panel-dev/1Panel/agent/utils/vm/types" "gorm.io/gorm" ) @@ -25,6 +26,9 @@ func (v *VMService) ListNetworks() ([]dto.VMNetworkItem, error) { return nil, err } items := v.networkRecordsToItems(records) + if err := fillVMNetworkInterfaces(items, "/sys/class/net"); err != nil { + global.LOG.Warnf("[xpack] read VM network interfaces failed, retaining network metadata: %v", err) + } return items, nil } @@ -295,6 +299,56 @@ func (v *VMService) DeleteNetwork(req dto.VMResourceDelete) error { return vmRepo.DeleteNetwork(repo.WithByID(req.ID)) } +func fillVMNetworkInterfaces(items []dto.VMNetworkItem, netClassPath string) error { + interfaces, err := net.Interfaces() + if err != nil { + return err + } + byName := make(map[string]dto.VMNetworkInterfaceItem, len(interfaces)) + for _, iface := range interfaces { + addresses, err := iface.Addrs() + if err != nil { + global.LOG.Warnf("[xpack] read addresses for interface %s failed: %v", iface.Name, err) + } + item := dto.VMNetworkInterfaceItem{Name: iface.Name, Addresses: []string{}} + for _, address := range addresses { + item.Addresses = append(item.Addresses, address.String()) + } + byName[iface.Name] = item + } + for i := range items { + item := &items[i] + item.Addresses = []string{} + item.Interfaces = []dto.VMNetworkInterfaceItem{} + switch item.Type { + case "macvtap": + if iface, ok := byName[item.SourceInterface]; ok { + item.Interfaces = append(item.Interfaces, iface) + } + case "bridge": + if iface, ok := byName[item.BridgeName]; ok { + item.Addresses = iface.Addresses + } + if item.BridgeName == "" || filepath.Base(item.BridgeName) != item.BridgeName { + continue + } + members, err := os.ReadDir(filepath.Join(netClassPath, item.BridgeName, "brif")) + if err != nil { + if !os.IsNotExist(err) { + global.LOG.Warnf("[xpack] read bridge %s interfaces failed: %v", item.BridgeName, err) + } + continue + } + for _, member := range members { + if iface, ok := byName[member.Name()]; ok { + item.Interfaces = append(item.Interfaces, iface) + } + } + } + } + return nil +} + func (v *VMService) networkRecordsToItems(records []model.VMNetwork) []dto.VMNetworkItem { items := make([]dto.VMNetworkItem, 0, len(records)) vmRefs := loadVMResourceRefs("network") diff --git a/agent/app/service/vm-storage.go b/agent/app/service/vm-storage.go index ed3909513..da16c7314 100644 --- a/agent/app/service/vm-storage.go +++ b/agent/app/service/vm-storage.go @@ -343,8 +343,12 @@ func loadVMResourceRefs(resourceType string) map[string][]dto.VMResourceRef { refs[record.Network] = append(refs[record.Network], ref) } case "storagePool": - if record.StoragePool != "" { - refs[record.StoragePool] = append(refs[record.StoragePool], ref) + seen := map[string]bool{} + for _, pool := range append([]string{record.StoragePool}, record.DataStoragePools...) { + if pool != "" && !seen[pool] { + refs[pool] = append(refs[pool], ref) + seen[pool] = true + } } } } diff --git a/agent/app/service/vm.go b/agent/app/service/vm.go index 788947d1a..12a7c5d32 100644 --- a/agent/app/service/vm.go +++ b/agent/app/service/vm.go @@ -43,6 +43,7 @@ type vmLockEntry struct { // Share the lock across service instances. The metadata written before the // asynchronous task starts reserves a slot, including while a VM is creating. var vmCreateMu sync.Mutex +var vmDiskMu sync.RWMutex const ( defaultVMResourceName = "default" @@ -120,6 +121,8 @@ type IVMService interface { } func (v *VMService) ScanOrphans() ([]dto.VMOrphanItem, error) { + vmDiskMu.Lock() + defer vmDiskMu.Unlock() paths, err := protectedVMPaths(0) if err != nil { return nil, err @@ -128,6 +131,8 @@ func (v *VMService) ScanOrphans() ([]dto.VMOrphanItem, error) { } func (v *VMService) CleanOrphans(req dto.VMOrphanClean) ([]dto.VMOrphanItem, error) { + vmDiskMu.Lock() + defer vmDiskMu.Unlock() paths, err := protectedVMPaths(0) if err != nil { return nil, err @@ -481,7 +486,22 @@ func (v *VMService) Create(req dto.VMCreate, limit int) (dto.VMTaskResp, error) cfg.StoragePool = template.StoragePool } } - if err := v.validateDiskLimit(cfg.DiskSizeGiB, cfg.StoragePool); err != nil { + if cfg.StoragePool == "" { + cfg.StoragePool = defaultVMResourceName + } + if cfg.DiskSizeGiB < vmDiskMinGiB || cfg.DiskSizeGiB > 8388607 || len(req.DataDisks) > 9 { + return dto.VMTaskResp{}, buserr.WithDetail("ErrVMInvalidInput", "invalid disk capacity or disk count", nil) + } + for _, disk := range req.DataDisks { + if disk.SizeGiB < vmDiskMinGiB || disk.SizeGiB > 8388607 { + return dto.VMTaskResp{}, buserr.WithDetail("ErrVMInvalidInput", "invalid data disk capacity", nil) + } + if disk.StoragePool == "" { + disk.StoragePool = cfg.StoragePool + } + cfg.DataDisks = append(cfg.DataDisks, types.VMDataDisk(disk)) + } + if err := v.validateDiskLimit(cfg); err != nil { return dto.VMTaskResp{}, err } createMetadataReq := v.buildCreateMetadataReq(req, cfg) @@ -505,7 +525,7 @@ func (v *VMService) Create(req dto.VMCreate, limit int) (dto.VMTaskResp, error) return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(taskName, func(t *task.Task) error { - return v.withVMLock(req.Name, func() error { + return v.withVMDiskLock(req.Name, func() error { var domain dto.VMInfo var err error if req.TemplateID != 0 { @@ -573,7 +593,7 @@ func (v *VMService) CreateTemplate(req dto.VMTemplateCreate) (dto.VMTaskResp, er return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(taskName, func(t *task.Task) error { - return v.withVMLock(req.Name, func() error { + return v.withVMDiskLock(req.Name, func() error { tpl, err := v.provider.CreateTemplate(context.Background(), types.VMTemplateCreate{ Name: req.TemplateName, SourceName: req.Name, StoragePool: storagePool, }) @@ -667,7 +687,7 @@ func (v *VMService) ResizeDisk(req dto.VMDiskResize) (dto.VMTaskResp, error) { return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(taskName, func(t *task.Task) error { - return v.withVMLock(req.Name, func() error { + return v.withVMDiskLock(req.Name, func() error { domain, err := v.provider.ResizeDisk(context.Background(), req) if err != nil { return err @@ -733,7 +753,7 @@ func (v *VMService) Delete(req dto.VMDelete) (dto.VMTaskResp, error) { return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(taskName, func(t *task.Task) error { - return v.withVMLock(record.Name, func() error { + return v.withVMDiskLock(record.Name, func() error { if !v.helperExists() { if !req.Force { return buserr.New("ErrVMHelperNotFound") @@ -802,7 +822,7 @@ func (v *VMService) CreateSnapshot(req dto.VMSnapshotReq) (dto.VMTaskResp, error return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(vmSnapshotTaskName("VMSnapshotCreateStep", req), func(t *task.Task) error { - return v.withVMLock(req.Name, func() error { + return v.withVMDiskLock(req.Name, func() error { return v.provider.CreateSnapshot(context.Background(), req.Name, req.SnapshotName, req.Description) }) }, nil, 0, 30*time.Minute) @@ -823,8 +843,9 @@ func (v *VMService) RecoverSnapshot(req dto.VMSnapshotReq) (dto.VMTaskResp, erro return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(vmSnapshotTaskName("VMSnapshotRecoverStep", req), func(t *task.Task) error { - return v.withVMLock(req.Name, func() error { - if err := v.provider.RecoverSnapshot(context.Background(), req.Name, req.SnapshotName); err != nil { + return v.withVMDiskLock(req.Name, func() error { + oldRestoreDisks, err := v.provider.RecoverSnapshot(context.Background(), req.Name, req.SnapshotName) + if err != nil { return err } domain, err := v.provider.Get(context.Background(), req.Name, false) @@ -837,6 +858,17 @@ func (v *VMService) RecoverSnapshot(req dto.VMSnapshotReq) (dto.VMTaskResp, erro if err := vmRepo.Update(record.ID, map[string]interface{}{"disk_path": domain.DiskPath, "disk_size": domain.DiskSize}); err != nil { return buserr.WithErr("ErrVMSnapshotMetadataSync", err) } + if len(oldRestoreDisks) > 0 { + paths, err := protectedVMPaths(0) + if err == nil { + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) + defer cancel() + _, err = v.provider.CleanOrphans(ctx, oldRestoreDisks, paths) + } + if err != nil { + global.LOG.Warnf("[xpack] VM %s restored and metadata synced, old restore disk cleanup failed: %v", req.Name, err) + } + } return nil }) }, nil, 0, 30*time.Minute) @@ -857,7 +889,7 @@ func (v *VMService) DeleteSnapshot(req dto.VMSnapshotReq) (dto.VMTaskResp, error return dto.VMTaskResp{}, err } taskItem.AddSubTaskWithOps(vmSnapshotTaskName("VMSnapshotDeleteStep", req), func(t *task.Task) error { - return v.withVMLock(req.Name, func() error { + return v.withVMDiskLock(req.Name, func() error { return v.provider.DeleteSnapshot(context.Background(), req.Name, req.SnapshotName) }) }, nil, 0, 30*time.Minute) @@ -929,6 +961,14 @@ func (v *VMService) withVMLock(name string, fn func() error) error { return fn() } +func (v *VMService) withVMDiskLock(name string, fn func() error) error { + return v.withVMLock(name, func() error { + vmDiskMu.RLock() + defer vmDiskMu.RUnlock() + return fn() + }) +} + func (v *VMService) acquireVMLock(name string) *vmLockEntry { v.locksMu.Lock() if v.locks == nil { @@ -960,7 +1000,9 @@ func (v *VMService) withVMRenameLock(name string, newName string, fn func() erro name, newName = newName, name } return v.withVMLock(name, func() error { - return v.withVMLock(newName, fn) + lock := v.acquireVMLock(newName) + defer v.releaseVMLock(newName, lock) + return fn() }) } @@ -979,6 +1021,13 @@ func (v *VMService) saveMetadata(req dto.VMCreate, domain dto.VMInfo, taskID str ImagePath: req.ImagePath, Network: req.Network, BootOrder: req.BootOrder, AutoStart: req.AutoStart, TaskID: taskID, CreateTaskID: taskID, Description: req.Description, } + seenPools := map[string]bool{req.StoragePool: true} + for _, disk := range req.DataDisks { + if disk.StoragePool != "" && !seenPools[disk.StoragePool] { + data.DataStoragePools = append(data.DataStoragePools, disk.StoragePool) + seenPools[disk.StoragePool] = true + } + } if err == nil && record.ID != 0 { return vmRepo.Update(record.ID, metadataUpdateMap(*data)) } @@ -994,6 +1043,10 @@ func (v *VMService) buildCreateMetadataReq(req dto.VMCreate, cfg types.VMConfig) out.DiskBus = cfg.DiskBus out.DiskPath = cfg.DiskPath out.StoragePool = cfg.StoragePool + out.DataDisks = make([]dto.VMDataDisk, 0, len(cfg.DataDisks)) + for _, disk := range cfg.DataDisks { + out.DataDisks = append(out.DataDisks, dto.VMDataDisk(disk)) + } out.ISOPaths = cfg.ISOPaths out.BootOrder = cfg.BootOrder if out.StoragePool == "" { @@ -1101,22 +1154,33 @@ func vmMemoryAllocatedStatus(status string) bool { } } -func (v *VMService) validateDiskLimit(diskSizeGiB int64, storagePool string) error { - if diskSizeGiB < vmDiskMinGiB { - return buserr.WithDetail("ErrVMInvalidInput", fmt.Sprintf("disk size must be at least %d GiB", vmDiskMinGiB), nil) +func (v *VMService) validateDiskLimit(cfg types.VMConfig) error { + sizes := map[string]int64{cfg.StoragePool: cfg.DiskSizeGiB} + for _, disk := range cfg.DataDisks { + sizes[disk.StoragePool] += disk.SizeGiB } - if storagePool == "" { - storagePool = defaultVMResourceName - } - live, ok, err := v.findVMResource("storagePool", storagePool) + pools, err := v.provider.ListResources(context.Background(), "storagePool") if err != nil { return err } - if !ok || live.Available == 0 { - return nil - } - if uint64(diskSizeGiB)*bytePerGiB > live.Available { - return buserr.WithDetail("ErrVMInvalidInput", fmt.Sprintf("disk size exceeds storage pool available space: %d GiB", live.Available/bytePerGiB), nil) + for name, size := range sizes { + found := false + for _, pool := range pools { + if pool.Name != name { + continue + } + found = true + if vmResourceCreationIncomplete(pool.Status) || normalizeVMResourceStatus(pool.Status) == constant.StatusDeleted { + return buserr.WithDetail("ErrVMInvalidInput", fmt.Sprintf("storage pool %s is unavailable", name), nil) + } + if uint64(size)*bytePerGiB > pool.Available && !(pool.Status == "inactive" && pool.Available == 0) { + return buserr.WithDetail("ErrVMInvalidInput", fmt.Sprintf("disk size exceeds storage pool %s available space: %d GiB", name, pool.Available/bytePerGiB), nil) + } + break + } + if !found && name != defaultVMResourceName { + return buserr.WithDetail("ErrResourceNotExists", name, nil) + } } return nil } @@ -1131,7 +1195,11 @@ func (v *VMService) syncCreatedDefaultResourceMetadata(cfg types.VMConfig) { if storagePool == "" { storagePool = defaultVMResourceName } - if storagePool == defaultVMResourceName { + usesDefault := storagePool == defaultVMResourceName + for _, disk := range cfg.DataDisks { + usesDefault = usesDefault || disk.StoragePool == defaultVMResourceName + } + if usesDefault { if err := v.upsertStorageMetadata(defaultVMResourceName); err != nil { global.LOG.Warnf("[xpack] sync default VM storage metadata failed: %v", err) } @@ -1254,7 +1322,7 @@ func (v *VMService) renameMetadata(record model.VirtualMachine, req dto.VMRename func metadataUpdateMap(vm model.VirtualMachine) map[string]interface{} { return map[string]interface{}{ "uuid": vm.UUID, "cpu": vm.CPU, "memory": vm.Memory, "disk_size": vm.DiskSize, "disk_bus": vm.DiskBus, - "disk_path": vm.DiskPath, "storage_pool": vm.StoragePool, "iso_paths": vm.ISOPaths, + "disk_path": vm.DiskPath, "storage_pool": vm.StoragePool, "data_storage_pools": vm.DataStoragePools, "iso_paths": vm.ISOPaths, "image_path": vm.ImagePath, "network": vm.Network, "boot_order": vm.BootOrder, "auto_start": vm.AutoStart, "task_id": vm.TaskID, "create_task_id": vm.CreateTaskID, "description": vm.Description, } diff --git a/agent/init/migration/migrate.go b/agent/init/migration/migrate.go index c2dc3ffc9..6fa7f3c32 100644 --- a/agent/init/migration/migrate.go +++ b/agent/init/migration/migrate.go @@ -123,6 +123,7 @@ func agentDBMigrations() []*gormigrate.Migration { migrations.AddAgentAccountType, migrations.AddGPUGroup, migrations.AddAgentAccountStatus, + migrations.AddVMDataStoragePools, } } diff --git a/agent/init/migration/migrations/vm.go b/agent/init/migration/migrations/vm.go index 8ef5c41ab..f38fba1fe 100644 --- a/agent/init/migration/migrations/vm.go +++ b/agent/init/migration/migrations/vm.go @@ -20,6 +20,13 @@ var MigrateVMDatabase = &gormigrate.Migration{ }, } +var AddVMDataStoragePools = &gormigrate.Migration{ + ID: "20261118-add-vm-data-storage-pools", + Migrate: func(db *gorm.DB) error { + return db.AutoMigrate(&model.VirtualMachine{}) + }, +} + func migrateVMDatabase(db *gorm.DB, dbDir string) error { var legacy *gorm.DB legacyPath := filepath.Join(dbDir, "xpack.db") diff --git a/agent/utils/vm/helper/provider.go b/agent/utils/vm/helper/provider.go index 7618a4c06..4b815e54b 100644 --- a/agent/utils/vm/helper/provider.go +++ b/agent/utils/vm/helper/provider.go @@ -245,7 +245,14 @@ func (p *Provider) ListSnapshots(ctx context.Context, name string) ([]dto.VMSnap } out := make([]dto.VMSnapshotInfo, 0, len(items)) for _, item := range items { - out = append(out, dto.VMSnapshotInfo(item)) + result := dto.VMSnapshotInfo{ + Name: item.Name, Description: item.Description, CreatedAt: item.CreatedAt, State: item.State, + Parent: item.Parent, Path: item.Path, Size: item.Size, Current: item.Current, Children: item.Children, + } + for _, disk := range item.Disks { + result.Disks = append(result.Disks, dto.VMSnapshotDisk(disk)) + } + out = append(out, result) } return out, nil } @@ -256,8 +263,16 @@ func (p *Provider) CreateSnapshot(ctx context.Context, name string, snapshotName }, nil) } -func (p *Provider) RecoverSnapshot(ctx context.Context, name string, snapshotName string) error { - return p.call(ctx, protocol.ActionRecoverSnapshot, protocol.VMSnapshotReq{Name: name, SnapshotName: snapshotName}, nil) +func (p *Provider) RecoverSnapshot(ctx context.Context, name string, snapshotName string) ([]dto.VMOrphanItem, error) { + var items []protocol.VMOrphanItem + if err := p.call(ctx, protocol.ActionRecoverSnapshot, protocol.VMSnapshotReq{Name: name, SnapshotName: snapshotName}, &items); err != nil { + return nil, err + } + out := make([]dto.VMOrphanItem, 0, len(items)) + for _, item := range items { + out = append(out, dto.VMOrphanItem{Type: item.Type, Path: item.Path, Size: item.Size, ModifiedAt: item.ModifiedAt}) + } + return out, nil } func (p *Provider) DeleteSnapshot(ctx context.Context, name string, snapshotName string) error { @@ -521,8 +536,12 @@ func findHelperPath() (string, error) { } func toProtocolConfig(cfg types.VMConfig) protocol.VMConfig { + disks := make([]protocol.VMDataDisk, 0, len(cfg.DataDisks)) + for _, disk := range cfg.DataDisks { + disks = append(disks, protocol.VMDataDisk(disk)) + } return protocol.VMConfig{ - Name: cfg.Name, CPU: cfg.CPU, MemoryMiB: cfg.MemoryMiB, DiskSizeGiB: cfg.DiskSizeGiB, + Name: cfg.Name, CPU: cfg.CPU, MemoryMiB: cfg.MemoryMiB, DiskSizeGiB: cfg.DiskSizeGiB, DataDisks: disks, DiskBus: cfg.DiskBus, DiskPath: cfg.DiskPath, StoragePool: cfg.StoragePool, ISOPaths: cfg.ISOPaths, ImagePath: cfg.ImagePath, Network: cfg.Network, BootOrder: cfg.BootOrder, AutoStart: cfg.AutoStart, StartAfterCreate: cfg.StartAfterCreate, diff --git a/agent/utils/vm/protocol/protocol.go b/agent/utils/vm/protocol/protocol.go index 6a8214b97..081772b81 100644 --- a/agent/utils/vm/protocol/protocol.go +++ b/agent/utils/vm/protocol/protocol.go @@ -3,9 +3,9 @@ package protocol // VM helper protocol definition shared by the core caller and helper binary. const ( - Version = "1.2.0" - API = "1.2.0" - MinVersion = "1.2.0" + Version = "1.5.0" + API = "1.5.0" + MinVersion = "1.5.0" DefaultURI = "qemu:///system" HelperBinary = "1panel-kvm" ) @@ -77,20 +77,26 @@ type VersionInfo struct { API string `json:"api"` } +type VMDataDisk struct { + SizeGiB int64 `json:"sizeGiB"` + StoragePool string `json:"storagePool,omitempty"` +} + type VMConfig struct { - Name string `json:"name"` - CPU int `json:"cpu"` - MemoryMiB int64 `json:"memoryMiB"` - DiskSizeGiB int64 `json:"diskSizeGiB"` - DiskBus string `json:"diskBus,omitempty"` - DiskPath string `json:"diskPath,omitempty"` - StoragePool string `json:"storagePool,omitempty"` - ISOPaths []string `json:"isoPaths"` - ImagePath string `json:"imagePath,omitempty"` - Network string `json:"network"` - BootOrder string `json:"bootOrder,omitempty"` - StartAfterCreate bool `json:"startAfterCreate"` - AutoStart bool `json:"autoStart"` + DataDisks []VMDataDisk `json:"dataDisks,omitempty"` + Name string `json:"name"` + CPU int `json:"cpu"` + MemoryMiB int64 `json:"memoryMiB"` + DiskSizeGiB int64 `json:"diskSizeGiB"` + DiskBus string `json:"diskBus,omitempty"` + DiskPath string `json:"diskPath,omitempty"` + StoragePool string `json:"storagePool,omitempty"` + ISOPaths []string `json:"isoPaths"` + ImagePath string `json:"imagePath,omitempty"` + Network string `json:"network"` + BootOrder string `json:"bootOrder,omitempty"` + StartAfterCreate bool `json:"startAfterCreate"` + AutoStart bool `json:"autoStart"` } type VMInfoReq struct { @@ -126,16 +132,22 @@ type VMSnapshotReq struct { Description string `json:"description,omitempty"` } +type VMSnapshotDisk struct { + Target string `json:"target"` + Path string `json:"path"` +} + type VMSnapshotInfo struct { - Name string `json:"name"` - Description string `json:"description"` - CreatedAt int64 `json:"createdAt"` - State string `json:"state"` - Parent string `json:"parent"` - Path string `json:"path"` - Size int64 `json:"size"` - Current bool `json:"current"` - Children int `json:"children"` + Disks []VMSnapshotDisk `json:"disks"` + Name string `json:"name"` + Description string `json:"description"` + CreatedAt int64 `json:"createdAt"` + State string `json:"state"` + Parent string `json:"parent"` + Path string `json:"path"` + Size int64 `json:"size"` + Current bool `json:"current"` + Children int `json:"children"` } type VMTemplateCreate struct { @@ -266,6 +278,7 @@ type VMInfo struct { } type VMDisk struct { + System bool `json:"system"` Capacity int64 `json:"capacity"` Format string `json:"format"` ReadOnly bool `json:"readOnly"` diff --git a/agent/utils/vm/types/vm.go b/agent/utils/vm/types/vm.go index fb1c9f5f9..d60435e33 100644 --- a/agent/utils/vm/types/vm.go +++ b/agent/utils/vm/types/vm.go @@ -1,6 +1,12 @@ package types +type VMDataDisk struct { + SizeGiB int64 + StoragePool string +} + type VMConfig struct { + DataDisks []VMDataDisk Name string CPU int MemoryMiB int64 diff --git a/agent/utils/vm/vm_provider.go b/agent/utils/vm/vm_provider.go index 26a4c5abb..105946863 100644 --- a/agent/utils/vm/vm_provider.go +++ b/agent/utils/vm/vm_provider.go @@ -30,7 +30,7 @@ type VMProvider interface { Delete(ctx context.Context, name string, force bool, deleteDisk bool, protectedPaths []string) error ListSnapshots(ctx context.Context, name string) ([]dto.VMSnapshotInfo, error) CreateSnapshot(ctx context.Context, name string, snapshotName string, description string) error - RecoverSnapshot(ctx context.Context, name string, snapshotName string) error + RecoverSnapshot(ctx context.Context, name string, snapshotName string) ([]dto.VMOrphanItem, error) DeleteSnapshot(ctx context.Context, name string, snapshotName string) error Start(ctx context.Context, name string) error Shutdown(ctx context.Context, name string) error diff --git a/frontend/src/api/interface/vm.ts b/frontend/src/api/interface/vm.ts index f7de38467..cb282c6cf 100644 --- a/frontend/src/api/interface/vm.ts +++ b/frontend/src/api/interface/vm.ts @@ -39,6 +39,7 @@ export namespace VM { } export interface Disk { + system: boolean; capacity: number; format: string; readOnly: boolean; @@ -124,7 +125,13 @@ export namespace VM { description: string; } + export interface DataDisk { + sizeGiB: number; + storagePool: string; + } + export interface Create { + dataDisks?: DataDisk[]; taskID?: string; name: string; cpu: number; @@ -215,6 +222,7 @@ export namespace VM { } export interface SnapshotItem { + disks?: { target: string; path: string }[]; name: string; description: string; createdAt: number; @@ -294,6 +302,8 @@ export namespace VM { } export interface NetworkItem { + addresses?: string[]; + interfaces?: NetworkInterfaceItem[]; id: number; name: string; type: 'nat' | 'bridge' | 'macvtap' | string; diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 20b37a4a5..f2a89330d 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -8228,6 +8228,11 @@ const message = { createFromTemplate: 'Create from template', template: 'Template', templateName: 'Template Name', + dataDisks: 'Data disks', + dataDiskHelper: + 'Data disks are created empty. Select a storage pool for each disk; the bus type is shared with the system disk. Up to 9 data disks can be added.', + templateSystemDiskHelper: + 'Templates copy only the system disk, excluding data disk contents. You can add empty data disks when creating a VM from a template. Check /etc/fstab mounts and database or application paths that depend on data disks. New disk UUIDs may differ; the panel does not modify guest configuration automatically.', convertToTemplate: 'Convert to Template', sourceVM: 'Source VM', templateSize: 'Template Size', @@ -8345,7 +8350,7 @@ const message = { currentSnapshot: 'Current', snapshotEmpty: 'No snapshots', snapshotHelper: - 'A snapshot saves the current VM state as a restore point. Subsequent data changes are recorded in a delta file without changing the original disk. Restoring a snapshot returns the VM to that point in time.', + 'Snapshots capture and restore all managed writable disks together, excluding memory. Shut down the VM before restoring; its disk set must match the snapshot. Shared or unsupported writable disks prevent snapshot creation.', snapshotOperationHelper: 'The current snapshot cannot be deleted. Snapshots can be recovered only when the virtual machine is shut off.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts index 8c2752472..8852041ad 100644 --- a/frontend/src/lang/modules/es-es.ts +++ b/frontend/src/lang/modules/es-es.ts @@ -8383,6 +8383,11 @@ const message = { createFromTemplate: 'Crear desde plantilla', template: 'Plantilla', templateName: 'Nombre de la plantilla', + dataDisks: 'Discos de datos', + dataDiskHelper: + 'Los discos de datos se crean vacíos. Puede elegir un grupo de almacenamiento para cada disco; el tipo de bus es el mismo que el del disco del sistema. Se pueden añadir hasta 9 discos.', + templateSystemDiskHelper: + 'Las plantillas copian solo el disco del sistema, sin los datos de otros discos. Al crear una VM desde una plantilla puede añadir discos de datos vacíos. Revise los montajes de /etc/fstab y las rutas de bases de datos o aplicaciones que dependan de esos discos. Los UUID pueden cambiar; el panel no modifica automáticamente la configuración del invitado.', convertToTemplate: 'Convertir en plantilla', sourceVM: 'VM de origen', templateSize: 'Tamaño de la plantilla', @@ -8503,7 +8508,7 @@ const message = { currentSnapshot: 'Actual', snapshotEmpty: 'No hay instantáneas', snapshotHelper: - 'Una instantánea guarda el estado actual de la VM como punto de restauración. Los cambios posteriores se registran en un archivo delta sin modificar el disco original. Al restaurarla, la VM vuelve a ese momento.', + 'Las instantáneas guardan y restauran juntos todos los discos administrados con escritura, sin incluir la memoria. Apague la VM antes de restaurar; los discos deben coincidir con la instantánea. Los discos compartidos o no compatibles con escritura impiden crear instantáneas.', snapshotOperationHelper: 'La instantánea actual no se puede eliminar. Las instantáneas solo se pueden restaurar cuando la máquina virtual está apagada.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/fa.ts b/frontend/src/lang/modules/fa.ts index 2a3c3d531..8fe3d1045 100644 --- a/frontend/src/lang/modules/fa.ts +++ b/frontend/src/lang/modules/fa.ts @@ -8185,6 +8185,11 @@ const message = { createFromTemplate: 'ایجاد از قالب', template: 'قالب', templateName: 'نام قالب', + dataDisks: 'دیسک‌های داده', + dataDiskHelper: + 'دیسک‌های داده به‌صورت خالی ایجاد می‌شوند. برای هر دیسک می‌توانید یک مخزن ذخیره‌سازی انتخاب کنید؛ نوع گذرگاه با دیسک سیستم یکسان است. حداکثر ۹ دیسک قابل افزودن است.', + templateSystemDiskHelper: + 'قالب فقط دیسک سیستم را کپی می‌کند و محتوای دیسک‌های داده را شامل نمی‌شود. هنگام ایجاد ماشین از قالب می‌توانید دیسک‌های خالی اضافه کنید. اتصال‌های /etc/fstab و وابستگی مسیرهای پایگاه داده و برنامه‌ها به دیسک‌های داده را بررسی کنید. UUID دیسک‌های جدید ممکن است متفاوت باشد؛ پنل تنظیمات مهمان را خودکار تغییر نمی‌دهد.', convertToTemplate: 'تبدیل به قالب', sourceVM: 'ماشین مجازی منبع', templateSize: 'اندازه قالب', @@ -8303,7 +8308,7 @@ const message = { currentSnapshot: 'فعلی', snapshotEmpty: 'اسنپ‌شاتی وجود ندارد', snapshotHelper: - 'اسنپ‌شات وضعیت فعلی VM را به‌عنوان نقطه بازیابی ذخیره می‌کند. تغییرات بعدی بدون تغییر دیسک اصلی در یک فایل دلتا ثبت می‌شوند. بازیابی اسنپ‌شات، VM را به همان زمان بازمی‌گرداند.', + 'اسنپ‌شات تمام دیسک‌های مدیریت‌شده قابل نوشتن را با هم ذخیره و بازیابی می‌کند و شامل حافظه نیست. پیش از بازیابی ماشین را خاموش کنید؛ مجموعه دیسک‌ها باید با اسنپ‌شات یکسان باشد. دیسک‌های اشتراکی یا پشتیبانی‌نشده قابل نوشتن مانع ایجاد اسنپ‌شات می‌شوند.', snapshotOperationHelper: 'اسنپ‌شات فعلی قابل حذف نیست. بازیابی اسنپ‌شات فقط زمانی ممکن است که ماشین مجازی خاموش باشد.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index 9d5b0d765..31baa0a0a 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -8217,6 +8217,11 @@ const message = { createFromTemplate: 'テンプレートから作成', template: 'テンプレート', templateName: 'テンプレート名', + dataDisks: 'データディスク', + dataDiskHelper: + 'データディスクは空の状態で作成されます。各ディスクのストレージプールを選択でき、バスの種類はシステムディスクと共通です。最大 9 台追加できます。', + templateSystemDiskHelper: + 'テンプレートにはシステムディスクのみがコピーされ、データディスクの内容は含まれません。テンプレートからの作成時に空のデータディスクを追加できます。/etc/fstab のマウント設定やデータベース、アプリのパス依存を確認してください。新しいディスクの UUID は異なる場合があります。ゲスト設定は自動変更されません。', convertToTemplate: 'テンプレートに変換', sourceVM: '元の VM', templateSize: 'テンプレートサイズ', @@ -8336,7 +8341,7 @@ const message = { currentSnapshot: '現在', snapshotEmpty: 'スナップショットがありません', snapshotHelper: - 'スナップショットは現在の VM 状態を復元ポイントとして保存します。以降のデータ変更は元のディスクを変更せず差分ファイルに記録されます。復元すると VM はその時点の状態に戻ります。', + 'スナップショットは管理対象の書き込み可能な全ディスクを一括保存・復元します。メモリは含みません。復元には停止が必要で、ディスク構成がスナップショットと一致する必要があります。共有または非対応の書き込み可能ディスクがある場合は作成できません。', snapshotOperationHelper: '現在のスナップショットは削除できません。スナップショットを復元できるのは仮想マシンが停止している場合のみです。', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 3577287b3..e853e8a34 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -8052,6 +8052,11 @@ const message = { createFromTemplate: '템플릿에서 생성', template: '템플릿', templateName: '템플릿 이름', + dataDisks: '데이터 디스크', + dataDiskHelper: + '데이터 디스크는 빈 디스크로 생성됩니다. 디스크마다 스토리지 풀을 선택할 수 있으며 버스 유형은 시스템 디스크와 동일합니다. 최대 9개까지 추가할 수 있습니다.', + templateSystemDiskHelper: + '템플릿은 시스템 디스크만 복사하며 데이터 디스크 내용은 포함하지 않습니다. 템플릿으로 생성할 때 빈 데이터 디스크를 추가할 수 있습니다. /etc/fstab 마운트와 데이터베이스 및 앱 경로의 데이터 디스크 의존성을 확인하세요. 새 디스크의 UUID가 다를 수 있으며 게스트 설정은 자동 변경되지 않습니다.', convertToTemplate: '템플릿으로 변환', sourceVM: '원본 VM', templateSize: '템플릿 크기', @@ -8168,7 +8173,7 @@ const message = { currentSnapshot: '현재', snapshotEmpty: '스냅샷 없음', snapshotHelper: - '스냅샷은 현재 VM 상태를 복원 지점으로 저장합니다. 이후 데이터 변경은 원본 디스크를 변경하지 않고 델타 파일에 기록됩니다. 스냅샷을 복구하면 VM이 해당 시점의 상태로 돌아갑니다.', + '스냅샷은 관리되는 모든 쓰기 가능한 디스크를 함께 저장하고 복원하며 메모리는 포함하지 않습니다. 복원 전 VM을 종료해야 하며 디스크 구성이 스냅샷과 일치해야 합니다. 공유 또는 미지원 쓰기 가능 디스크가 있으면 생성할 수 없습니다.', snapshotOperationHelper: '현재 스냅샷은 삭제할 수 없습니다. 가상 머신이 종료된 경우에만 스냅샷을 복구할 수 있습니다.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/lo.ts b/frontend/src/lang/modules/lo.ts index 51ef0cb50..00a1d238a 100644 --- a/frontend/src/lang/modules/lo.ts +++ b/frontend/src/lang/modules/lo.ts @@ -7949,6 +7949,11 @@ const message = { createFromTemplate: 'ສ້າງຈາກແມ່ແບບ', template: 'ແມ່ແບບ', templateName: 'ຊື່ແມ່ແບບ', + dataDisks: 'ດິສກ໌ຂໍ້ມູນ', + dataDiskHelper: + 'ດິສກ໌ຂໍ້ມູນຈະຖືກສ້າງເປັນດິສກ໌ເປົ່າ. ສາມາດເລືອກພູນຈັດເກັບໃຫ້ແຕ່ລະດິສກ໌ໄດ້ ແລະ ໃຊ້ປະເພດບັສດຽວກັບດິສກ໌ລະບົບ. ເພີ່ມໄດ້ສູງສຸດ 9 ດິສກ໌.', + templateSystemDiskHelper: + 'ແມ່ແບບຄັດລອກສະເພາະດິສກ໌ລະບົບ ບໍ່ລວມເນື້ອຫາດິສກ໌ຂໍ້ມູນ. ສາມາດເພີ່ມດິສກ໌ຫວ່າງເມື່ອສ້າງ VM ຈາກແມ່ແບບ. ກວດສອບການເຊື່ອມຕໍ່ໃນ /etc/fstab ແລະ ເສັ້ນທາງຖານຂໍ້ມູນ ຫຼື ແອັບທີ່ອາໄສດິສກ໌ຂໍ້ມູນ. UUID ຂອງດິສກ໌ໃໝ່ອາດແຕກຕ່າງ; ແຜງຄວບຄຸມບໍ່ປ່ຽນການຕັ້ງຄ່າໃນ VM ອັດຕະໂນມັດ.', convertToTemplate: 'ປ່ຽນເປັນແມ່ແບບ', sourceVM: 'VM ຕົ້ນທາງ', templateSize: 'ຂະໜາດແມ່ແບບ', @@ -8065,7 +8070,7 @@ const message = { currentSnapshot: 'ປັດຈຸບັນ', snapshotEmpty: 'ບໍ່ມີສະແນັບຊັອດ', snapshotHelper: - 'ສະແນັບຊັອດຈະບັນທຶກສະຖານະ VM ປັດຈຸບັນເປັນຈຸດກູ້ຄືນ. ການປ່ຽນແປງຂໍ້ມູນຕໍ່ມາຈະຖືກບັນທຶກໃນໄຟລ໌ Delta ໂດຍບໍ່ປ່ຽນດິສກ໌ຕົ້ນສະບັບ. ການກູ້ຄືນສະແນັບຊັອດຈະນຳ VM ກັບໄປຈຸດເວລານັ້ນ.', + 'ສະແນັບຊັອດບັນທຶກ ແລະ ກູ້ຄືນດິສກ໌ທີ່ຈັດການແລະຂຽນໄດ້ທັງໝົດພ້ອມກັນ ບໍ່ລວມໜ່ວຍຄວາມຈຳ. ປິດ VM ກ່ອນກູ້ຄືນ ແລະ ຊຸດດິສກ໌ຕ້ອງກົງກັບສະແນັບຊັອດ. ດິສກ໌ທີ່ແບ່ງປັນ ຫຼື ບໍ່ຮອງຮັບຈະຂັດຂວາງການສ້າງ.', snapshotOperationHelper: 'ບໍ່ສາມາດລຶບສະແນັບຊັອດປັດຈຸບັນໄດ້. ກູ້ຄືນສະແນັບຊັອດໄດ້ສະເພາະເມື່ອປິດເຄື່ອງສະເໝືອນ.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index e1c89aa72..d189ca40c 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -8355,6 +8355,11 @@ const message = { createFromTemplate: 'Cipta daripada templat', template: 'Templat', templateName: 'Nama templat', + dataDisks: 'Cakera data', + dataDiskHelper: + 'Cakera data dicipta kosong. Pilih kumpulan storan bagi setiap cakera; jenis bas adalah sama dengan cakera sistem. Sehingga 9 cakera boleh ditambah.', + templateSystemDiskHelper: + 'Templat hanya menyalin cakera sistem tanpa kandungan cakera data. Cakera data kosong boleh ditambah semasa mencipta VM daripada templat. Semak pelekap /etc/fstab serta laluan pangkalan data dan aplikasi yang bergantung pada cakera data. UUID cakera baharu mungkin berbeza; panel tidak mengubah konfigurasi tetamu secara automatik.', convertToTemplate: 'Tukar kepada templat', sourceVM: 'VM sumber', templateSize: 'Saiz templat', @@ -8471,7 +8476,7 @@ const message = { currentSnapshot: 'Semasa', snapshotEmpty: 'Tiada syot kilat', snapshotHelper: - 'Syot kilat menyimpan keadaan semasa VM sebagai titik pemulihan. Perubahan data seterusnya direkodkan dalam fail delta tanpa mengubah cakera asal. Memulihkan syot kilat mengembalikan VM ke keadaan tersebut.', + 'Petikan menyimpan dan memulihkan semua cakera terurus yang boleh ditulis bersama-sama, tanpa memori. Matikan VM sebelum pemulihan; set cakera mesti sepadan dengan petikan. Cakera boleh tulis yang dikongsi atau tidak disokong menghalang penciptaan petikan.', snapshotOperationHelper: 'Syot kilat semasa tidak boleh dipadam. Syot kilat hanya boleh dipulihkan apabila mesin maya dimatikan.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 779cf7326..4154cf1c8 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -8415,6 +8415,11 @@ const message = { createFromTemplate: 'Criar a partir de modelo', template: 'Modelo', templateName: 'Nome do modelo', + dataDisks: 'Discos de dados', + dataDiskHelper: + 'Os discos de dados são criados vazios. Selecione um pool de armazenamento para cada disco; o tipo de barramento é o mesmo do disco do sistema. É possível adicionar até 9 discos.', + templateSystemDiskHelper: + 'Os modelos copiam apenas o disco do sistema, sem o conteúdo dos discos de dados. Ao criar uma VM a partir de um modelo, você pode adicionar discos vazios. Verifique as montagens em /etc/fstab e as dependências de caminhos de bancos de dados e aplicativos. Os UUIDs podem mudar; o painel não altera automaticamente a configuração do sistema convidado.', convertToTemplate: 'Converter em modelo', sourceVM: 'VM de origem', templateSize: 'Tamanho do modelo', @@ -8532,7 +8537,7 @@ const message = { currentSnapshot: 'Atual', snapshotEmpty: 'Nenhum snapshot', snapshotHelper: - 'Um snapshot salva o estado atual da VM como ponto de restauração. As alterações posteriores são registradas em um arquivo delta sem modificar o disco original. Restaurar um snapshot devolve a VM a esse estado.', + 'Os snapshots salvam e restauram todos os discos gerenciados graváveis em conjunto, sem incluir a memória. Desligue a VM antes de restaurar; o conjunto de discos deve corresponder ao snapshot. Discos graváveis compartilhados ou incompatíveis impedem a criação.', snapshotOperationHelper: 'O snapshot atual não pode ser excluído. Snapshots só podem ser restaurados quando a máquina virtual estiver desligada.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 6df305d0c..536bdd502 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -8377,6 +8377,11 @@ const message = { createFromTemplate: 'Создать из шаблона', template: 'Шаблон', templateName: 'Имя шаблона', + dataDisks: 'Диски данных', + dataDiskHelper: + 'Диски данных создаются пустыми. Для каждого диска можно выбрать пул хранения; тип шины совпадает с системным диском. Можно добавить до 9 дисков.', + templateSystemDiskHelper: + 'В шаблон копируется только системный диск, без содержимого дисков данных. При создании ВМ из шаблона можно добавить пустые диски. Проверьте монтирования в /etc/fstab и зависимости путей баз данных и приложений от дисков данных. UUID новых дисков могут отличаться; панель не изменяет настройки гостевой системы автоматически.', convertToTemplate: 'Преобразовать в шаблон', sourceVM: 'Исходная ВМ', templateSize: 'Размер шаблона', @@ -8495,7 +8500,7 @@ const message = { currentSnapshot: 'Текущий', snapshotEmpty: 'Нет снимков', snapshotHelper: - 'Снимок сохраняет текущее состояние ВМ как точку восстановления. Последующие изменения записываются в разностный файл без изменения исходного диска. Восстановление снимка возвращает ВМ к этому состоянию.', + 'Снимки сохраняют и восстанавливают все управляемые диски с доступом на запись вместе, без памяти. Перед восстановлением выключите ВМ; набор дисков должен совпадать со снимком. Общие или неподдерживаемые диски с доступом на запись блокируют создание снимка.', snapshotOperationHelper: 'Текущий снимок нельзя удалить. Восстановить снимок можно только при выключенной виртуальной машине.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 1e19c7a32..b897ef03c 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -8363,6 +8363,11 @@ const message = { createFromTemplate: 'Şablondan oluştur', template: 'Şablon', templateName: 'Şablon adı', + dataDisks: 'Veri diskleri', + dataDiskHelper: + 'Veri diskleri boş oluşturulur. Her disk için bir depolama havuzu seçilebilir; veri yolu türü sistem diskiyle aynıdır. En fazla 9 disk eklenebilir.', + templateSystemDiskHelper: + 'Şablonlar yalnızca sistem diskini kopyalar; veri disklerinin içeriği dahil edilmez. Şablondan VM oluştururken boş veri diskleri ekleyebilirsiniz. /etc/fstab bağlamalarını ve veri disklerine bağımlı veritabanı veya uygulama yollarını kontrol edin. Yeni disklerin UUID değerleri farklı olabilir; panel konuk yapılandırmasını otomatik değiştirmez.', convertToTemplate: 'Şablona dönüştür', sourceVM: 'Kaynak VM', templateSize: 'Şablon boyutu', @@ -8481,7 +8486,7 @@ const message = { currentSnapshot: 'Geçerli', snapshotEmpty: 'Anlık görüntü yok', snapshotHelper: - 'Anlık görüntü, geçerli VM durumunu geri yükleme noktası olarak kaydeder. Sonraki veri değişiklikleri özgün diski değiştirmeden bir fark dosyasına kaydedilir. Anlık görüntünün geri yüklenmesi VM’yi bu duruma döndürür.', + 'Anlık görüntüler, yönetilen tüm yazılabilir diskleri birlikte kaydeder ve geri yükler; bellek dahil değildir. Geri yüklemeden önce VM kapatılmalı ve disk kümesi anlık görüntüyle eşleşmelidir. Paylaşılan veya desteklenmeyen yazılabilir diskler oluşturmayı engeller.', snapshotOperationHelper: 'Geçerli anlık görüntü silinemez. Anlık görüntüler yalnızca sanal makine kapalıyken geri yüklenebilir.', snapshotRecoverConfirm: diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index f2e91a8d7..6d2343847 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -7614,6 +7614,11 @@ const message = { createFromTemplate: '從範本啟動', template: '範本', templateName: '範本名稱', + dataDisks: '資料磁碟', + dataDiskHelper: + '資料磁碟建立為空白磁碟,可分別選擇儲存池,與系統磁碟使用相同的匯流排類型;最多可新增 9 個。', + templateSystemDiskHelper: + '範本僅複製系統磁碟,不包含資料磁碟內容。從範本建立時可新增空白資料磁碟。請檢查 /etc/fstab 掛載設定及資料庫、應用程式路徑對資料磁碟的依賴;新磁碟的 UUID 可能不同,面板不會自動修改客體設定。', convertToTemplate: '轉為範本', sourceVM: '來源虛擬機', templateSize: '範本大小', @@ -7725,7 +7730,7 @@ const message = { currentSnapshot: '目前', snapshotEmpty: '暫無快照', snapshotHelper: - '快照會將虛擬機目前狀態儲存為還原點,後續資料變更會記錄在差異檔案中,不會影響原始磁碟。還原快照時,虛擬機會回到該時間點狀態。', + '快照統一儲存和還原所有受管理的可寫磁碟,不包含記憶體。還原前需關機,且磁碟集合必須與快照一致。共用或不支援快照的可寫磁碟會阻止建立快照。', snapshotOperationHelper: '目前快照無法刪除;僅能在虛擬機關機時還原快照。', snapshotRecoverConfirm: '確認將虛擬機 [{1}] 恢復到快照 [{0}]?恢復後虛擬機磁碟會回到該快照狀態。', interface: '網路介面', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index eaf2beb99..f59acf7b8 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -7669,6 +7669,10 @@ const message = { createFromTemplate: '从模板启动', template: '模板', templateName: '模板名称', + dataDisks: '数据盘', + dataDiskHelper: '数据盘创建为空盘,可分别选择存储池,与系统盘使用相同的总线类型;最多可添加 9 块。', + templateSystemDiskHelper: + '模板仅复制系统盘,不包含数据盘内容。从模板创建时可添加空白数据盘。请检查系统盘中的 /etc/fstab 挂载配置及数据库、应用路径对数据盘的依赖;新磁盘的 UUID 可能不同,面板不会自动修改客户机配置。', convertToTemplate: '转为模板', sourceVM: '来源虚拟机', templateSize: '模板大小', @@ -7780,7 +7784,7 @@ const message = { currentSnapshot: '当前', snapshotEmpty: '暂无快照', snapshotHelper: - '快照会保存虚拟机当前状态作为还原点,后续数据变化会记录在差分文件中,不影响原始磁盘。恢复快照时,虚拟机会回到该时间点状态。', + '快照统一保存和恢复全部受管理的可写磁盘,不包含内存。恢复前需关机,且磁盘集合必须与快照一致。共享盘或不支持快照的可写磁盘会阻止创建快照。', snapshotOperationHelper: '当前快照无法删除;仅可在虚拟机关机时恢复快照。', snapshotRecoverConfirm: '确认将虚拟机 [{1}] 恢复到快照 [{0}]?恢复后虚拟机磁盘会回到该快照状态。', interface: '网络接口', diff --git a/frontend/src/views/vm/list/disks/index.vue b/frontend/src/views/vm/list/disks/index.vue index c4d45930c..684ae2d4c 100644 --- a/frontend/src/views/vm/list/disks/index.vue +++ b/frontend/src/views/vm/list/disks/index.vue @@ -13,7 +13,12 @@ {{ $t('commons.button.refresh') }} - + + + diff --git a/frontend/src/views/vm/list/operate/index.vue b/frontend/src/views/vm/list/operate/index.vue index 1f2b39960..1e339e976 100644 --- a/frontend/src/views/vm/list/operate/index.vue +++ b/frontend/src/views/vm/list/operate/index.vue @@ -25,6 +25,13 @@ + - - - - - +
+ + + + {{ option.value === 'other' ? $t('xpack.vm.osOther') : option.label }} + + +
@@ -78,12 +95,26 @@ + class="vm-network-option" + > +
+ {{ item.name }} + {{ item.typeLabel }} +
+
+ {{ detail.text }} +
+
@@ -92,24 +123,7 @@ {{ $t('commons.button.create') }}
- - - - - -
- {{ $t('xpack.vm.storagePoolHelper') }} - - {{ $t('commons.button.create') }} - -
- + - + + +
+ {{ item.name }} + + {{ $t('xpack.vm.available') }} {{ computeSize(item.available || 0) }} + +
+
{{ item.path }}
+
+
+
+ + + + + + + {{ $t('commons.button.delete') }} + + + + {{ $t('xpack.vm.startAfterCreate') }} @@ -205,6 +321,7 @@