matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a shared vm cleanup struct and function and ensure that the wait for ip step uses it

Browse Source
This commit is contained in:
Dom Del Nano 2021-03-23 23:36:34 -07:00
parent cefc156ea4
commit 5a484e08d0
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builder/xenserver/common/step_start_vm_paused.go
View File

@ -3,13 +3,14 @@ package common
import ( import (
"context" "context"
"fmt" "fmt"
"log"
"github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer-plugin-sdk/multistep"
"github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer-plugin-sdk/packer"
) )
type StepStartVmPaused struct{} type StepStartVmPaused struct {
VmCleanup
}
func (self *StepStartVmPaused) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { func (self *StepStartVmPaused) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
@ -54,24 +55,3 @@ func (self *StepStartVmPaused) Run(ctx context.Context, state multistep.StateBag
return multistep.ActionContinue return multistep.ActionContinue
} }
func (self *StepStartVmPaused) Cleanup(state multistep.StateBag) {
config := state.Get("commonconfig").(CommonConfig)
c := state.Get("client").(*Connection)
if config.ShouldKeepVM(state) {
return
}
uuid := state.Get("instance_uuid").(string)
instance, err := c.client.VM.GetByUUID(c.session, uuid)
if err != nil {
log.Printf(fmt.Sprintf("Unable to get VM from UUID '%s': %s", uuid, err.Error()))
return
}
err = c.client.VM.HardShutdown(c.session, instance)
if err != nil {
log.Printf(fmt.Sprintf("Unable to force shutdown VM '%s': %s", uuid, err.Error()))
}
}

3
builder/xenserver/common/step_wait_for_ip.go
View File

@ -10,6 +10,7 @@ import (
) )
type StepWaitForIP struct { type StepWaitForIP struct {
VmCleanup
Chan <-chan string Chan <-chan string
Timeout time.Duration Timeout time.Duration
} }
@ -84,8 +85,6 @@ func (self *StepWaitForIP) Run(ctx context.Context, state multistep.StateBag) mu
return multistep.ActionContinue return multistep.ActionContinue
} }
func (self *StepWaitForIP) Cleanup(state multistep.StateBag) {}
func InstanceSSHIP(state multistep.StateBag) (string, error) { func InstanceSSHIP(state multistep.StateBag) (string, error) {
ip := state.Get("instance_ssh_address").(string) ip := state.Get("instance_ssh_address").(string)
return ip, nil return ip, nil

31
builder/xenserver/common/vm_cleanup.go Normal file
View File

@ -0,0 +1,31 @@
package common
import (
"fmt"
"log"
"github.com/hashicorp/packer-plugin-sdk/multistep"
)
type VmCleanup struct{}
func (self *VmCleanup) Cleanup(state multistep.StateBag) {
config := state.Get("commonconfig").(CommonConfig)
c := state.Get("client").(*Connection)
if config.ShouldKeepVM(state) {
return
}
uuid := state.Get("instance_uuid").(string)
instance, err := c.client.VM.GetByUUID(c.session, uuid)
if err != nil {
log.Printf(fmt.Sprintf("Unable to get VM from UUID '%s': %s", uuid, err.Error()))
return
}
err = c.client.VM.HardShutdown(c.session, instance)
if err != nil {
log.Printf(fmt.Sprintf("Unable to force shutdown VM '%s': %s", uuid, err.Error()))
}
}