Merge ~newell-jensen/maas:2.3-lp1742703 into maas:2.3

[Newell Jensen]

Backport ed3ae8bcfc3ee0cd98ac4b37c7ea9659deff7da8

LP: #1742703 -- Set virsh pod VMs to autostart when created.

[Newell Jensen (newell-jensen)]

Self approved back port.

[Newell Jensen (newell-jensen)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.3-lp1742703 lp:~newell-jensen/maas/+git/maas into -b 2.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2141/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 2.3-lp1742703 lp:~newell-jensen/maas/+git/maas into -b 2.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2145/console
COMMIT: 7681f30afaf64d6cb7515395448c0b2f564a53ec

review: Needs Fixing

diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index 473bc60..7f8f6a5 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -1006,6 +1006,8 @@ class TestVirshSSH(MAASTestCase):
         mock_run = self.patch(virsh.VirshSSH, "run")
         mock_attach_disk = self.patch(virsh.VirshSSH, "attach_local_volume")
         mock_attach_nic = self.patch(virsh.VirshSSH, "attach_interface")
+        mock_set_machine_autostart = self.patch(
+            virsh.VirshSSH, "set_machine_autostart")
         mock_configure_pxe = self.patch(virsh.VirshSSH, "configure_pxe_boot")
         mock_discovered = self.patch(virsh.VirshSSH, "get_discovered_machine")
         mock_discovered.return_value = sentinel.discovered
@@ -1017,7 +1019,9 @@ class TestVirshSSH(MAASTestCase):
         self.assertThat(
             mock_attach_nic, MockCalledOnceWith(ANY, 'maas'))
         self.assertThat(
-            mock_configure_pxe, MockCalledOnceWith(ANY))
+            mock_set_machine_autostart, MockCalledOnceWith(request.hostname))
+        self.assertThat(
+            mock_configure_pxe, MockCalledOnceWith(request.hostname))
         self.assertThat(
             mock_discovered, MockCalledOnceWith(ANY, request=request))
         self.assertEquals(sentinel.discovered, observed)
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index 238e2a5..b366e74 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -533,6 +533,14 @@ class VirshSSH(pexpect.spawn):
         discovered_machine.interfaces = interfaces
         return discovered_machine
 
+    def set_machine_autostart(self, machine):
+        """Set machine to autostart."""
+        output = self.run(['autostart', machine]).strip()
+        if output.startswith("error:"):
+            maaslog.error("%s: Failed to set autostart", machine)
+            return False
+        return True
+
     def configure_pxe_boot(self, machine):
         """Given the specified machine, reads the XML dump and determines
         if the boot order needs to be changed. The boot order needs to be
@@ -760,6 +768,9 @@ class VirshSSH(pexpect.spawn):
         for _ in request.interfaces:
             self.attach_interface(request.hostname, best_network)
 
+        # Set machine to autostart.
+        self.set_machine_autostart(request.hostname)
+
         # Setup the domain to PXE boot.
         self.configure_pxe_boot(request.hostname)