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 #2387 from swordqiu/hotfix/qj-cloud-provider-region-domain-id

Browse Source 
fix: cloud-provider-region add cloudaccount_domain_id
This commit is contained in:
yunion-ci-robot
2019-08-20 11:27:05 +08:00
committed by GitHub
parent 9510265de9 91e52f9911
commit 3acfd0f3ed
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/fetch.go
+3 -3
View File
@@ -258,8 +258,8 @@ func FetchProjectInfo(ctx context.Context, data jsonutils.JSONObject) (mcclient.
ProjectId: t.Id,
Project: t.Name,
}
data.(*jsonutils.JSONDict).Set("tenant_id", jsonutils.NewString(t.Id))
data.(*jsonutils.JSONDict).Set("domain_id", jsonutils.NewString(t.DomainId))
data.(*jsonutils.JSONDict).Set("project", jsonutils.NewString(t.Id))
data.(*jsonutils.JSONDict).Set("project_domain", jsonutils.NewString(t.DomainId))
return &ownerId, nil
}
return FetchDomainInfo(ctx, data)
@@ -277,7 +277,7 @@ func FetchDomainInfo(ctx context.Context, data jsonutils.JSONObject) (mcclient.I
return nil, httperrors.NewGeneralError(err)
}
owner := SOwnerId{DomainId: domain.Id, Domain: domain.Name}
data.(*jsonutils.JSONDict).Set("domain_id", jsonutils.NewString(domain.Id))
data.(*jsonutils.JSONDict).Set("project_domain", jsonutils.NewString(domain.Id))
return &owner, nil
}
return nil, nil
pkg/compute/models/cloudproviderregions.go
+1
View File
@@ -141,6 +141,7 @@ func (self *SCloudproviderregion) getExtraDetails(extra *jsonutils.JSONDict) *js
if account != nil {
extra.Add(jsonutils.NewString(account.Id), "cloudaccount_id")
extra.Add(jsonutils.NewString(account.Name), "cloudaccount")
extra.Add(jsonutils.NewString(account.DomainId), "cloudaccount_domain_id")
if account.EnableAutoSync {
extra.Add(jsonutils.JSONTrue, "enable_auto_sync")
} else {
pkg/compute/models/snapshotpolicy.go
+1 -1
View File
@@ -416,4 +416,4 @@ func (self *SSnapshotPolicy) preCheck(
return nil, httperrors.NewNotFoundError("Disks %v not found", notFoundDisks)
}
return diskIds, nil
}
}
pkg/compute/models/snapshots.go
-9
View File
@@ -223,15 +223,6 @@ func (self *SSnapshot) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSON
func (self *SSnapshot) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
res := self.SVirtualResourceBase.GetShortDesc(ctx)
res.Add(jsonutils.NewInt(int64(self.Size)), "size")
/*if cloudprovider := self.GetCloudprovider(); cloudprovider != nil {
res.Add(jsonutils.NewString(cloudprovider.Provider), "hypervisor")
}
if len(self.CloudregionId) > 0 {
cloudRegion := CloudregionManager.FetchRegionById(self.CloudregionId)
if cloudRegion != nil {
res.Add(jsonutils.NewString(cloudRegion.ExternalId), "region")
}
}*/
info := self.getCloudProviderInfo()
res.Update(jsonutils.Marshal(&info))
return res