diff --git a/app/proxmox.go b/app/proxmox.go index 6a9674b..d82aa16 100644 --- a/app/proxmox.go +++ b/app/proxmox.go @@ -9,6 +9,8 @@ import ( "strconv" "strings" + paas "proxmoxaas-common-lib" + "github.com/luthermonson/go-proxmox" "golang.org/x/sync/errgroup" ) @@ -191,7 +193,7 @@ func (host *Node) VirtualMachine(VMID uint) (*Instance, error) { instance.Name = vm.Name instance.Proctype = vm.VirtualMachineConfig.CPU instance.Cores = SafeUint64(*vm.VirtualMachineConfig.Cores) - instance.Memory = SafeUint64(int(vm.VirtualMachineConfig.Memory)) * MiB + instance.Memory = SafeUint64(int(vm.VirtualMachineConfig.Memory)) * paas.MiB instance.Volumes = make(map[VolumeID]*Volume) instance.Nets = make(map[NetID]*Net) instance.Devices = make(map[DeviceID]*Device) @@ -236,8 +238,8 @@ func (host *Node) Container(VMID uint) (*Instance, error) { instance.Name = ct.Name instance.Cores = SafeUint64(ct.ContainerConfig.Cores) - instance.Memory = SafeUint64(*ct.ContainerConfig.Memory) * MiB - instance.Swap = SafeUint64(*ct.ContainerConfig.Swap) * MiB + instance.Memory = SafeUint64(*ct.ContainerConfig.Memory) * paas.MiB + instance.Swap = SafeUint64(*ct.ContainerConfig.Swap) * paas.MiB instance.Volumes = make(map[VolumeID]*Volume) instance.Nets = make(map[NetID]*Net) diff --git a/app/utils.go b/app/utils.go index cb16bd1..02da58c 100644 --- a/app/utils.go +++ b/app/utils.go @@ -7,8 +7,6 @@ import ( "strings" ) -const MiB = 1024 * 1024 - type Config struct { ListenPort int `json:"listenPort"` PVE struct { diff --git a/proxmoxaas-common-lib b/proxmoxaas-common-lib index ad6b821..372fd45 160000 --- a/proxmoxaas-common-lib +++ b/proxmoxaas-common-lib @@ -1 +1 @@ -Subproject commit ad6b8211b371439204878fd47b429a4daf36dc1b +Subproject commit 372fd452c74a05bd5df68484f2fdc5e2dcd9b578