From 16f40608c125c225555cb9419a1fdb0fc1667f4c Mon Sep 17 00:00:00 2001 From: TangBin Date: Wed, 7 Aug 2019 09:52:52 +0800 Subject: [PATCH 1/2] model & model manager mismatch fix --- pkg/compute/models/elasticcache_accounts.go | 4 ++-- pkg/compute/models/elasticcache_acls.go | 4 ++-- pkg/compute/models/elasticcache_backups.go | 4 ++-- pkg/compute/models/elasticcache_parameters.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/compute/models/elasticcache_accounts.go b/pkg/compute/models/elasticcache_accounts.go index 932177c3d0..9c2141a62d 100644 --- a/pkg/compute/models/elasticcache_accounts.go +++ b/pkg/compute/models/elasticcache_accounts.go @@ -14,14 +14,14 @@ import ( // SElasticcache.Account type SElasticcacheAccountManager struct { - db.SVirtualResourceBaseManager + db.SStatusStandaloneResourceBaseManager } var ElasticcacheAccountManager *SElasticcacheAccountManager func init() { ElasticcacheAccountManager = &SElasticcacheAccountManager{ - SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager( + SStatusStandaloneResourceBaseManager: db.NewStatusStandaloneResourceBaseManager( SElasticcacheAccount{}, "elasticcacheaccounts_tbl", "elasticcacheaccount", diff --git a/pkg/compute/models/elasticcache_acls.go b/pkg/compute/models/elasticcache_acls.go index d426ab01b9..399167ec52 100644 --- a/pkg/compute/models/elasticcache_acls.go +++ b/pkg/compute/models/elasticcache_acls.go @@ -14,14 +14,14 @@ import ( // SElasticcache.Acl type SElasticcacheAclManager struct { - db.SVirtualResourceBaseManager + db.SStandaloneResourceBaseManager } var ElasticcacheAclManager *SElasticcacheAclManager func init() { ElasticcacheAclManager = &SElasticcacheAclManager{ - SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager( + SStandaloneResourceBaseManager: db.NewStandaloneResourceBaseManager( SElasticcacheAcl{}, "elasticcacheacls_tbl", "elasticcacheacl", diff --git a/pkg/compute/models/elasticcache_backups.go b/pkg/compute/models/elasticcache_backups.go index e98c45a27e..61437c4253 100644 --- a/pkg/compute/models/elasticcache_backups.go +++ b/pkg/compute/models/elasticcache_backups.go @@ -15,14 +15,14 @@ import ( // SElasticcache.Backup type SElasticcacheBackupManager struct { - db.SVirtualResourceBaseManager + db.SStatusStandaloneResourceBaseManager } var ElasticcacheBackupManager *SElasticcacheBackupManager func init() { ElasticcacheBackupManager = &SElasticcacheBackupManager{ - SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager( + SStatusStandaloneResourceBaseManager: db.NewStatusStandaloneResourceBaseManager( SElasticcacheBackup{}, "elasticcachebackups_tbl", "elasticcachebackup", diff --git a/pkg/compute/models/elasticcache_parameters.go b/pkg/compute/models/elasticcache_parameters.go index d072a1e1de..3251746939 100644 --- a/pkg/compute/models/elasticcache_parameters.go +++ b/pkg/compute/models/elasticcache_parameters.go @@ -14,14 +14,14 @@ import ( // SElasticcache.Parameter type SElasticcacheParameterManager struct { - db.SVirtualResourceBaseManager + db.SStandaloneResourceBaseManager } var ElasticcacheParameterManager *SElasticcacheParameterManager func init() { ElasticcacheParameterManager = &SElasticcacheParameterManager{ - SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager( + SStandaloneResourceBaseManager: db.NewStandaloneResourceBaseManager( SElasticcacheParameter{}, "elasticcacheparameters_tbl", "elasticcacheparameter", From b3dd15dd64ec56fff964d8235c874cdfdef1ce8d Mon Sep 17 00:00:00 2001 From: TangBin Date: Wed, 7 Aug 2019 11:12:24 +0800 Subject: [PATCH 2/2] code check error fix --- pkg/hostimage/host_image_service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/hostimage/host_image_service.go b/pkg/hostimage/host_image_service.go index 17ee338787..bc4bf80c8e 100644 --- a/pkg/hostimage/host_image_service.go +++ b/pkg/hostimage/host_image_service.go @@ -53,9 +53,9 @@ func StartService() { app_common.InitAuth(&HostImageOptions.CommonOptions, func() { log.Infof("Auth complete!!") }) - app := app_common.InitApp(&HostImageOptions.CommonOptions, false) + app := app_common.InitApp(&HostImageOptions.BaseOptions, false) initHandlers(app, "") - app_common.ServeForever(app, &HostImageOptions.CommonOptions) + app_common.ServeForever(app, &HostImageOptions.BaseOptions) } func initHandlers(app *appsrv.Application, prefix string) {