|
@@ -96,7 +96,7 @@ class BaseStorage(object):
|
|
|
node = self.data[item_id]
|
|
|
|
|
|
nodes += 1
|
|
|
- if self.get_nodestatus(item_id) == 'active':
|
|
|
+ if self.get_nodestatus(node=node) == 'active':
|
|
|
nodes_active += 1
|
|
|
|
|
|
sum_clients += node.get('clientcount', 0)
|
|
@@ -242,11 +242,12 @@ class BaseStorage(object):
|
|
|
# MAC address not found
|
|
|
return None
|
|
|
|
|
|
- def get_nodestatus(self, rawid):
|
|
|
+ def get_nodestatus(self, rawid=None, node=None):
|
|
|
"""Determine node's status."""
|
|
|
|
|
|
# search node by the given id
|
|
|
- node = self.find_node(rawid)
|
|
|
+ if node is None and not rawid is None:
|
|
|
+ node = self.find_node(rawid)
|
|
|
|
|
|
# handle unknown nodes
|
|
|
if node is None:
|