Merge ~ltrager/maas:config_network_failed_testing into maas:master

[Lee Trager]

Allow network configuration to be changed when in FAILED_TESTING.

When network-validation fails the machine will be put into FAILED_TESTING.
The failure may be due to user configuration so allow users to change
configuration without overriding failed tests.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b config_network_failed_testing lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/6222/console
COMMIT: 3b28fb91bd6c0ee09783e0f96e6bc2b9bea1dff0

review: Needs Fixing

[Blake Rouse (blake-rouse)]

That's a lot of tests for such a simple change... I hate that!

review: Approve

517f9d5... by Lee Trager on 2019-08-22

Merge branch 'master' into config_network_failed_testing

2ef17cc... by Lee Trager on 2019-08-22

adam-collard fixes

diff --git a/src/maasserver/api/interfaces.py b/src/maasserver/api/interfaces.py
index 0232d08..099b50a 100644
--- a/src/maasserver/api/interfaces.py
+++ b/src/maasserver/api/interfaces.py
@@ -98,7 +98,10 @@ INTERFACES_PREFETCH = [
      'children_relationships__child__vlan'),
 ]
 
-ALLOWED_STATES = (NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN)
+ALLOWED_STATES = (
+    NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING,
+    NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN,
+)
 
 
 def raise_error_for_invalid_state_on_allocated_operations(
diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index bb50d67..b9e7d9f 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -1226,10 +1226,11 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user,
             perm=NodePermission.admin)
-        if machine.status != NODE_STATUS.READY:
+        if machine.status not in {
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING}:
             raise NodeStateViolation(
-                "Machine must be in a ready state to restore networking "
-                "configuration")
+                "Machine must be in a ready or failed testing state to "
+                "restore networking configuration")
         machine.restore_network_interfaces()
         machine.set_initial_networking_configuration()
         return reload_object(machine)
@@ -1260,10 +1261,11 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user,
             perm=NodePermission.admin)
-        if machine.status != NODE_STATUS.READY:
+        if machine.status not in {
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING}:
             raise NodeStateViolation(
-                "Machine must be in a ready state to restore storage "
-                "configuration.")
+                "Machine must be in a ready or failed testing state to "
+                "restore storage configuration.")
         machine.set_default_storage_layout()
         return reload_object(machine)
 
@@ -1293,10 +1295,11 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user,
             perm=NodePermission.admin)
-        if machine.status != NODE_STATUS.READY:
+        if machine.status not in {
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING}:
             raise NodeStateViolation(
-                "Machine must be in a ready state to restore default "
-                "networking and storage configuration.")
+                "Machine must be in a ready or failed testing state to "
+                "restore default networking and storage configuration.")
         machine.set_default_storage_layout()
         machine.restore_network_interfaces()
         machine.set_initial_networking_configuration()
