minor fixes

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)

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(

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
 }
 

pkg/keystone/models/roles.go

@@ -65,7 +65,7 @@ func init() {
 */
 
 type SRole struct {
-	SIdentityBaseResource `"name->update":"none"`
+	SIdentityBaseResource `"name->update":""`
 	db.SSharableBaseResource
 }