From 91e52f99118ac07f086052d84c409684af1c24b9 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Mon, 19 Aug 2019 21:47:43 +0800
Subject: [PATCH] fix: cloud-provider-region add cloudaccount_domain_id

---
 pkg/cloudcommon/db/fetch.go                | 6 +++---
 pkg/compute/models/cloudproviderregions.go | 1 +
 pkg/compute/models/snapshotpolicy.go       | 2 +-
 pkg/compute/models/snapshots.go            | 9 ---------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkg/cloudcommon/db/fetch.go b/pkg/cloudcommon/db/fetch.go
index ffd289c596..1d22bc0d88 100644
--- a/pkg/cloudcommon/db/fetch.go
+++ b/pkg/cloudcommon/db/fetch.go
@@ -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
diff --git a/pkg/compute/models/cloudproviderregions.go b/pkg/compute/models/cloudproviderregions.go
index 305c57141f..088a825bb6 100644
--- a/pkg/compute/models/cloudproviderregions.go
+++ b/pkg/compute/models/cloudproviderregions.go
@@ -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 {
diff --git a/pkg/compute/models/snapshotpolicy.go b/pkg/compute/models/snapshotpolicy.go
index 326285a136..94250adbea 100644
--- a/pkg/compute/models/snapshotpolicy.go
+++ b/pkg/compute/models/snapshotpolicy.go
@@ -416,4 +416,4 @@ func (self *SSnapshotPolicy) preCheck(
 		return nil, httperrors.NewNotFoundError("Disks %v not found", notFoundDisks)
 	}
 	return diskIds, nil
-}
\ No newline at end of file
+}
diff --git a/pkg/compute/models/snapshots.go b/pkg/compute/models/snapshots.go
index 3db41abc80..b0b160a8ce 100644
--- a/pkg/compute/models/snapshots.go
+++ b/pkg/compute/models/snapshots.go
@@ -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