diff --git a/src/maasserver/api/tests/test_interfaces.py b/src/maasserver/api/tests/test_interfaces.py
index 3e40bd7..fc27dad 100644
--- a/src/maasserver/api/tests/test_interfaces.py
+++ b/src/maasserver/api/tests/test_interfaces.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 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 NodeInterfaces API."""
@@ -14,6 +14,7 @@ from maasserver.enum import (
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_STATUS,
+    NODE_STATUS_CHOICES,
     NODE_TYPE,
 )
 from maasserver.models import Interface
@@ -37,25 +38,14 @@ from testtools.matchers import (
 )
 
 
-STATUSES = (
-    NODE_STATUS.NEW,
-    NODE_STATUS.COMMISSIONING,
-    NODE_STATUS.FAILED_COMMISSIONING,
-    NODE_STATUS.MISSING,
-    NODE_STATUS.RESERVED,
-    NODE_STATUS.DEPLOYING,
-    NODE_STATUS.DEPLOYED,
-    NODE_STATUS.RETIRED,
-    NODE_STATUS.FAILED_DEPLOYMENT,
-    NODE_STATUS.RELEASING,
-    NODE_STATUS.FAILED_RELEASING,
-    NODE_STATUS.DISK_ERASING,
-    NODE_STATUS.FAILED_DISK_ERASING,
-    NODE_STATUS.ENTERING_RESCUE_MODE,
-    NODE_STATUS.FAILED_ENTERING_RESCUE_MODE,
-    NODE_STATUS.RESCUE_MODE,
-    NODE_STATUS.EXITING_RESCUE_MODE,
-    NODE_STATUS.FAILED_EXITING_RESCUE_MODE,
+EDITABLE_STATUSES = (
+    NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING,
+    NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN,
+)
+
+BLOCKED_STATUSES = (
+    status for status, _ in NODE_STATUS_CHOICES
+    if status not in EDITABLE_STATUSES
 )
 
 
@@ -174,7 +164,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_physical(self):
         self.become_admin()
-        for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(status=status)
             mac = factory.make_mac_address()
             name = factory.make_name("eth")
@@ -240,8 +230,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_physical_disabled(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(status=status)
             mac = factory.make_mac_address()
             name = factory.make_name("eth")
@@ -288,9 +277,9 @@ class TestInterfacesAPI(APITestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_create_physical_409_when_not_ready_or_broken(self):
+    def test_create_physical_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(status=status)
             mac = factory.make_mac_address()
             name = factory.make_name("eth")
@@ -307,7 +296,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_physical_requires_mac(self):
         self.become_admin()
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_physical",
@@ -320,7 +309,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_physical_doesnt_allow_mac_already_register(self):
         self.become_admin()
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         interface_on_other_node = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL)
         name = factory.make_name("eth")
@@ -342,8 +331,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_bond(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(status=status)
             vlan = factory.make_VLAN()
             parent_1_iface = factory.make_Interface(
@@ -413,9 +401,9 @@ class TestInterfacesAPI(APITestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_create_bond_409_when_not_ready_or_broken(self):
+    def test_create_bond_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(status=status)
             vlan = factory.make_VLAN()
             parent_1_iface = factory.make_Interface(
@@ -436,7 +424,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_bond_requires_name_vlan_and_parents(self):
         self.become_admin()
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_bond",
@@ -452,7 +440,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_vlan(self):
         self.become_admin()
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         untagged_vlan = factory.make_VLAN()
         parent_iface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, vlan=untagged_vlan, node=node)
@@ -495,7 +483,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
             http.client.NOT_FOUND, response.status_code, response.content)
 
     def test_create_vlan_requires_admin(self):
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         untagged_vlan = factory.make_VLAN()
         parent_iface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, vlan=untagged_vlan, node=node)
@@ -511,7 +499,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_vlan_requires_vlan_and_parent(self):
         self.become_admin()
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_vlan",
@@ -527,7 +515,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
     def test_create_bridge(self):
         self.become_admin()
         name = factory.make_name("br")
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         untagged_vlan = factory.make_VLAN()
         parent_iface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, vlan=untagged_vlan, node=node)
@@ -571,7 +559,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
             http.client.NOT_FOUND, response.status_code, response.content)
 
     def test_create_bridge_requires_admin(self):
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         untagged_vlan = factory.make_VLAN()
         parent_iface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, vlan=untagged_vlan, node=node)
@@ -586,7 +574,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_bridge_requires_name_and_parent(self):
         self.become_admin()
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         uri = get_interfaces_uri(node)
         response = self.client.post(uri, {
             "op": "create_bridge",
@@ -603,8 +591,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
     def test_create_acquired_bridge(self):
         self.become_admin()
         name = factory.make_name("br")
-        node = factory.make_Node(
-            status=NODE_STATUS.ALLOCATED, owner=self.user)
+        node = factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=self.user)
         parent_fabric = factory.make_Fabric()
         parent_vlan = parent_fabric.get_default_vlan()
         parent_iface = factory.make_Interface(
@@ -651,7 +638,7 @@ class TestInterfacesAPI(APITestCase.ForUser):
 
     def test_create_acquired_bridge_not_allowed_in_ready(self):
         name = factory.make_name("br")
-        node = factory.make_Node(status=NODE_STATUS.READY)
+        node = factory.make_Node(status=random.choice(EDITABLE_STATUSES))
         parent_fabric = factory.make_Fabric()
         parent_vlan = parent_fabric.get_default_vlan()
         parent_iface = factory.make_Interface(
@@ -933,8 +920,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_update_physical_interface(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(status=status)
             interface = factory.make_Interface(
                 INTERFACE_TYPE.PHYSICAL, node=node)
@@ -984,8 +970,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_update_bond_interface(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(status=status)
             bond, [nic_0, nic_1], [vlan_10, vlan_11] = make_complex_interface(
                 node)
@@ -1000,8 +985,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_update_vlan_interface(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(status=status)
             bond, [nic_0, nic_1], [vlan_10, vlan_11] = make_complex_interface(
                 node)
@@ -1030,11 +1014,11 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_update_409_when_not_ready_broken_or_deployed(self):
         self.become_admin()
-        statuses = list(STATUSES)
-        # Update is the only call that a deployed node can have called on
-        # its interface.
-        statuses.remove(NODE_STATUS.DEPLOYED)
-        for status in statuses:
+        for status in BLOCKED_STATUSES:
+            # Update is the only call that a deployed node can have called on
+            # its interface.
+            if status == NODE_STATUS.DEPLOYED:
+                continue
             node = factory.make_Node(interface=True, status=status)
             interface = factory.make_Interface(
                 INTERFACE_TYPE.PHYSICAL, node=node)
@@ -1048,8 +1032,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_delete_deletes_interface(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1089,9 +1072,9 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         self.assertEqual(
             http.client.NOT_FOUND, response.status_code, response.content)
 
-    def test_delete_409_when_not_ready_or_broken(self):
+    def test_delete_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1104,8 +1087,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         # This just tests that the form is saved and the updated interface
         # is returned.
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1144,7 +1126,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_allows_subnet_with_link_up(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         subnet = factory.make_Subnet(vlan=interface.vlan)
@@ -1166,7 +1149,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_allows_link_up_subnet_to_be_cleared(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         subnet = factory.make_Subnet(vlan=interface.vlan)
@@ -1191,7 +1175,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_allows_link_up_subnet_to_be_changed(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         subnet = factory.make_Subnet(vlan=interface.vlan)
@@ -1219,7 +1204,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_disallows_subnets_on_another_vlan(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         vlan2 = factory.make_VLAN()
@@ -1241,7 +1227,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_allows_link_up_subnet_to_be_forcibly_changed(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         vlan2 = factory.make_VLAN()
@@ -1271,7 +1258,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_force_link_up_deletes_existing_links(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         vlan2 = factory.make_VLAN()
@@ -1301,7 +1289,8 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_without_force_link_up_returns_bad_request(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user, status=NODE_STATUS.READY)
+        node = factory.make_Node(
+            owner=self.user, status=random.choice(EDITABLE_STATUSES))
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node)
         vlan2 = factory.make_VLAN()
@@ -1343,8 +1332,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_link_subnet_raises_error(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1368,9 +1356,9 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_link_subnet_409_when_not_ready_or_broken(self):
+    def test_link_subnet_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1386,8 +1374,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         # This just tests that the form is saved and the updated interface
         # is returned.
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             subnet = factory.make_Subnet()
@@ -1424,8 +1411,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_unlink_subnet_raises_error(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1449,9 +1435,9 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_unlink_subnet_409_when_not_ready_or_broken(self):
+    def test_unlink_subnet_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1466,8 +1452,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         # This just tests that the form is saved and the updated interface
         # is returned.
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             subnet = factory.make_Subnet()
@@ -1493,9 +1478,9 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_disconnect_409_when_not_ready_or_broken(self):
+    def test_disconnect_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1509,8 +1494,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         # The form that is used is fully tested in test_forms_interface_link.
         # This just tests that the form is saved and the node link is created.
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             network = factory.make_ipv4_network()
@@ -1532,8 +1516,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         # The form that is used is fully tested in test_forms_interface_link.
         # This just tests that the form is saved and the node link is created.
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             network = factory.make_ipv6_network()
@@ -1553,8 +1536,7 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
 
     def test_set_default_gateway_raises_error(self):
         self.become_admin()
-        for status in (
-                NODE_STATUS.READY, NODE_STATUS.ALLOCATED, NODE_STATUS.BROKEN):
+        for status in EDITABLE_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
@@ -1578,9 +1560,9 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
-    def test_set_default_gateway_409_when_not_ready_or_broken(self):
+    def test_set_default_gateway_409_when_invalid_status(self):
         self.become_admin()
-        for status in STATUSES:
+        for status in BLOCKED_STATUSES:
             node = factory.make_Node(interface=True, status=status)
             interface = node.get_boot_interface()
             uri = get_interface_uri(interface)
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 196b8b2..cc2c8a6 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -2675,7 +2675,8 @@ class TestRestoreNetworkingConfiguration(APITestCase.ForUser):
 
     def test_restore_networking_configuration(self):
         self.become_admin()
-        machine = factory.make_Machine(status=NODE_STATUS.READY)
+        machine = factory.make_Machine(status=choice([
+            NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         mock_restore_network_interfaces = self.patch(
             node_module.Machine, 'restore_network_interfaces')
         mock_set_initial_networking_config = self.patch(
@@ -2699,7 +2700,9 @@ class TestRestoreNetworkingConfiguration(APITestCase.ForUser):
 
     def test_restore_networking_configuration_checks_machine_status(self):
         self.become_admin()
-        machine = factory.make_Machine(status=NODE_STATUS.DEPLOYED)
+        machine = factory.make_Machine(status=factory.pick_choice(
+            NODE_STATUS_CHOICES,
+            but_not=[NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         mock_set_initial_networking_config = self.patch(
             node_module.Machine, 'set_initial_networking_configuration')
         response = self.client.post(
@@ -2719,7 +2722,8 @@ class TestRestoreStorageConfiguration(APITestCase.ForUser):
 
     def test_restore_storage_configuration(self):
         self.become_admin()
-        machine = factory.make_Machine(status=NODE_STATUS.READY)
+        machine = factory.make_Machine(status=choice([
+            NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         mock_set_default_storage_layout = self.patch(
             node_module.Machine, 'set_default_storage_layout')
         response = self.client.post(
@@ -2740,7 +2744,9 @@ class TestRestoreStorageConfiguration(APITestCase.ForUser):
 
     def test_restore_storage_configuration_checks_machine_status(self):
         self.become_admin()
-        machine = factory.make_Machine(status=NODE_STATUS.DEPLOYED)
+        machine = factory.make_Machine(status=factory.pick_choice(
+            NODE_STATUS_CHOICES,
+            but_not=[NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         mock_set_default_storage_layout = self.patch(
             node_module.Machine, 'set_default_storage_layout')
         response = self.client.post(
@@ -2760,7 +2766,8 @@ class TestRestoreDefaultConfiguration(APITestCase.ForUser):
 
     def test_restore_default_configuration(self):
         self.become_admin()
-        machine = factory.make_Machine(status=NODE_STATUS.READY)
+        machine = factory.make_Machine(status=choice([
+            NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         mock_set_default_storage_layout = self.patch(
             node_module.Machine, 'set_default_storage_layout')
         mock_restore_network_interfaces = self.patch(
@@ -2787,7 +2794,9 @@ class TestRestoreDefaultConfiguration(APITestCase.ForUser):
 
     def test_restore_default_configuration_checks_machine_status(self):
         self.become_admin()
-        machine = factory.make_Machine(status=NODE_STATUS.DEPLOYED)
+        machine = factory.make_Machine(status=factory.pick_choice(
+            NODE_STATUS_CHOICES,
+            but_not=[NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         mock_restore_default_configuration = self.patch(
             node_module.Machine, 'restore_default_configuration')
         response = self.client.post(
diff --git a/src/maasserver/forms/clone.py b/src/maasserver/forms/clone.py
index 6999193..5d59af3 100644
--- a/src/maasserver/forms/clone.py
+++ b/src/maasserver/forms/clone.py
@@ -47,7 +47,8 @@ class CloneForm(forms.Form):
         self.fields['destinations'].base_field.queryset = (
             Machine.objects.get_nodes(
                 self.user, NodePermission.admin,
-                from_nodes=Machine.objects.filter(status=NODE_STATUS.READY)))
+                from_nodes=Machine.objects.filter(status__in={
+                    NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING})))
 
     def clean(self):
         """Validate that the form is valid and that the destinations can accept
