From 064722cca657f12e285f17ea500ba5d46e604f55 Mon Sep 17 00:00:00 2001 From: Stanislaw Bogatkin Date: Fri, 16 Dec 2016 19:39:04 +0300 Subject: [PATCH] Explicitly remove pending_addition flag on discovered node deletion As we set pending_addition flag on node assignment, remove it on node unassignment accordingly. Change-Id: I9ed3d85ad2134b362ab145e7008dc8447590a590 Closes-Bug: #1644853 --- nailgun/nailgun/api/v1/handlers/assignment.py | 1 + nailgun/nailgun/test/unit/test_node_assignment_handler.py | 1 + 2 files changed, 2 insertions(+) diff --git a/nailgun/nailgun/api/v1/handlers/assignment.py b/nailgun/nailgun/api/v1/handlers/assignment.py index 1e9d3914f1..7649f48d13 100644 --- a/nailgun/nailgun/api/v1/handlers/assignment.py +++ b/nailgun/nailgun/api/v1/handlers/assignment.py @@ -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}) diff --git a/nailgun/nailgun/test/unit/test_node_assignment_handler.py b/nailgun/nailgun/test/unit/test_node_assignment_handler.py index c25c574404..e944547147 100644 --- a/nailgun/nailgun/test/unit/test_node_assignment_handler.py +++ b/nailgun/nailgun/test/unit/test_node_assignment_handler.py @@ -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):