Merge ~andreserl/maas:2.3_machine_stats into maas:2.3

[Andres Rodriguez]

Backport d2f6dd9cff9072c27549fd9aff6e82994a5f0ebe from master

Calculate the total amount of machine resources.-

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.3_machine_stats lp:~andreserl/maas/+git/maas into -b 2.3 lp:~maas-committers/maas

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

[Mike Pontillo (mpontillo)]

So this failed to land in a new and interesting way compared to the off-by-one in this code that I just did the drive-by fix for earlier today (which should also be backported).

https://paste.ubuntu.com/p/XkWZSGYKm3/

It seems this is happening because the test is comparing the JSON *string*, and for whatever reason the version of Python in MAAS 2.3 isn't outputting the JSON fields in the same order!

I would suggest fixing this per the inline comment below (and also backporting the off-by-one fix).

review: Needs Fixing

56018f9... by Andres Rodriguez on 2018-04-04

Fix tests

[Andres Rodriguez (andreserl)]

review: Approve

diff --git a/src/maasserver/stats.py b/src/maasserver/stats.py
index c603223..f6da73e 100644
--- a/src/maasserver/stats.py
+++ b/src/maasserver/stats.py
@@ -10,6 +10,7 @@ __all__ = [
 
 from datetime import timedelta
 
+from django.db.models import Sum
 from maasserver.models import Config
 from maasserver.utils.orm import transactional
 from maasserver.utils.threads import deferToDatabase
@@ -30,6 +31,13 @@ import requests
 
 
 def get_maas_stats():
+    nodes = Node.objects.all()
+    machines = nodes.filter(node_type=NODE_TYPE.MACHINE)
+    # Rather overall amount of stats for machines.
+    stats = machines.aggregate(
+        total_cpu=Sum('cpu_count'), total_mem=Sum('memory'),
+        total_storage=Sum('blockdevice__size'))
+    # Get all node types to get count values
     node_types = Node.objects.values_list('node_type', flat=True)
     node_types = Counter(node_types)
 
@@ -43,7 +51,8 @@ def get_maas_stats():
         "nodes": {
             "machines": node_types.get(NODE_TYPE.MACHINE, 0),
             "devices": node_types.get(NODE_TYPE.DEVICE, 0),
-        }
+        },
+        "machine_stats": stats,
     })
 
 
diff --git a/src/maasserver/tests/test_stats.py b/src/maasserver/tests/test_stats.py
index 2c745b1..2bb0e1a 100644
--- a/src/maasserver/tests/test_stats.py
+++ b/src/maasserver/tests/test_stats.py
@@ -40,10 +40,12 @@ class TestMAASStats(MAASServerTestCase):
         factory.make_RegionRackController()
         factory.make_RegionController()
         factory.make_RackController()
-        factory.make_Machine()
+        m1 = factory.make_Machine(cpu_count=2, memory=200)
+        m2 = factory.make_Machine(cpu_count=3, memory=100)
         factory.make_Device()
 
         stats = get_maas_stats()
+        total_storage = int((m1.storage + m2.storage) * 1000000)
         compare = {
             "controllers": {
                 "regionracks": 1,
@@ -51,11 +53,16 @@ class TestMAASStats(MAASServerTestCase):
                 "racks": 1,
             },
             "nodes": {
-                "machines": 1,
+                "machines": 2,
                 "devices": 1,
             },
+            "machine_stats": {
+                "total_cpu": 5,
+                "total_mem": 300,
+                "total_storage": total_storage,
+            },
         }
-        self.assertEquals(stats, json.dumps(compare))
+        self.assertEquals(json.loads(stats), compare)
 
     def test_get_request_params_returns_params(self):
         factory.make_RegionRackController()