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

Merge pull request #10133 from rainzm/fix/merge_wire

Browse Source 
fix(region): init and change status
This commit is contained in:
Zexi Li
2021-02-05 17:29:31 +08:00
committed by GitHub
parent 00c597f5dd 2283caa460
commit ce9848e85a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/wire_const.go
+2 -1
View File
@@ -15,7 +15,8 @@
package compute
const (
WIRE_STATUS_READY = "ready"
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
+6 -6
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"))))
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,8 +901,8 @@ func (manager *SWireManager) InitializeData() error {
if len(w.VpcId) == 0 {
w.VpcId = api.DEFAULT_VPC_ID
}
if len(w.Status) == 0 {
w.Status = api.WIRE_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
})
@@ -1000,11 +1000,11 @@ func (sm *SWireManager) FetchByIdsOrNames(idOrNames []string) ([]SWire, error) {
if len(idOrNames) == 0 {
return nil, nil
}
q := sm.Query("")
q := sm.Query()
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)
@@ -1324,7 +1324,7 @@ func (model *SWire) CustomizeCreate(ctx context.Context, userCred mcclient.Token
}
data.(*jsonutils.JSONDict).Set("public_scope", jsonutils.NewString(model.PublicScope))
}
model.Status = api.WIRE_STATUS_READY
model.Status = api.WIRE_STATUS_AVAILABLE
return model.SInfrasResourceBase.CustomizeCreate(ctx, userCred, ownerId, query, data)
}
pkg/compute/tasks/cloud_account_sync_vmware_net.go
+1 -1
View File
@@ -290,7 +290,7 @@ func (self *CloudAccountSyncVMwareNetworkTask) createWire(ctx context.Context, c
wire.Name = wireName
wire.DomainId = cloudaccount.GetOwnerId().GetDomainId()
wire.Description = desc
wire.Status = api.WIRE_STATUS_READY
wire.Status = api.WIRE_STATUS_AVAILABLE
wire.SetModelManager(models.WireManager, wire)
err := models.WireManager.TableSpec().Insert(ctx, wire)
if err != nil {
pkg/compute/tasks/networks_under_wire_merge_task.go
+1 -1
View File
@@ -40,7 +40,7 @@ func (self *NetworksUnderWireMergeTask) taskFailed(ctx context.Context, wire *mo
func (self *NetworksUnderWireMergeTask) taskSuccess(ctx context.Context, wire *models.SWire, desc string) {
d := jsonutils.NewString(desc)
wire.SetStatus(self.UserCred, api.WIRE_STATUS_READY, "")
wire.SetStatus(self.UserCred, api.WIRE_STATUS_AVAILABLE, "")
db.OpsLog.LogEvent(wire, db.ACT_MERGE_NETWORK, d, self.UserCred)
logclient.AddActionLogWithStartable(self, wire, logclient.ACT_MERGE_NETWORK, d, self.UserCred, true)
self.SetStageComplete(ctx, nil)