opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): fetch wires correctly

Browse Source
This commit is contained in:
rainzm
2021-02-04 10:03:29 +08:00
parent e54d1e1cb9
commit cbca7e5183
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/wire_const.go
+1
View File
@@ -16,6 +16,7 @@ package compute
const (
WIRE_STATUS_AVAILABLE = "available"
WIRE_STATUS_READY_DEPRECATED = "ready"
WIRE_STATUS_MERGE_NETWORK = "merge_network"
WIRE_STATUS_MERGE_NETWORK_FAILED = "merge_network_failed"
)
pkg/compute/models/wires.go
+3 -3
View File
@@ -891,7 +891,7 @@ func chooseCandidateNetworksByNetworkType(nets []SNetwork, isExit bool, serverTy
func (manager *SWireManager) InitializeData() error {
wires := make([]SWire, 0)
q := manager.Query()
q.Filter(sqlchemy.OR(sqlchemy.IsEmpty(q.Field("vpc_id")), sqlchemy.IsEmpty(q.Field("status")), sqlchemy.Equals(q.Field("status"), "init"), sqlchemy.Equals(q.Field("status"), "ready")))
q.Filter(sqlchemy.OR(sqlchemy.IsEmpty(q.Field("vpc_id")), sqlchemy.IsEmpty(q.Field("status")), sqlchemy.Equals(q.Field("status"), "init"), sqlchemy.Equals(q.Field("status"), api.WIRE_STATUS_READY_DEPRECATED)))
err := db.FetchModelObjects(manager, q, &wires)
if err != nil {
return err
@@ -901,7 +901,7 @@ func (manager *SWireManager) InitializeData() error {
if len(w.VpcId) == 0 {
w.VpcId = api.DEFAULT_VPC_ID
}
if len(w.Status) == 0 || w.Status == "init" || w.Status == "ready" {
if len(w.Status) == 0 || w.Status == "init" || w.Status == api.WIRE_STATUS_READY_DEPRECATED {
w.Status = api.WIRE_STATUS_AVAILABLE
}
return nil
@@ -1004,7 +1004,7 @@ func (sm *SWireManager) FetchByIdsOrNames(idOrNames []string) ([]SWire, error) {
if len(idOrNames) == 1 {
q.Filter(sqlchemy.OR(sqlchemy.Equals(q.Field("id"), idOrNames[0]), sqlchemy.Equals(q.Field("name"), idOrNames[0])))
} else {
q.Filter(sqlchemy.OR(sqlchemy.In(q.Field("id"), idOrNames[0]), sqlchemy.In(q.Field("name"), idOrNames[0])))
q.Filter(sqlchemy.OR(sqlchemy.In(q.Field("id"), idOrNames), sqlchemy.In(q.Field("name"), idOrNames)))
}
ret := make([]SWire, 0, len(idOrNames))
err := db.FetchModelObjects(sm, q, &ret)