diff --git a/src/maasserver/forms/tests/test_clone.py b/src/maasserver/forms/tests/test_clone.py
index aa8738a..6db8e2d 100644
--- a/src/maasserver/forms/tests/test_clone.py
+++ b/src/maasserver/forms/tests/test_clone.py
@@ -5,6 +5,8 @@
 
 __all__ = []
 
+import random
+
 from maasserver.enum import NODE_STATUS
 from maasserver.forms.clone import CloneForm
 from maasserver.testing.factory import factory
@@ -25,7 +27,8 @@ class TestCloneForm(MAASServerTestCase):
 
     def test__source_destination_match_error(self):
         user = factory.make_admin()
-        source = factory.make_Machine(status=NODE_STATUS.READY)
+        source = factory.make_Machine(status=random.choice([
+            NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]))
         form = CloneForm(user, data={
             'source': source.system_id,
             'destinations': [source.system_id],
@@ -44,7 +47,9 @@ class TestCloneForm(MAASServerTestCase):
         factory.make_PhysicalBlockDevice(
             node=source, size=8 * 1024 ** 3, name="sda")
         destination = factory.make_Machine(
-            status=NODE_STATUS.READY, with_boot_disk=False)
+            status=random.choice([
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]),
+            with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
             node=destination, size=4 * 1024 ** 3, name="sda")
         form = CloneForm(user, data={
@@ -65,7 +70,9 @@ class TestCloneForm(MAASServerTestCase):
         source = factory.make_Machine(with_boot_disk=False)
         factory.make_Interface(node=source, name='eth0')
         destination = factory.make_Machine(
-            status=NODE_STATUS.READY, with_boot_disk=False)
+            status=random.choice([
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]),
+            with_boot_disk=False)
         factory.make_Interface(node=destination, name='eth1')
         form = CloneForm(user, data={
             'source': source.system_id,
@@ -87,7 +94,9 @@ class TestCloneForm(MAASServerTestCase):
             node=source, size=8 * 1024 ** 3, name="sda")
         factory.make_Interface(node=source, name='eth0')
         destination = factory.make_Machine(
-            status=NODE_STATUS.READY, with_boot_disk=False)
+            status=random.choice([
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]),
+            with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
             node=destination, size=8 * 1024 ** 3, name="sda")
         factory.make_Interface(node=destination, name='eth0')
@@ -112,12 +121,16 @@ class TestCloneForm(MAASServerTestCase):
             node=source, size=8 * 1024 ** 3, name="sda")
         factory.make_Interface(node=source, name='eth0')
         destination1 = factory.make_Machine(
-            status=NODE_STATUS.READY, with_boot_disk=False)
+            status=random.choice([
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]),
+            with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
             node=destination1, size=8 * 1024 ** 3, name="sda")
         factory.make_Interface(node=destination1, name='eth0')
         destination2 = factory.make_Machine(
-            status=NODE_STATUS.READY, with_boot_disk=False)
+            status=random.choice([
+                NODE_STATUS.READY, NODE_STATUS.FAILED_TESTING]),
+            with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
             node=destination2, size=8 * 1024 ** 3, name="sda")
         factory.make_Interface(node=destination2, name='eth0')
