Merge "Don't allow deletion of associated node"

2 files changed, 11 insertions, 0 deletions

diff --git a/ironic/tests/api/test_nodes.py b/ironic/tests/api/test_nodes.py
index 334126e6a..b0fdf75fe 100644
--- a/ironic/tests/api/test_nodes.py
+++ b/ironic/tests/api/test_nodes.py
@@ -370,6 +370,12 @@ class TestDelete(base.FunctionalTest):
                                expect_errors=True)
         self.assertEqual(response.status_int, 403)
 
+    def test_delete_associated(self):
+        ndict = dbutils.get_test_node(instance_uuid='fake-uuid-1234')
+        self.post_json('/nodes', ndict)
+        response = self.delete('/nodes/%s' % ndict['uuid'], expect_errors=True)
+        self.assertEqual(response.status_int, 409)
+
 
 class TestPut(base.FunctionalTest):
 
diff --git a/ironic/tests/db/test_nodes.py b/ironic/tests/db/test_nodes.py
index 25edfe7e6..206b3a219 100644
--- a/ironic/tests/db/test_nodes.py
+++ b/ironic/tests/db/test_nodes.py
@@ -155,6 +155,11 @@ class DbNodeTestCase(base.DbTestCase):
         self.assertRaises(exception.NodeLocked,
                           self.dbapi.destroy_node, n['id'])
 
+    def test_destroy_associated_node(self):
+        n = self._create_test_node(instance_uuid='fake-uuid-1234')
+        self.assertRaises(exception.NodeAssociated,
+                          self.dbapi.destroy_node, n['uuid'])
+
     def test_ports_get_destroyed_after_destroying_a_node(self):
         n = self._create_test_node()
         node_id = n['id']