Merge ~ack/maas:pod-delete-decompose-flag into maas:master

[Alberto Donato]

add decompose flag to API and websocket when removing pod

[MAAS Lander (maas-lander)]

UNIT TESTS
-b pod-delete-decompose-flag lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1eb4c3c85628fe4bed8beae08a1c21f08a677415

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b pod-delete-decompose-flag lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 732faca42dd615c6e2c5e13dc7db6e5a17f20d77

review: Approve

[Björn Tillenius (bjornt)]

+1 with a small comment inline.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b pod-delete-decompose-flag lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

UNIT TESTS
-b pod-delete-decompose-flag lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 820b751bf8d5a734ff63881ff25c6575aa7e27e3

review: Approve

diff --git a/src/maasserver/api/pods.py b/src/maasserver/api/pods.py
index a0097b3..b6b1686 100644
--- a/src/maasserver/api/pods.py
+++ b/src/maasserver/api/pods.py
@@ -12,7 +12,7 @@ from piston3.utils import rc
 from maasserver.api.support import admin_method, operation, OperationsHandler
 from maasserver.api.utils import get_mandatory_param
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms.pods import ComposeMachineForm, PodForm
+from maasserver.forms.pods import ComposeMachineForm, DeletePodForm, PodForm
 from maasserver.models.bmc import Pod
 from maasserver.permissions import PodPermission
 from provisioningserver.drivers.pod import Capabilities
@@ -170,6 +170,9 @@ class PodHandler(OperationsHandler):
         @description Deletes a pod with the given pod ID.
 
         @param (int) "{id}" [required=true] The pod's ID.
+        @param (boolean) "decompose" [required=false] Whether to also also
+        decompose all machines in the pod on removal. If not provided, machines
+        will not be removed.
 
         @success (http-status-code) "204" 204
 
@@ -183,9 +186,13 @@ class PodHandler(OperationsHandler):
         to delete the pod.
         @error-example (content) "no-perms"
             This method is reserved for admin users.
+
         """
         pod = Pod.objects.get_pod_or_404(id, request.user, PodPermission.edit)
-        pod.delete_and_wait()
+        form = DeletePodForm(data=request.GET)
+        if not form.is_valid():
+            raise MAASAPIValidationError(form.errors)
+        pod.delete_and_wait(decompose=form.cleaned_data["decompose"])
         return rc.DELETED
 
     @admin_method
diff --git a/src/maasserver/api/tests/test_pods.py b/src/maasserver/api/tests/test_pods.py
index edb6b86..41142aa 100644
--- a/src/maasserver/api/tests/test_pods.py
+++ b/src/maasserver/api/tests/test_pods.py
@@ -573,7 +573,6 @@ class TestPodAPIAdmin(PodAPITestForAdmin, PodMixin):
         pod = factory.make_Pod()
         for _ in range(3):
             factory.make_Machine(bmc=pod)
-            factory.make_Machine(bmc=pod, dynamic=True)
         mock_eventual = MagicMock()
         mock_async_delete = self.patch(Pod, "async_delete")
         mock_async_delete.return_value = mock_eventual
@@ -581,7 +580,22 @@ class TestPodAPIAdmin(PodAPITestForAdmin, PodMixin):
         self.assertEqual(
             http.client.NO_CONTENT, response.status_code, response.content
         )
-        self.assertThat(mock_eventual.wait, MockCalledOnceWith(60 * 7))
+        self.assertThat(mock_eventual.wait, MockCalledOnceWith(60))
+
+    def test_DELETE_calls_async_delete_decompose(self):
+        pod = factory.make_Pod()
+        for _ in range(3):
+            factory.make_Machine(bmc=pod)
+        mock_eventual = MagicMock()
+        mock_async_delete = self.patch(Pod, "async_delete")
+        mock_async_delete.return_value = mock_eventual
+        response = self.client.delete(
+            get_pod_uri(pod), query={"decompose": True}
+        )
+        self.assertEqual(
+            http.client.NO_CONTENT, response.status_code, response.content
+        )
+        self.assertThat(mock_eventual.wait, MockCalledOnceWith(60 * 4))
 
     def test_add_tag_to_pod(self):
         pod = factory.make_Pod()
diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index 4efe200..8bafaf5 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -952,7 +952,12 @@ class ComposeMachineForPodsForm(forms.Form):
         self.valid_pod_forms = [
             pod_form for pod_form in self.pod_forms if pod_form.is_valid()
         ]
-        if len(self.valid_pod_forms) == 0:
+        if not self.valid_pod_forms:
             self.add_error(
                 "__all__", "No current pod resources match constraints."
             )
+
+
+class DeletePodForm(forms.Form):
+
+    decompose = BooleanField(required=False, initial=False)
diff --git a/src/maasserver/models/bmc.py b/src/maasserver/models/bmc.py
index 58a4de1..9376837 100644
--- a/src/maasserver/models/bmc.py
+++ b/src/maasserver/models/bmc.py
@@ -1733,7 +1733,7 @@ class Pod(BMC):
             "an asynchronous action."
         )
 
-    def delete_and_wait(self):
+    def delete_and_wait(self, decompose=False):
         """Block the current thread while waiting for the pod to be deleted.
 
         This must not be called from a deferToDatabase thread; use the
