Merge ~andreserl/maas:request_stats into maas:master

[Andres Rodriguez]

Send MAAS stats if it analytics are enabled.

[Blake Rouse (blake-rouse)]

Some code suggestions and it needs tests.

review: Needs Fixing

3d09d76... by Andres Rodriguez on 2017-10-03

Address code review requests

adad2ab... by Andres Rodriguez on 2017-10-03

remove comment

b275f31... by Andres Rodriguez on 2017-10-03

updates

b548410... by Andres Rodriguez on 2017-10-03

Add tests

8bfda83... by Andres Rodriguez on 2017-10-03

Add tests

828d917... by Andres Rodriguez on 2017-10-04

Update tests

a0a8ce3... by Andres Rodriguez on 2017-10-04

Test

1685a3a... by Andres Rodriguez on 2017-10-04

Tests

0f27ae5... by Andres Rodriguez on 2017-10-04

Update tests

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maasserver/bootresources.py b/src/maasserver/bootresources.py
index 41f5743..f5833d1 100644
--- a/src/maasserver/bootresources.py
+++ b/src/maasserver/bootresources.py
@@ -77,6 +77,7 @@ from maasserver.utils.orm import (
     transactional,
     with_connection,
 )
+from maasserver.utils.stats import make_maas_user_agent_request
 from maasserver.utils.threads import deferToDatabase
 from provisioningserver.config import is_dev_environment
 from provisioningserver.events import EVENT_TYPES
@@ -1429,6 +1430,8 @@ class ImportResourcesService(TimerService, object):
 
     def maybe_import_resources(self):
         def determine_auto():
+            if Config.objects.get_config('enable_analytics'):
+                make_maas_user_agent_request()
             auto = Config.objects.get_config('boot_images_auto_import')
             if not auto:
                 return auto
diff --git a/src/maasserver/tests/test_bootresources.py b/src/maasserver/tests/test_bootresources.py
index 4763178..4790000 100644
--- a/src/maasserver/tests/test_bootresources.py
+++ b/src/maasserver/tests/test_bootresources.py
@@ -1945,6 +1945,30 @@ class TestImportResourcesServiceAsync(MAASTransactionServerTestCase):
             bootresources._import_resources_in_thread,
             MockNotCalled())
 
+    def test_maybe_import_resources_makes_maas_user_agent_request(self):
+        mock_call = self.patch(bootresources, "make_maas_user_agent_request")
+
+        with transaction.atomic():
+            Config.objects.set_config('enable_analytics', True)
+
+        service = bootresources.ImportResourcesService()
+        maybe_import_resources = asynchronous(service.maybe_import_resources)
+        maybe_import_resources().wait(5)
+
+        self.assertThat(mock_call, MockCalledOnce())
+
+    def test_maybe_import_resources_doesnt_make_maas_user_agent_request(self):
+        mock_call = self.patch(bootresources, "make_maas_user_agent_request")
+
+        with transaction.atomic():
+            Config.objects.set_config('enable_analytics', False)
+
+        service = bootresources.ImportResourcesService()
+        maybe_import_resources = asynchronous(service.maybe_import_resources)
+        maybe_import_resources().wait(5)
+
+        self.assertThat(mock_call, MockNotCalled())
+
 
 class TestImportResourcesProgressService(MAASServerTestCase):
     """Tests for `ImportResourcesProgressService`."""
diff --git a/src/maasserver/utils/stats.py b/src/maasserver/utils/stats.py
new file mode 100644
index 0000000..ef1fb3b
--- /dev/null
+++ b/src/maasserver/utils/stats.py
@@ -0,0 +1,52 @@
+# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Stats related utility functions."""
+
+import base64
+from collections import Counter
+import json
+
+from maasserver.enum import NODE_TYPE
+from maasserver.models import Node
+from maasserver.utils import get_maas_user_agent
+import requests
+
+
+def get_maas_stats():
+    node_types = Node.objects.values_list('node_type', flat=True)
+    node_types = Counter(node_types)
+
+    return json.dumps({
+        "controllers": {
+            "regionracks": node_types.get(
+                NODE_TYPE.REGION_AND_RACK_CONTROLLER, 0),
+            "regions": node_types.get(NODE_TYPE.REGION_CONTROLLER, 0),
+            "racks": node_types.get(NODE_TYPE.RACK_CONTROLLER, 0),
+        },
+        "nodes": {
+            "machines": node_types.get(NODE_TYPE.MACHINE, 0),
+            "devices": node_types.get(NODE_TYPE.DEVICE, 0),
+        }
+    })
+
+
+def get_request_params():
+    return {
+        "data": base64.b64encode(
+            json.dumps(get_maas_stats()).encode()).decode(),
+    }
+
+
+def make_maas_user_agent_request():
+    headers = {
+        'User-Agent': get_maas_user_agent(),
+    }
+    params = get_request_params()
+    try:
+        requests.get(
+            'https://stats.images.maas.io/',
+            params=params, headers=headers)
+    except:
+        # Do not fail if for any reason requests does.
+        pass
diff --git a/src/maasserver/utils/tests/test_stats.py b/src/maasserver/utils/tests/test_stats.py
new file mode 100644
index 0000000..3eb82cb
--- /dev/null
+++ b/src/maasserver/utils/tests/test_stats.py
@@ -0,0 +1,58 @@
+# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test stats utilities."""
+
+__all__ = []
+
+import base64
+import json
+
+from maasserver.testing.factory import factory
+from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.stats import (
+    get_maas_stats,
+    get_request_params,
+    make_maas_user_agent_request,
+)
+from maastesting.matchers import MockCalledOnce
+import requests as requests_module
+
+
+class TestMAASStats(MAASServerTestCase):
+
+    def test_get_maas_stats(self):
+        # Make one component of everything
+        factory.make_RegionRackController()
+        factory.make_RegionController()
+        factory.make_RackController()
+        factory.make_Machine()
+        factory.make_Device()
+
+        stats = get_maas_stats()
+        compare = {
+            "controllers": {
+                "regionracks": 1,
+                "regions": 1,
+                "racks": 1,
+            },
+            "nodes": {
+                "machines": 1,
+                "devices": 1,
+            },
+        }
+        self.assertEquals(stats, json.dumps(compare))
+
+    def test_get_request_params_returns_params(self):
+        factory.make_RegionRackController()
+        params = {
+            "data": base64.b64encode(
+                json.dumps(get_maas_stats()).encode()).decode()
+        }
+        self.assertEquals(params, get_request_params())
+
+    def test_make_user_agent_request(self):
+        factory.make_RegionRackController()
+        mock = self.patch(requests_module, "get")
+        make_maas_user_agent_request()
+        self.assertThat(mock, MockCalledOnce())