move unit related constant to common lib
This commit is contained in:
+5
-3
@@ -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)
|
||||
|
||||
|
||||
@@ -7,8 +7,6 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
const MiB = 1024 * 1024
|
||||
|
||||
type Config struct {
|
||||
ListenPort int `json:"listenPort"`
|
||||
PVE struct {
|
||||
|
||||
+1
-1
Submodule proxmoxaas-common-lib updated: ad6b8211b3...372fd452c7
Reference in New Issue
Block a user