11349: Report wishlist size in status["nodes_wish"].

diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 5522877bc01f39ff2c1be5dc907d5b215302cfc0..9bfee79b59bae21968064b995e5cd87df7d7c7b9 100644 (file)
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -263,6 +263,7 @@ class NodeManagerDaemonActor(actor_class):
         for s in self._node_states(size=None):
             updates.setdefault('nodes_'+s, 0)
             updates['nodes_'+s] += 1
+        updates['nodes_wish'] = len(self.last_wishlist)
         status.tracker.update(updates)
 
     def _state_counts(self, size):

diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 84ede2a3c686163113702e7ec3c6eaf890e25918..04ff9b6d79962922ea8a3327edc726db528b524e 100644 (file)
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -365,6 +365,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
         with test_status.TestServer() as srv:
             self.assertEqual(0, srv.get_status().get('nodes_unpaired', None))
             self.assertEqual(1, srv.get_status().get('nodes_shutdown', None))
+            self.assertEqual(0, srv.get_status().get('nodes_wish', None))
 
     def test_booted_node_lifecycle(self):
         cloud_node = testutil.cloud_node_mock(6)