From 329edbae225cb8be02de952fc796c686b5423d95 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Thu, 26 Mar 2020 22:24:34 +0800
Subject: [PATCH] minor fixes

---
 pkg/cloudcommon/db/models.go       | 2 +-
 pkg/compute/models/capabilities.go | 2 +-
 pkg/compute/models/guests.go       | 2 +-
 pkg/keystone/models/roles.go       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/cloudcommon/db/models.go b/pkg/cloudcommon/db/models.go
index 51719eee32..694606300d 100644
--- a/pkg/cloudcommon/db/models.go
+++ b/pkg/cloudcommon/db/models.go
@@ -59,7 +59,7 @@ func mustCheckModelManager(modelMan IModelManager) {
 			if !ok {
 				continue
 			}
-			if !utils.IsInStringArray(v, allowedValues) {
+			if len(v) > 0 && !utils.IsInStringArray(v, allowedValues) {
 				msg := fmt.Sprintf("model manager %s: column %s has invalid tag %s:\"%s\", expecting %v",
 					modelMan.KeywordPlural(), col.Name(), tagName, v, allowedValues)
 				panic(msg)
diff --git a/pkg/compute/models/capabilities.go b/pkg/compute/models/capabilities.go
index 68108da0e3..f18fb7a580 100644
--- a/pkg/compute/models/capabilities.go
+++ b/pkg/compute/models/capabilities.go
@@ -137,7 +137,7 @@ func domainManagerFieldFilter(domainId, field string) *sqlchemy.SSubQuery {
 	accounts = accounts.Equals("status", api.CLOUD_PROVIDER_CONNECTED)
 	accounts = accounts.IsTrue("enabled")
 
-	q := CloudproviderManager.Query(field).Equals("cloudaccount_id", accounts.SubQuery())
+	q := CloudproviderManager.Query(field).In("cloudaccount_id", accounts.SubQuery())
 	/*q := providers.Query(providers.Field(field))
 	q = q.Join(accounts, sqlchemy.Equals(accounts.Field("id"), providers.Field("cloudaccount_id")))
 	q = q.Filter(sqlchemy.OR(
diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go
index e5316209ba..b55c0f1fcc 100644
--- a/pkg/compute/models/guests.go
+++ b/pkg/compute/models/guests.go
@@ -1299,7 +1299,7 @@ func (manager *SGuestManager) validateCreateData(
 	}
 
 	input.Project = ownerId.GetProjectId()
-	input.Domain = ownerId.GetProjectDomainId()
+	input.ProjectDomain = ownerId.GetProjectDomainId()
 	return input, nil
 }
 
diff --git a/pkg/keystone/models/roles.go b/pkg/keystone/models/roles.go
index 9c4139e23d..d186693dff 100644
--- a/pkg/keystone/models/roles.go
+++ b/pkg/keystone/models/roles.go
@@ -65,7 +65,7 @@ func init() {
 */
 
 type SRole struct {
-	SIdentityBaseResource `"name->update":"none"`
+	SIdentityBaseResource `"name->update":""`
 	db.SSharableBaseResource
 }