opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-29 03:51:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): esxi wire sync (#24618)

Browse Source
This commit is contained in:
屈轩
2026-04-04 12:17:04 +08:00
committed by GitHub
parent 7ed5274b52
commit 2fe2630591
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/wires.go
+8 -1
View File
@@ -260,6 +260,10 @@ func (wire *SWire) GetVpcId() string {
}
func (manager *SWireManager) getWiresByVpcAndZone(vpc *SVpc, zone *SZone) ([]SWire, error) {
return manager.getWiresByVpcZoneAndManager(vpc, zone, nil)
}
func (manager *SWireManager) getWiresByVpcZoneAndManager(vpc *SVpc, zone *SZone, provider *SCloudprovider) ([]SWire, error) {
wires := make([]SWire, 0)
q := manager.Query()
if vpc != nil {
@@ -268,6 +272,9 @@ func (manager *SWireManager) getWiresByVpcAndZone(vpc *SVpc, zone *SZone) ([]SWi
if zone != nil {
q = q.Equals("zone_id", zone.Id)
}
if provider != nil {
q = q.Equals("manager_id", provider.Id)
}
err := db.FetchModelObjects(manager, q, &wires)
if err != nil {
return nil, err
@@ -291,7 +298,7 @@ func (manager *SWireManager) SyncWires(
remoteWires := make([]cloudprovider.ICloudWire, 0)
syncResult := compare.SyncResult{}
dbWires, err := manager.getWiresByVpcAndZone(vpc, zone)
dbWires, err := manager.getWiresByVpcZoneAndManager(vpc, zone, provider)
if err != nil {
syncResult.Error(err)
return nil, nil, syncResult