Merge ~andreserl/maas:2.5_more_stats into maas:master

[Andres Rodriguez]

Stats for networks and most important machine states.

[Blake Rouse (blake-rouse)]

Looks good to me. Please improve the commit message before landing, like what stats are you adding.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.5_more_stats lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4011/consoleText

78265e6... by Andres Rodriguez on 2018-09-28

Fix lint

diff --git a/src/maasserver/stats.py b/src/maasserver/stats.py
index 978af87..d0544b9 100644
--- a/src/maasserver/stats.py
+++ b/src/maasserver/stats.py
@@ -24,8 +24,17 @@ import base64
 from collections import Counter
 import json
 
-from maasserver.enum import NODE_TYPE
-from maasserver.models import Node
+from maasserver.enum import (
+    NODE_TYPE,
+    NODE_STATUS,
+)
+from maasserver.models import (
+    Node,
+    Fabric,
+    VLAN,
+    Space,
+    Subnet,
+)
 from maasserver.utils import get_maas_user_agent
 import requests
 
@@ -39,11 +48,48 @@ def get_machine_stats():
         total_storage=Sum('blockdevice__size'))
 
 
+def get_machine_state_stats():
+    node_status = Node.objects.values_list('status', flat=True)
+    node_status = Counter(node_status)
+
+    return {
+        "ready": node_status.get(NODE_STATUS.READY, 0),
+        "allocated": node_status.get(NODE_STATUS.ALLOCATED, 0),
+        "deploying": node_status.get(NODE_STATUS.DEPLOYING, 0),
+        "deployed": node_status.get(NODE_STATUS.DEPLOYED, 0),
+        "failed_deployment": node_status.get(
+            NODE_STATUS.FAILED_DEPLOYMENT, 0),
+        "failed_commissioning": node_status.get(
+            NODE_STATUS.FAILED_COMMISSIONING, 0),
+        }
+
+
+def get_subnets_stats():
+    subnets = Subnet.objects.all()
+    v4 = [net for net in subnets if net.get_ip_version() == 4]
+    v6 = [net for net in subnets if net.get_ip_version() == 6]
+    return {
+        "spaces": Space.objects.count(),
+        "fabrics": Fabric.objects.count(),
+        "vlans": VLAN.objects.count(),
+        "subnets_v4": len(v4),
+        "subnets_v6": len(v6),
+        }
+
+
 def get_maas_stats():
+    # TODO
+    # - architectures
+    # - resource pools
+    # - pods
     # Get all node types to get count values
     node_types = Node.objects.values_list('node_type', flat=True)
     node_types = Counter(node_types)
+    # get summary of machine resources, and its statuses.
     stats = get_machine_stats()
+    machine_status = get_machine_state_stats()
+    # get summary of network objects
+    netstats = get_subnets_stats()
 
     return json.dumps({
         "controllers": {
@@ -57,6 +103,8 @@ def get_maas_stats():
             "devices": node_types.get(NODE_TYPE.DEVICE, 0),
         },
         "machine_stats": stats,
+        "machine_status": machine_status,
+        "network_stats": netstats,
     })
 
 
diff --git a/src/maasserver/tests/test_stats.py b/src/maasserver/tests/test_stats.py
index d0200f7..ee7a657 100644
--- a/src/maasserver/tests/test_stats.py
+++ b/src/maasserver/tests/test_stats.py
@@ -10,7 +10,13 @@ import json
 
 from django.db import transaction
 from maasserver import stats
-from maasserver.models import Config
+from maasserver.models import (
+    Config,
+    Fabric,
+    Space,
+    Subnet,
+    VLAN,
+)
 from maasserver.stats import (
     get_maas_stats,
     get_machine_stats,
@@ -41,10 +47,14 @@ class TestMAASStats(MAASServerTestCase):
         factory.make_RegionRackController()
         factory.make_RegionController()
         factory.make_RackController()
-        factory.make_Machine(cpu_count=2, memory=200)
-        factory.make_Machine(cpu_count=3, memory=100)
+        factory.make_Machine(cpu_count=2, memory=200, status=4)
+        factory.make_Machine(cpu_count=3, memory=100, status=11)
         factory.make_Device()
 
+        subnets = Subnet.objects.all()
+        v4 = [net for net in subnets if net.get_ip_version() == 4]
+        v6 = [net for net in subnets if net.get_ip_version() == 6]
+
         stats = get_maas_stats()
         machine_stats = get_machine_stats()
 
@@ -68,6 +78,21 @@ class TestMAASStats(MAASServerTestCase):
                 "total_mem": 300,
                 "total_storage": total_storage,
             },
+            "machine_status": {
+                "ready": 1,
+                "allocated": 0,
+                "deploying": 0,
+                "deployed": 0,
+                "failed_deployment": 1,
+                "failed_commissioning": 0,
+            },
+            "network_stats": {
+                "spaces": Space.objects.count(),
+                "fabrics": Fabric.objects.count(),
+                "vlans": VLAN.objects.count(),
+                "subnets_v4": len(v4),
+                "subnets_v6": len(v6),
+            },
         }
         self.assertEquals(stats, json.dumps(compare))