Commit c559ec7d authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/vmware: check if running prior to shutting down

parent f851e56d
package vmware
import (
"testing"
"github.com/mitchellh/packer/packer"
"testing"
)
func TestArtifact_Impl(t *testing.T) {
......
......@@ -28,6 +28,7 @@ type config struct {
HTTPDir string `mapstructure:"http_directory"`
BootCommand []string `mapstructure:"boot_command"`
BootWait time.Duration
ShutdownCommand string `mapstructure:"shutdown_command"`
SSHUser string `mapstructure:"ssh_username"`
SSHPassword string `mapstructure:"ssh_password"`
SSHWaitTimeout time.Duration
......
package vmware
import (
"bytes"
"os/exec"
"path/filepath"
"strings"
)
// A driver is able to talk to VMware, control virtual machines, etc.
......@@ -10,6 +12,9 @@ type Driver interface {
// CreateDisk creates a virtual disk with the given size.
CreateDisk(string, string) error
// Checks if the VMX file at the given path is running.
IsRunning(string) (bool, error)
// Start starts a VM specified by the path to the VMX given.
Start(string) error
......@@ -33,6 +38,23 @@ func (d *Fusion5Driver) CreateDisk(output string, size string) error {
return nil
}
func (d *Fusion5Driver) IsRunning(vmxPath string) (bool, error) {
stdout := new(bytes.Buffer)
cmd := exec.Command(d.vmrunPath(), "-T", "fusion", "list")
cmd.Stdout = stdout
if err := cmd.Run(); err != nil {
return false, err
}
for _, line := range strings.Split(stdout.String(), "\n") {
if line == vmxPath {
return true, nil
}
}
return false, nil
}
func (d *Fusion5Driver) Start(vmxPath string) error {
cmd := exec.Command(d.vmrunPath(), "-T", "fusion", "start", vmxPath, "gui")
if err := cmd.Run(); err != nil {
......
......@@ -62,9 +62,13 @@ func (s *stepRun) Cleanup(state map[string]interface{}) {
time.Sleep(sleepTime)
}
// See if it is running
running, _ := driver.IsRunning(s.vmxPath)
if running {
ui.Say("Stopping virtual machine...")
if err := driver.Stop(s.vmxPath); err != nil {
ui.Error(fmt.Sprintf("Error stopping VM: %s", err))
}
}
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment