|
|
@@ -60,10 +60,19 @@ class BaseStorage(object):
|
|
|
|
|
|
nodes = 0
|
|
|
nodes_active = 0
|
|
|
+ gateways = 0
|
|
|
+ gateways_active = 0
|
|
|
sum_clients = 0
|
|
|
clients = set()
|
|
|
|
|
|
for node in self.get_nodes():
|
|
|
+ nodetype = node.get('type', 'node')
|
|
|
+ if nodetype == 'gateway':
|
|
|
+ gateways += 1
|
|
|
+ if self.get_nodestatus(node=node) == 'active':
|
|
|
+ gateways_active += 1
|
|
|
+ continue
|
|
|
+
|
|
|
nodes += 1
|
|
|
|
|
|
nodemacs = [x for x in node.get('macs', [])]
|
|
|
@@ -82,6 +91,8 @@ class BaseStorage(object):
|
|
|
return {
|
|
|
'clients_sum': sum_clients,
|
|
|
'clients_unique': len(clients),
|
|
|
+ 'gateways': gateways,
|
|
|
+ 'gateways_active': gateways_active,
|
|
|
'nodes': nodes,
|
|
|
'nodes_active': nodes_active,
|
|
|
'now': int(time.time()),
|
