Merge ~newell-jensen/maas:no-kvm-host-install-for-ephemeral-deployment into maas:master

[Newell Jensen]

Disable KVM host installs for ephemeral deployments.

[Lee Trager (ltrager)]

Approved but I think its a bit weird we're checking the preseed on the API but not the websocket.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-kvm-host-install-for-ephemeral-deployment lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5235/console
COMMIT: 2ff4a3b2807c2c1818fb2d00a8e35da3a054e2e3

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-kvm-host-install-for-ephemeral-deployment lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 83d5220ac7bb859371db5a79f024bbae2856e615

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b no-kvm-host-install-for-ephemeral-deployment lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

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

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 8d54485..8c9860a 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -698,6 +698,9 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         if (options.install_kvm and not
                 request.user.has_perm(NodePermission.admin, machine)):
             raise PermissionDenied()
+        if options.install_kvm and machine.ephemeral_deployment:
+            raise MAASAPIBadRequest(
+                "Cannot install KVM host for ephemeral deployments.")
         if not machine.distro_series and not series:
             series = Config.objects.get_config('default_distro_series')
         Form = get_machine_edit_form(request.user)
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 1428bae..3d1e9b8 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the Machine API."""
@@ -482,6 +482,31 @@ class TestMachineAPI(APITestCase.ForUser):
         self.assertEqual(response_info['osystem'], osystem)
         self.assertEqual(response_info['distro_series'], distro_series)
 
+    def test_POST_deploy_fails_when_install_kvm_set_for_ephemeral_deploy(self):
+        self.become_admin()
+        osystem = Config.objects.get_config('default_osystem')
+        distro_series = Config.objects.get_config('default_distro_series')
+        make_usable_osystem(
+            self, osystem_name=osystem, releases=[distro_series])
+        machine = factory.make_Node(
+            owner=self.user, interface=True,
+            status=NODE_STATUS.ALLOCATED,
+            power_type='manual',
+            distro_series=distro_series,
+            osystem=osystem,
+            architecture=make_usable_architecture(self))
+        for bd in machine.blockdevice_set.all():
+            bd.delete()
+        response = self.client.post(
+            self.get_machine_uri(machine), {
+                'op': 'deploy',
+                'install_kvm': True
+            })
+        self.assertEqual(http.client.BAD_REQUEST, response.status_code)
+        self.assertEqual(
+            b"Cannot install KVM host for ephemeral deployments.",
+            response.content)
+
     def test_POST_deploy_fails_when_preseed_not_rendered(self):
         mock_get_curtin_merged_config = self.patch(
             machines_module, "get_curtin_merged_config")
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 7772294..1b8de76 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -4295,6 +4295,9 @@ class Node(CleanSave, TimestampedModel):
                         "network": [
                             "Node has no address family in common with "
                             "the server"]})
+        if self.ephemeral_deployment and self.install_kvm:
+            raise ValidationError(
+                "Cannot install KVM host for ephemeral deployments.")
         self._register_request_event(
             user, event, action='start', comment=comment)
         return self._start(
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index b97d801..c71b47c 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -6754,7 +6754,7 @@ class TestNode_Start(MAASTransactionServerTestCase):
 
     def make_acquired_node_with_interface(
             self, user, bmc_connected_to=None, power_type="virsh",
-            power_state=POWER_STATE.OFF, network=None):
+            power_state=POWER_STATE.OFF, network=None, with_boot_disk=True):
         if network is None:
             network = factory.make_ip4_or_6_network()
         cidr = str(network.cidr)
@@ -6771,7 +6771,7 @@ class TestNode_Start(MAASTransactionServerTestCase):
                 'purpose': 'xinstall',
                 }]
         node = factory.make_Node_with_Interface_on_Subnet(
-            status=NODE_STATUS.READY, with_boot_disk=True,
+            status=NODE_STATUS.READY, with_boot_disk=with_boot_disk,
             bmc_connected_to=bmc_connected_to, power_type=power_type,
             power_state=power_state, cidr=cidr, osystem=osystem,
             distro_series=distro_series)
@@ -6802,6 +6802,15 @@ class TestNode_Start(MAASTransactionServerTestCase):
         with ExpectedException(ValidationError):
             node.start(admin)
 
+    def test__raises_ValidationError_if_ephemeral_deploy_and_install_kvm(self):
+        admin = factory.make_admin()
+        node = self.make_acquired_node_with_interface(
+            admin, power_type="manual", with_boot_disk=False)
+        node.install_kvm = True
+        node.save()
+        with ExpectedException(ValidationError):
+            node.start(admin)
+
     def test__doesnt_raise_network_validation_when_all_dhcp(self):
         admin = factory.make_admin()
         node = self.make_acquired_node_with_interface(