@@ -1743,8 +1743,10 @@ class Pod(BMC):
         # machines. We allow maximum of 60 seconds per machine plus 60 seconds
         # for the pod.
         pod = self.as_pod()
-        num_machines = Machine.objects.filter(bmc=pod).count()
-        pod.async_delete().wait((num_machines * 60) + 60)
+        machine_wait = 0
+        if decompose:
+            machine_wait = Machine.objects.filter(bmc=pod).count() * 60
+        pod.async_delete(decompose=decompose).wait(machine_wait + 60)
 
     @asynchronous
     def async_delete(self, decompose=False):
diff --git a/src/maasserver/models/tests/test_bmc.py b/src/maasserver/models/tests/test_bmc.py
index cb938ca..f30458a 100644
--- a/src/maasserver/models/tests/test_bmc.py
+++ b/src/maasserver/models/tests/test_bmc.py
@@ -2957,6 +2957,32 @@ class TestPodDelete(MAASTransactionServerTestCase):
         self.assertIsNone(delete_machine)
         self.assertIsNone(pod)
 
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_delete_and_wait_with_decompose(self):
+        pod = yield deferToDatabase(factory.make_Pod)
+        yield deferToDatabase(factory.make_Machine, bmc=pod)
+        yield deferToDatabase(factory.make_Machine, bmc=pod)
+        mock_result = Mock()
+        mock_async_delete = self.patch(pod, "async_delete")
+        mock_async_delete.return_value = mock_result
+        yield deferToDatabase(pod.delete_and_wait, decompose=True)
+        mock_async_delete.assert_called_with(decompose=True)
+        mock_result.wait.assert_called_with(180)
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_delete_and_wait_no_decompose(self):
+        pod = yield deferToDatabase(factory.make_Pod)
+        yield deferToDatabase(factory.make_Machine, bmc=pod)
+        yield deferToDatabase(factory.make_Machine, bmc=pod)
+        mock_result = Mock()
+        mock_async_delete = self.patch(pod, "async_delete")
+        mock_async_delete.return_value = mock_result
+        yield deferToDatabase(pod.delete_and_wait)
+        mock_async_delete.assert_called_with(decompose=False)
+        mock_result.wait.assert_called_with(60)
+
 
 class TestPodDefaultMACVlanMode(MAASServerTestCase):
     def test_allows_default_macvlan_mode(self):
diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index c337ff3..5e0b5b5 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -329,8 +329,9 @@ class PodHandler(TimestampedModelHandler):
                 raise HandlerPermissionError()
             return obj
 
+        decompose = params.get("decompose", False)
         d = deferToDatabase(get_object, params)
-        d.addCallback(lambda pod: pod.async_delete())
+        d.addCallback(lambda pod: pod.async_delete(decompose=decompose))
         return d
 
     @asynchronous
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index 572c204..d9c485c 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -14,6 +14,7 @@ from twisted.internet.defer import inlineCallbacks, succeed
 from maasserver.enum import INTERFACE_TYPE
 from maasserver.forms import pods
 from maasserver.forms.pods import PodForm
+from maasserver.models import Pod
 from maasserver.models.virtualmachine import MB, VirtualMachineInterface
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASTransactionServerTestCase
@@ -522,6 +523,17 @@ class TestPodHandler(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
+    def test_delete_decompose(self):
+        user = yield deferToDatabase(factory.make_admin)
+        handler = PodHandler(user, {}, None)
+        pod = yield deferToDatabase(self.make_pod_with_hints)
+        mock_async_delete = self.patch(Pod, "async_delete")
+        yield deferToDatabase(factory.make_Machine, bmc=pod)
+        yield handler.delete({"id": pod.id, "decompose": True})
+        mock_async_delete.assert_called_once_with(decompose=True)
+
+    @wait_for_reactor
+    @inlineCallbacks
     def test_create(self):
         user = yield deferToDatabase(factory.make_admin)
         handler = PodHandler(user, {}, None)