tronnet/ProxmoxAAS-Fabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor improvements, update common lib

Browse Source
This commit is contained in:
Arthur Lu
2026-05-26 20:24:37 +00:00
parent 326c392d3d
commit dd54866c4e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/model.go
+9 -8
View File
@@ -77,11 +77,11 @@ func (cluster *Cluster) ResolvePoolMembership() error {
if member.Type == "lxc" || member.Type == "qemu" { if member.Type == "lxc" || member.Type == "qemu" {
node, ok := cluster.Nodes[member.Node] node, ok := cluster.Nodes[member.Node]
if !ok { if !ok {
return fmt.Errorf("Instance %s has no node", member.VMID) return fmt.Errorf("Instance %d has no node", member.VMID)
} }
instance, ok := node.Instances[InstanceID(member.VMID)] instance, ok := node.Instances[InstanceID(member.VMID)]
if !ok { if !ok {
return fmt.Errorf("Instance %s claimed to be in node %s but was not", member.VMID, node.Name) return fmt.Errorf("Instance %d claimed to be in node %s but was not", member.VMID, node.Name)
} }
instance.Pool = pool.PoolID instance.Pool = pool.PoolID
log.Printf("[INFO] successfully resolved pool membership for vmid=%d pool=%s", member.VMID, pool.PoolID) log.Printf("[INFO] successfully resolved pool membership for vmid=%d pool=%s", member.VMID, pool.PoolID)
@@ -223,9 +223,10 @@ func (host *Node) RebuildInstance(instancetype InstanceType, vmid uint) error {
instanceID := InstanceID(vmid) instanceID := InstanceID(vmid)
var instance *Instance var instance *Instance
var err error var err error
if instancetype == VM { switch instancetype {
case VM:
instance, err = host.VirtualMachine(vmid) instance, err = host.VirtualMachine(vmid)
} else if instancetype == CT { case CT:
instance, err = host.Container(vmid) instance, err = host.Container(vmid)
} }
@@ -252,7 +253,7 @@ func (host *Node) RebuildInstance(instancetype InstanceType, vmid uint) error {
} }
for netid := range instance.configNets { for netid := range instance.configNets {
instance.RebuildNet(netid) instance.RebuildNet(host, netid)
} }
for deviceid := range instance.configHostPCIs { for deviceid := range instance.configHostPCIs {
@@ -260,7 +261,7 @@ func (host *Node) RebuildInstance(instancetype InstanceType, vmid uint) error {
} }
if instance.Type == VM { if instance.Type == VM {
instance.RebuildBoot() instance.RebuildBoot(host)
} }
// after synchronizing an instance, resync pool membership // after synchronizing an instance, resync pool membership
@@ -287,7 +288,7 @@ func (instance *Instance) RebuildVolume(host *Node, volid string) error {
return nil return nil
} }
func (instance *Instance) RebuildNet(netid string) error { func (instance *Instance) RebuildNet(host *Node, netid string) error {
net := instance.configNets[netid] net := instance.configNets[netid]
netinfo, err := GetNetInfo(net) netinfo, err := GetNetInfo(net)
@@ -323,7 +324,7 @@ func (instance *Instance) RebuildDevice(host *Node, deviceid string) {
instance.Devices[DeviceID(instanceDeviceBusID)].Device_ID = DeviceID(deviceid) instance.Devices[DeviceID(instanceDeviceBusID)].Device_ID = DeviceID(deviceid)
} }
func (instance *Instance) RebuildBoot() { func (instance *Instance) RebuildBoot(host *Node) {
instance.Boot = BootOrder{} instance.Boot = BootOrder{}
eligibleBoot := map[string]bool{} eligibleBoot := map[string]bool{}
proxmoxaas-common-lib
+1 -1
Submodule proxmoxaas-common-lib updated: 0936e8e5a5...52ac2c2b97