openstack
/
fuel-web
Code Issues Proposed changes

Merge "Explicitly remove pending_addition flag on discovered node deletion"

This commit is contained in:
Jenkins 2017-01-04 13:56:26 +00:00 committed by Gerrit Code Review
parent f36a443837 064722cca6
commit aad8791de1
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nailgun/nailgun/api/v1/handlers/assignment.py
View File

@ -89,6 +89,7 @@ class NodeUnassignmentHandler(BaseHandler):
for node in nodes:
if node.status == consts.NODE_STATUSES.discover:
objects.Node.remove_from_cluster(node)
objects.Node.update(node, {"pending_addition": False})
else:
objects.Node.update(node, {"pending_deletion": True})

1
nailgun/nailgun/test/unit/test_node_assignment_handler.py
View File

@ -85,6 +85,7 @@ class TestAssignmentHandlers(BaseIntegrationTest):
self.assertEqual(None, resp.json_body)
self.assertEqual(node.cluster, None)
self.assertEqual(node.pending_roles, [])
self.assertEqual(node.pending_addition, False)
# Test with invalid node ids
for node_id in (0, node.id + 50):