Fix Restart() for some drivers

dgageot · dgageot · commit 1c6ceed28ee8 · 2015-12-22T10:32:57.000+01:00
Signed-off-by: David Gageot &lt;david@gageot.net&gt;
diff --git a/drivers/google/google.go b/drivers/google/google.go
@@ -342,6 +342,11 @@ func (d *Driver) Remove() error {
 	return c.deleteDisk()
 }
 
+// Restart restarts a machine which is known to be running.
 func (d *Driver) Restart() error {
-	return nil
+	if err := d.Stop(); err != nil {
+		return err
+	}
+
+	return d.Start()
 }
diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
@@ -500,6 +500,10 @@ func (d *Driver) Start() error {
 		return ErrMustEnableVTX
 	}
 
+	return d.waitForIP()
+}
+
+func (d *Driver) waitForIP() error {
 	// Wait for SSH over NAT to be available before returning to user
 	if err := drivers.WaitForSSH(d); err != nil {
 		return err
@@ -510,6 +514,7 @@ func (d *Driver) Start() error {
 		return err
 	}
 
+	var err error
 	d.IPAddress, err = d.GetIP()
 
 	return err
@@ -572,18 +577,16 @@ func (d *Driver) Remove() error {
 	return d.vbm("unregistervm", "--delete", d.MachineName)
 }
 
+// Restart restarts a machine which is known to be running.
 func (d *Driver) Restart() error {
-	s, err := d.GetState()
-	if err != nil {
+	log.Infof("Restarting VM...")
+	if err := d.vbm("controlvm", d.MachineName, "reset"); err != nil {
 		return err
 	}
 
-	if s == state.Running {
-		if err := d.Stop(); err != nil {
-			return err
-		}
-	}
-	return d.Start()
+	d.IPAddress = ""
+
+	return d.waitForIP()
 }
 
 func (d *Driver) Kill() error {

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,11 @@ func (d *Driver) Remove() error {`
`342`	`342`	`return c.deleteDisk()`
`343`	`343`	`}`
`344`	`344`
	`345`	`+// Restart restarts a machine which is known to be running.`
`345`	`346`	`func (d *Driver) Restart() error {`
`346`		`- return nil`
	`347`	`+ if err := d.Stop(); err != nil {`
	`348`	`+ return err`
	`349`	`+ }`
	`350`	`+`
	`351`	`+ return d.Start()`
`347`	`352`	`}`