From 6e9d54c3f30017d804a7bb49f4517ae19a772c66 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Sun, 24 Feb 2019 14:22:49 +0800 Subject: [PATCH] fix purge backup guest --- cmd/climc/shell/servers.go | 6 +++++- pkg/compute/models/guest_actions.go | 2 +- pkg/mcclient/options/servers.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/climc/shell/servers.go b/cmd/climc/shell/servers.go index 27cbae80de..be6db6bec8 100644 --- a/cmd/climc/shell/servers.go +++ b/cmd/climc/shell/servers.go @@ -167,7 +167,11 @@ func init() { }) R(&options.ServerDeleteBackupOptions{}, "server-delete-backup", "Guest delete backup", func(s *mcclient.ClientSession, opts *options.ServerDeleteBackupOptions) error { - ret, err := modules.Servers.PerformAction(s, opts.ID, "delete-backup", nil) + params, err := options.StructToParams(opts) + if err != nil { + return err + } + ret, err := modules.Servers.PerformAction(s, opts.ID, "delete-backup", params) if err != nil { return err } diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index b1cae7d671..60beaf469e 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -2373,7 +2373,7 @@ func (self *SGuest) PerformDeleteBackup(ctx context.Context, userCred mcclient.T } taskData := jsonutils.NewDict() - taskData.Set("pruge", jsonutils.NewBool(jsonutils.QueryBoolean(data, "purge", false))) + taskData.Set("purge", jsonutils.NewBool(jsonutils.QueryBoolean(data, "purge", false))) taskData.Set("host_id", jsonutils.NewString(self.BackupHostId)) taskData.Set("failed_status", jsonutils.NewString(VM_BACKUP_DELETE_FAILED)) diff --git a/pkg/mcclient/options/servers.go b/pkg/mcclient/options/servers.go index ba7b82c87e..6e8150fd28 100644 --- a/pkg/mcclient/options/servers.go +++ b/pkg/mcclient/options/servers.go @@ -47,7 +47,7 @@ type ServerIdsOptions struct { type ServerDeleteBackupOptions struct { ID string `help:"ID of the server" json:"-"` - Purge bool `help:"Purge Guest Backup" json:"purge"` + Purge *bool `help:"Purge Guest Backup" json:"purge"` } type ServerShowOptions struct {