Merge pull request #821 from naved001/node-delete-checks

Node delete won't delete a node if it belongs to a project.

hil/api.py

@@ -292,6 +292,10 @@ def node_delete(node):
     """
     get_auth_backend().require_admin()
     node = _must_find(model.Node, node)
+    if node.project:
+        raise BlockedError("Node %r is part of project %r; remove from "
+                           "project before deleting"
+                           % (node.label, node.project.label))
     if node.nics != []:
         raise BlockedError("Node %r has nics; remove them before deleting %r."
                            % (node.label, node.label))

tests/unit/api/main.py

@@ -493,6 +493,18 @@ def test_node_delete_nic_exist(self):
         with pytest.raises(api.BlockedError):
             api.node_delete('node-99')
 
+    def test_node_delete_in_project(self):
+        """node_delete should respond with an error if node is in project"""
+        api.node_register('node-99', obm={
+                  "type": "http://schema.massopencloud.org/haas/v0/obm/ipmi",
+                  "host": "ipmihost",
+                  "user": "root",
+                  "password": "tapeworm"})
+        api.project_create('skeleton')
+        api.project_connect_node('skeleton', 'node-99')
+        with pytest.raises(api.BlockedError):
+            api.node_delete('node-99')
+
 
 class TestNodeRegisterDeleteNic: