From 61ff1544ecb2bd2558df407b53dfcdfc6afb17a4 Mon Sep 17 00:00:00 2001
From: Qu Xuan <quxuan@yunionyun.com>
Date: Fri, 29 May 2020 20:47:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=89=E5=85=A8=E7=BB=84=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=BF=94=E5=9B=9E=E9=A1=B9=E7=9B=AEid=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/apis/compute/dbinstance_account.go      | 2 ++
 pkg/apis/compute/dbinstance_database.go     | 1 +
 pkg/apis/compute/elasticcache.go            | 2 ++
 pkg/apis/compute/elasticcachebackup.go      | 1 +
 pkg/apis/compute/secgrouprule.go            | 2 ++
 pkg/compute/models/dbinstance_accounts.go   | 1 +
 pkg/compute/models/dbinstance_databases.go  | 1 +
 pkg/compute/models/elasticcache_accounts.go | 1 +
 pkg/compute/models/elasticcache_acls.go     | 1 +
 pkg/compute/models/elasticcache_backups.go  | 1 +
 pkg/compute/models/secgrouprules.go         | 1 +
 11 files changed, 14 insertions(+)

diff --git a/pkg/apis/compute/dbinstance_account.go b/pkg/apis/compute/dbinstance_account.go
index 662b1313e7..870e4aa81d 100644
--- a/pkg/apis/compute/dbinstance_account.go
+++ b/pkg/apis/compute/dbinstance_account.go
@@ -88,4 +88,6 @@ type DBInstanceAccountDetails struct {
 
 	// 账号权限列表
 	DBInstanceprivileges []DBInstancePrivilege `json:"dbinstanceprivileges,allowempty"`
+
+	ProjectId string `json:"tenant_id"`
 }
diff --git a/pkg/apis/compute/dbinstance_database.go b/pkg/apis/compute/dbinstance_database.go
index f2c0d393f2..adb9e2399f 100644
--- a/pkg/apis/compute/dbinstance_database.go
+++ b/pkg/apis/compute/dbinstance_database.go
@@ -70,6 +70,7 @@ type DBInstancedatabaseDetails struct {
 
 	// 数据库权限
 	DBInstanceprivileges []DBInstancePrivilege `json:"dbinstanceprivileges"`
+	ProjectId            string                `json:"tenant_id"`
 }
 
 type DBInstanceparameterDetails struct {
diff --git a/pkg/apis/compute/elasticcache.go b/pkg/apis/compute/elasticcache.go
index de63ee85d9..6c34a1a90c 100644
--- a/pkg/apis/compute/elasticcache.go
+++ b/pkg/apis/compute/elasticcache.go
@@ -73,6 +73,7 @@ type ElasticcacheAccountDetails struct {
 	ElasticcacheResourceInfo
 
 	SElasticcacheAccount
+	ProjectId string `json:"tenant_id"`
 }
 
 type ElasticcacheAclDetails struct {
@@ -81,6 +82,7 @@ type ElasticcacheAclDetails struct {
 	ElasticcacheResourceInfo
 
 	SElasticcacheAcl
+	ProjectId string `json:"tenant_id"`
 }
 
 type ElasticcacheParameterDetails struct {
diff --git a/pkg/apis/compute/elasticcachebackup.go b/pkg/apis/compute/elasticcachebackup.go
index 3af80cb444..edb9365415 100644
--- a/pkg/apis/compute/elasticcachebackup.go
+++ b/pkg/apis/compute/elasticcachebackup.go
@@ -22,4 +22,5 @@ type ElasticcacheBackupDetails struct {
 	ElasticcacheResourceInfo
 
 	SElasticcacheBackup
+	ProjectId string `json:"tenant_id"`
 }
diff --git a/pkg/apis/compute/secgrouprule.go b/pkg/apis/compute/secgrouprule.go
index ebd4c4573b..74ba469e96 100644
--- a/pkg/apis/compute/secgrouprule.go
+++ b/pkg/apis/compute/secgrouprule.go
@@ -21,4 +21,6 @@ type SecgroupRuleDetails struct {
 	apis.ProjectizedResourceInfo
 	SSecurityGroupRule
 	SecurityGroupResourceInfo
+
+	ProjectId string `json:"tenant_id"`
 }
diff --git a/pkg/compute/models/dbinstance_accounts.go b/pkg/compute/models/dbinstance_accounts.go
index c5470e8e8a..ec3b9a86f6 100644
--- a/pkg/compute/models/dbinstance_accounts.go
+++ b/pkg/compute/models/dbinstance_accounts.go
@@ -201,6 +201,7 @@ func (manager *SDBInstanceAccountManager) FetchCustomizeColumns(
 	for i := range rows {
 		if dbinstance, ok := dbinstances[dbinstanceIds[i]]; ok {
 			virObjs[i] = &dbinstance
+			rows[i].ProjectId = dbinstance.ProjectId
 		}
 	}
 
diff --git a/pkg/compute/models/dbinstance_databases.go b/pkg/compute/models/dbinstance_databases.go
index 5a428f1699..2b958973b4 100644
--- a/pkg/compute/models/dbinstance_databases.go
+++ b/pkg/compute/models/dbinstance_databases.go
@@ -324,6 +324,7 @@ func (manager *SDBInstanceDatabaseManager) FetchCustomizeColumns(
 	for i := range rows {
 		if dbinstance, ok := dbinstances[dbinstanceIds[i]]; ok {
 			virObjs[i] = &dbinstance
+			rows[i].ProjectId = dbinstance.ProjectId
 		}
 	}
 
diff --git a/pkg/compute/models/elasticcache_accounts.go b/pkg/compute/models/elasticcache_accounts.go
index b86b95b0ee..da29cdf14a 100644
--- a/pkg/compute/models/elasticcache_accounts.go
+++ b/pkg/compute/models/elasticcache_accounts.go
@@ -557,6 +557,7 @@ func (manager *SElasticcacheAccountManager) FetchCustomizeColumns(
 	for i := range rows {
 		if cache, ok := caches[cacheIds[i]]; ok {
 			virObjs[i] = &cache
+			rows[i].ProjectId = cache.ProjectId
 		}
 	}
 
diff --git a/pkg/compute/models/elasticcache_acls.go b/pkg/compute/models/elasticcache_acls.go
index 56b43cef9c..b94b9fbd22 100644
--- a/pkg/compute/models/elasticcache_acls.go
+++ b/pkg/compute/models/elasticcache_acls.go
@@ -441,6 +441,7 @@ func (manager *SElasticcacheAclManager) FetchCustomizeColumns(
 	for i := range rows {
 		if cache, ok := caches[cacheIds[i]]; ok {
 			virObjs[i] = &cache
+			rows[i].ProjectId = cache.ProjectId
 		}
 	}
 
diff --git a/pkg/compute/models/elasticcache_backups.go b/pkg/compute/models/elasticcache_backups.go
index 8653f818d5..ee1df5c3e5 100644
--- a/pkg/compute/models/elasticcache_backups.go
+++ b/pkg/compute/models/elasticcache_backups.go
@@ -454,6 +454,7 @@ func (manager *SElasticcacheBackupManager) FetchCustomizeColumns(
 	for i := range rows {
 		if cache, ok := caches[cacheIds[i]]; ok {
 			virObjs[i] = &cache
+			rows[i].ProjectId = cache.ProjectId
 		}
 	}
 
diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go
index 02c0ef7282..1217773df7 100644
--- a/pkg/compute/models/secgrouprules.go
+++ b/pkg/compute/models/secgrouprules.go
@@ -238,6 +238,7 @@ func (manager *SSecurityGroupRuleManager) FetchCustomizeColumns(
 	for i := range rows {
 		if secgroup, ok := secgroups[secIds[i]]; ok {
 			virObjs[i] = &secgroup
+			rows[i].ProjectId = secgroup.ProjectId
 		}
 	}