Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8190e90

Browse files
author
vijaykanthm28
committedJul 27, 2017
delete backup classify based on tosca
1 parent dd8f169 commit 8190e90

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed
 

‎carton/backups.go

-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ func (a *Backups) mkCarton() (*Carton, error) {
185185
}
186186
b := make([]provision.Box, 0, 0)
187187
return &Carton{
188-
Id: a.AssemblyId,
189188
CartonsId: a.Id,
190189
OrgId: a.OrgId,
191190
Name: a.Name,

‎provision/one/provisioner.go

+13-7
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,14 @@ func (p *oneProvisioner) createImage(box *provision.Box, w io.Writer) error {
421421
return nil
422422
}
423423

424+
func (p *oneProvisioner) deleteImage(box *provision.Box, w io.Writer) error {
425+
426+
}
427+
428+
func (p *oneProvisioner) deleteImage(box *provision.Box, w io.Writer) error {
429+
430+
}
431+
424432
func (p *oneProvisioner) DeleteImage(box *provision.Box, w io.Writer) error {
425433
fmt.Fprintf(w, lb.W(lb.UPDATING, lb.INFO, fmt.Sprintf("--- removing backup box (%s)", box.GetFullName())))
426434
args := runMachineActionsArgs{
@@ -429,13 +437,11 @@ func (p *oneProvisioner) DeleteImage(box *provision.Box, w io.Writer) error {
429437
machineStatus: constants.StatusBackupDeleting,
430438
provisioner: p,
431439
}
432-
433-
actions := []*action.Action{
434-
&machCreating,
435-
&updateBackupStatus,
436-
&updateStatusInScylla,
437-
&removeBackup,
438-
&updateStatusInScylla,
440+
actions := []*action.Action{&machCreating}
441+
if box.Tosca == constants.BACKUP_NEW {
442+
actions = append(actions, &updateBackupStatus, &updateStatusInScylla, &removeBackup, &updateStatusInScylla)
443+
} else {
444+
actions = append(actions, &updateBackupStatus, &removeBackup)
439445
}
440446

441447
pipeline := action.NewPipeline(actions...)

0 commit comments

Comments
 (0)
Please sign in to comment.