diff --git a/src/maasserver/static/js/angular/controllers/node_details_networking.js b/src/maasserver/static/js/angular/controllers/node_details_networking.js
index d0a80ec..4fda858 100644
--- a/src/maasserver/static/js/angular/controllers/node_details_networking.js
+++ b/src/maasserver/static/js/angular/controllers/node_details_networking.js
@@ -727,7 +727,9 @@ export function NodeNetworkingController(
     }
     if (
       angular.isObject($scope.node) &&
-      ["New", "Ready", "Allocated", "Broken"].indexOf($scope.node.status) === -1
+      ["New", "Ready", "Failed testing", "Allocated", "Broken"].indexOf(
+        $scope.node.status
+      ) === -1
     ) {
       // If a non-controller node is not ready allocated, or broken,
       // disable networking panel.
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js
index c99f740..2764a15 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js
@@ -3412,6 +3412,8 @@ describe("NodeNetworkingController", function() {
         expect($scope.isAllNetworkingDisabled()).toBe(false);
         $scope.node = { status: "Ready" };
         expect($scope.isAllNetworkingDisabled()).toBe(false);
+        $scope.node = { status: "Failed testing" };
+        expect($scope.isAllNetworkingDisabled()).toBe(false);
         $scope.node = { status: "Allocated" };
         expect($scope.isAllNetworkingDisabled()).toBe(false);
         $scope.node = { status: "Broken" };