Merge ~andreserl/maas:lp1826600_force_release_master into maas:master

[Andres Rodriguez]

LP: #1826600 - Correctly capture and pass the force param when releasing a machine

[Newell Jensen (newell-jensen)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1826600_force_release_master lp:~andreserl/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/5556/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1826600_force_release_master lp:~andreserl/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/5558/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1826600_force_release_master lp:~andreserl/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/5559/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1826600_force_release_master lp:~andreserl/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/5560/consoleText

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 3f3a214..36ab7e8 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -798,6 +798,10 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         and at the end of the drive to make data recovery inconvenient and
         unlikely to happen by accident. This is not secure.
 
+        @param (boolean) "force" [required=false] Will force the release of a
+        machine. If the machine was deployed as a KVM host, this will be
+        deleted as well as all machines inside the KVM host. USE WITH CAUTION.
+
         @success (http-status-code) "200" 200
         @success (json) "success-json" A JSON object containing information
         about the released machine.
@@ -826,6 +830,8 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
             request.POST, 'quick_erase', default=None, validator=StringBool)
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NodePermission.edit)
+        force = get_optional_param(
+            request.POST, 'force', default=None, validator=StringBool)
         if machine.status in (NODE_STATUS.RELEASING, NODE_STATUS.READY):
             # Nothing to do if this machine is already releasing, otherwise
             # this may be a redundant retry, and the
@@ -835,7 +841,8 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
             machine.release_or_erase(
                 request.user, comment,
                 erase=erase, secure_erase=secure_erase,
-                quick_erase=quick_erase)
+                quick_erase=quick_erase,
+                force=force)
         else:
             raise NodeStateViolation(
                 "Machine cannot be released in its current state ('%s')."
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 2d9bc85..d4a218e 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -1192,7 +1192,8 @@ class TestMachineAPI(APITestCase.ForUser):
             machine_release,
             MockCalledOnceWith(
                 self.user, comment,
-                erase=False, quick_erase=None, secure_erase=None))
+                erase=False, quick_erase=None, secure_erase=None,
+                force=None))
 
     def test_POST_release_passes_erase_options(self):
         machine = factory.make_Node(
@@ -1214,7 +1215,28 @@ class TestMachineAPI(APITestCase.ForUser):
             MockCalledOnceWith(
                 self.user, None,
                 erase=True, quick_erase=quick_erase,
-                secure_erase=secure_erase))
+                secure_erase=secure_erase,
+                force=None))
+
+    def test_POST_release_passes_force_option(self):
+        machine = factory.make_Node(
+            status=NODE_STATUS.ALLOCATED, owner=factory.make_User(),
+            power_type='ipmi', power_state=POWER_STATE.OFF)
+        self.become_admin()
+        force = factory.pick_bool()
+        machine_release = self.patch(node_module.Machine, 'release_or_erase')
+        self.client.post(
+            self.get_machine_uri(machine), {
+                'op': 'release',
+                'force': force,
+            })
+        self.assertThat(
+            machine_release,
+            MockCalledOnceWith(
+                self.user, None,
+                erase=False, quick_erase=None,
+                secure_erase=None,
+                force=force))
 
     def test_POST_release_handles_missing_comment(self):
         machine = factory.make_Node(
@@ -1228,7 +1250,8 @@ class TestMachineAPI(APITestCase.ForUser):
             machine_release,
             MockCalledOnceWith(
                 self.user, None,
-                erase=False, quick_erase=None, secure_erase=None))
+                erase=False, quick_erase=None, secure_erase=None,
+                force=None))
 
     def test_POST_commission_commissions_machine(self):
         self.patch(