diff --git a/app/proxmox.go b/app/proxmox.go index 6a9674b..b13069c 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" ) @@ -150,7 +152,7 @@ func (pve ProxmoxClient) Node(nodeName string) (*Node, error) { // set host basic values host.Name = node.Name - host.Cores = SafeUint64(node.CPUInfo.CPUs) + host.Cores = paas.SafeUint64(node.CPUInfo.CPUs) host.Memory = node.Memory.Total host.Swap = node.Swap.Total host.pvenode = node @@ -190,8 +192,8 @@ 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.Cores = paas.SafeUint64(*vm.VirtualMachineConfig.Cores) + instance.Memory = paas.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) @@ -235,9 +237,9 @@ func (host *Node) Container(VMID uint) (*Instance, error) { instance.Type = CT 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.Cores = paas.SafeUint64(ct.ContainerConfig.Cores) + instance.Memory = paas.SafeUint64(*ct.ContainerConfig.Memory) * paas.MiB + instance.Swap = paas.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..591e2a6 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 { @@ -65,11 +63,3 @@ func AnyPrefixes(s string, prefixes []string) string { return "" } - -func SafeUint64(i int) uint64 { - if i < 0 { - log.Printf("Tried to cast %d to uint64", i) - return 0 - } - return uint64(i) -} diff --git a/proxmoxaas-common-lib b/proxmoxaas-common-lib index ad6b821..24904dd 160000 --- a/proxmoxaas-common-lib +++ b/proxmoxaas-common-lib @@ -1 +1 @@ -Subproject commit ad6b8211b371439204878fd47b429a4daf36dc1b +Subproject commit 24904dde666ce92c346c71ffbe7eed2430db6b6f