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

Merge pull request #4423 from wanyaoqi/bugfix/wyq/misc-region-1330

Browse Source 
region MakeCloudProviderInfo instance snapshots
This commit is contained in:
yunion-ci-robot
2019-12-31 01:22:32 +08:00
committed by GitHub
parent 729e66c36f 540799fb6a
commit 842a6c7c8f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+1 -1
View File
@@ -2420,7 +2420,7 @@ func (self *SDisk) syncSnapshots(ctx context.Context, userCred mcclient.TokenCre
func (self *SDisk) GetSnapshotsNotInInstanceSnapshot() ([]SSnapshot, error) {
snapshots := make([]SSnapshot, 0)
sq := InstanceSnapshotJointManager.Query("snapshot_id").SubQuery()
q := SnapshotManager.Query().IsFalse("fake_deleted")
q := SnapshotManager.Query().IsFalse("fake_deleted").Equals("disk_id", self.Id)
q = q.LeftJoin(sq, sqlchemy.Equals(q.Field("id"), sq.Field("snapshot_id"))).
Filter(sqlchemy.IsNull(sq.Field("snapshot_id")))
err := db.FetchModelObjects(SnapshotManager, q, &snapshots)
pkg/compute/models/managedresource.go
+7 -6
View File
@@ -585,6 +585,7 @@ func MakeCloudProviderInfo(region *SCloudregion, zone *SZone, provider *SCloudpr
if provider != nil {
info.Manager = provider.GetName()
info.ManagerId = provider.GetId()
info.Provider = provider.Provider
if len(provider.ProjectId) > 0 {
info.ManagerProjectId = provider.ProjectId
@@ -597,12 +598,12 @@ func MakeCloudProviderInfo(region *SCloudregion, zone *SZone, provider *SCloudpr
}
account := provider.GetCloudaccount()
info.Account = account.GetName()
info.AccountId = account.GetId()
info.Provider = provider.Provider
info.Brand = account.Brand
info.CloudEnv = account.getCloudEnv()
if account != nil {
info.Account = account.GetName()
info.AccountId = account.GetId()
info.Brand = account.Brand
info.CloudEnv = account.getCloudEnv()
}
if region != nil {
info.RegionExternalId = region.ExternalId