diff --git a/pkg/cloudcommon/db/interface.go b/pkg/cloudcommon/db/interface.go index b42c522bb9..aefec45f8b 100644 --- a/pkg/cloudcommon/db/interface.go +++ b/pkg/cloudcommon/db/interface.go @@ -22,6 +22,7 @@ type IModelManager interface { KeywordPlural() string Alias() string AliasPlural() string + SetAlias(alias string, aliasPlural string) ValidateName(name string) error diff --git a/pkg/cloudcommon/db/keystonecache.go b/pkg/cloudcommon/db/keystonecache.go index cfe3cbc45c..306fcef368 100644 --- a/pkg/cloudcommon/db/keystonecache.go +++ b/pkg/cloudcommon/db/keystonecache.go @@ -64,7 +64,7 @@ func NewKeystoneCacheObject(id string, name string, domainId string, domain stri }*/ func (manager *SKeystoneCacheObjectManager) BatchFetchNames(idStrs []string) []string { - t := manager.tableSpec.Instance() + t := manager.TableSpec().Instance() results, err := t.Query(t.Field("name")).In("id", idStrs).AllStringMap() if err != nil { return nil diff --git a/pkg/cloudcommon/db/opslog.go b/pkg/cloudcommon/db/opslog.go index 456c617697..45c147eb9e 100644 --- a/pkg/cloudcommon/db/opslog.go +++ b/pkg/cloudcommon/db/opslog.go @@ -176,13 +176,6 @@ var _ IModel = (*SOpsLog)(nil) func init() { OpsLog = &SOpsLogManager{NewModelBaseManager(SOpsLog{}, "opslog_tbl", "event", "events")} - -} - -func (manager *SOpsLogManager) SetKeyword(kw, kwPlural string) *SOpsLogManager { - manager.keyword = kw - manager.keywordPlural = kwPlural - return manager } func (opslog *SOpsLog) GetId() string { diff --git a/pkg/cloudcommon/db/tenantcache.go b/pkg/cloudcommon/db/tenantcache.go index f2a7aa6068..6b8f4c3f69 100644 --- a/pkg/cloudcommon/db/tenantcache.go +++ b/pkg/cloudcommon/db/tenantcache.go @@ -90,8 +90,8 @@ func (manager *STenantCacheManager) fetchTenantFromKeystone(ctx context.Context, } func (manager *STenantCacheManager) Save(ctx context.Context, idStr string, name string, domainId string, domain string) (*STenant, error) { - lockman.LockRawObject(ctx, manager.keyword, idStr) - defer lockman.ReleaseRawObject(ctx, manager.keyword, idStr) + lockman.LockRawObject(ctx, manager.KeywordPlural(), idStr) + defer lockman.ReleaseRawObject(ctx, manager.KeywordPlural(), idStr) objo, err := manager.FetchById(idStr) if err != nil && err != sql.ErrNoRows { diff --git a/pkg/cloudcommon/db/usercache.go b/pkg/cloudcommon/db/usercache.go index 1fe3f560c5..7b01d845bc 100644 --- a/pkg/cloudcommon/db/usercache.go +++ b/pkg/cloudcommon/db/usercache.go @@ -53,8 +53,8 @@ func (manager *SUserCacheManager) FetchUserByName(idStr string) (*SUser, error) } func (manager *SUserCacheManager) Save(ctx context.Context, idStr string, name string, domainId string, domain string) (*SUser, error) { - lockman.LockRawObject(ctx, manager.keyword, idStr) - defer lockman.ReleaseRawObject(ctx, manager.keyword, idStr) + lockman.LockRawObject(ctx, manager.KeywordPlural(), idStr) + defer lockman.ReleaseRawObject(ctx, manager.KeywordPlural(), idStr) obj, err := manager.FetchUserById(idStr) if err != nil && err != sql.ErrNoRows { diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go index 91c6abc17f..93ae01adee 100644 --- a/pkg/compute/models/secgrouprules.go +++ b/pkg/compute/models/secgrouprules.go @@ -203,7 +203,7 @@ func (manager *SSecurityGroupRuleManager) ValidateCreateData(ctx context.Context if err != nil { return nil, httperrors.NewInputParameterError(err.Error()) } - return manager.SModelBaseManager.ValidateCreateData(ctx, userCred, ownerProjId, query, data) + return manager.SResourceBaseManager.ValidateCreateData(ctx, userCred, ownerProjId, query, data) } func (self *SSecurityGroupRule) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {