diff --git a/pkg/compute/models/elasticcache_accounts.go b/pkg/compute/models/elasticcache_accounts.go index 5febff7a2d..c9f62dc16e 100644 --- a/pkg/compute/models/elasticcache_accounts.go +++ b/pkg/compute/models/elasticcache_accounts.go @@ -394,3 +394,7 @@ func (self *SElasticcacheAccount) StartResetPasswordTask(ctx context.Context, us task.ScheduleRun(nil) return nil } + +func (self *SElasticcacheAccount) ValidatePurgeCondition(ctx context.Context) error { + return nil +} diff --git a/pkg/compute/models/elasticcache_acls.go b/pkg/compute/models/elasticcache_acls.go index 04c0a16a30..2ae8c283f6 100644 --- a/pkg/compute/models/elasticcache_acls.go +++ b/pkg/compute/models/elasticcache_acls.go @@ -277,6 +277,10 @@ func (self *SElasticcacheAcl) ValidateDeleteCondition(ctx context.Context) error return nil } +func (self *SElasticcacheAcl) ValidatePurgeCondition(ctx context.Context) error { + return nil +} + func (self *SElasticcacheAcl) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error { self.SetStatus(userCred, api.ELASTIC_CACHE_ACL_STATUS_DELETING, "") return self.StartDeleteElasticcacheAclTask(ctx, userCred, jsonutils.NewDict(), "") diff --git a/pkg/compute/models/elasticcache_backups.go b/pkg/compute/models/elasticcache_backups.go index 78ce8b426d..b44590fc65 100644 --- a/pkg/compute/models/elasticcache_backups.go +++ b/pkg/compute/models/elasticcache_backups.go @@ -323,5 +323,9 @@ func (self *SElasticcacheBackup) ValidateDeleteCondition(ctx context.Context) er return httperrors.NewUnsupportOperationError("unsupport delete %s backups", api.CLOUD_PROVIDER_ALIYUN) } + return self.ValidatePurgeCondition(ctx) +} + +func (self *SElasticcacheBackup) ValidatePurgeCondition(ctx context.Context) error { return nil } diff --git a/pkg/compute/models/elasticcache_instances.go b/pkg/compute/models/elasticcache_instances.go index a1a1694642..b52a5c56ea 100644 --- a/pkg/compute/models/elasticcache_instances.go +++ b/pkg/compute/models/elasticcache_instances.go @@ -684,6 +684,10 @@ func (self *SElasticcache) ValidateDeleteCondition(ctx context.Context) error { return httperrors.NewInvalidStatusError("Elastic cache is locked, cannot delete") } + return self.ValidatePurgeCondition(ctx) +} + +func (self *SElasticcache) ValidatePurgeCondition(ctx context.Context) error { return self.SVirtualResourceBase.ValidateDeleteCondition(ctx) } diff --git a/pkg/compute/models/elasticcache_parameters.go b/pkg/compute/models/elasticcache_parameters.go index d8e26f4255..3a8c60754a 100644 --- a/pkg/compute/models/elasticcache_parameters.go +++ b/pkg/compute/models/elasticcache_parameters.go @@ -213,3 +213,7 @@ func (self *SElasticcacheParameter) StartUpdateElasticcacheParameterTask(ctx con task.ScheduleRun(nil) return nil } + +func (self *SElasticcacheParameter) ValidatePurgeCondition(ctx context.Context) error { + return nil +} diff --git a/pkg/compute/models/purge.go b/pkg/compute/models/purge.go index 902ae34402..418cc28973 100644 --- a/pkg/compute/models/purge.go +++ b/pkg/compute/models/purge.go @@ -1463,7 +1463,7 @@ func (instance *SElasticcacheAccount) purge(ctx context.Context, userCred mcclie lockman.LockObject(ctx, instance) defer lockman.ReleaseObject(ctx, instance) - err := instance.ValidateDeleteCondition(ctx) + err := instance.ValidatePurgeCondition(ctx) if err != nil { return err } @@ -1489,7 +1489,7 @@ func (instance *SElasticcacheAcl) purge(ctx context.Context, userCred mcclient.T lockman.LockObject(ctx, instance) defer lockman.ReleaseObject(ctx, instance) - err := instance.ValidateDeleteCondition(ctx) + err := instance.ValidatePurgeCondition(ctx) if err != nil { return err } @@ -1515,7 +1515,7 @@ func (instance *SElasticcacheBackup) purge(ctx context.Context, userCred mcclien lockman.LockObject(ctx, instance) defer lockman.ReleaseObject(ctx, instance) - err := instance.ValidateDeleteCondition(ctx) + err := instance.ValidatePurgeCondition(ctx) if err != nil { return err } @@ -1541,7 +1541,7 @@ func (instance *SElasticcacheParameter) purge(ctx context.Context, userCred mccl lockman.LockObject(ctx, instance) defer lockman.ReleaseObject(ctx, instance) - err := instance.ValidateDeleteCondition(ctx) + err := instance.ValidatePurgeCondition(ctx) if err != nil { return err } @@ -1572,7 +1572,7 @@ func (instance *SElasticcache) purge(ctx context.Context, userCred mcclient.Toke return err } - err = instance.ValidateDeleteCondition(ctx) + err = instance.ValidatePurgeCondition(ctx) if err != nil { return err }