Fix dashboard inventory graph to only count unique hostnames and reflect when licensed hosts count drops; API response is slower than before. Fixes https://trello.com/c/Kfw7QlRE

awx/main/tests/inventory.py

@@ -14,6 +14,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
+from django.utils.timezone import now
 
 # AWX
 from awx.main.models import *
@@ -1091,6 +1092,60 @@ class InventoryTest(BaseTest):
         self.assertEqual(set(h_e.all_groups.values_list('pk', flat=True)),
                          set([g_e.pk]))
 
+    def test_dashboard_inventory_graph_view(self):
+        url = reverse('api:dashboard_inventory_graph_view')
+        # Test with zero hosts.
+        with self.current_user(self.super_django_user):
+            response = self.get(url)
+        self.assertFalse(sum([x[1] for x in response['hosts']]))
+        # Create hosts in inventory_a, with created one day apart, and check
+        # the time series results.
+        dtnow = now()
+        hostnames = list('abcdefg')
+        for x in xrange(len(hostnames) - 1, -1, -1):
+            hostname = hostnames[x]
+            created = dtnow - datetime.timedelta(days=x, seconds=60)
+            self.inventory_a.hosts.create(name=hostname, created=created)
+        with self.current_user(self.super_django_user):
+            response = self.get(url)
+        for n, d in enumerate(reversed(response['hosts'])):
+            self.assertEqual(d[1], max(len(hostnames) - n, 0))
+        # Create more hosts a day apart in inventory_b and check the time
+        # series results.
+        hostnames2 = list('hijklmnop')
+        for x in xrange(len(hostnames2) - 1, -1, -1):
+            hostname = hostnames2[x]
+            created = dtnow - datetime.timedelta(days=x, seconds=120)
+            self.inventory_b.hosts.create(name=hostname, created=created)
+        with self.current_user(self.super_django_user):
+            response = self.get(url)
+        for n, d in enumerate(reversed(response['hosts'])):
+            self.assertEqual(d[1], max(len(hostnames2) - n, 0) + max(len(hostnames) - n, 0))
+        # Now create some hosts in inventory_a with the same hostnames already
+        # used in inventory_b; duplicate hostnames should only be counted the
+        # first time they were seen in inventory_b.
+        hostnames3 = list('lmnop')
+        for x in xrange(len(hostnames3) - 1, -1, -1):
+            hostname = hostnames3[x]
+            created = dtnow - datetime.timedelta(days=x, seconds=180)
+            self.inventory_a.hosts.create(name=hostname, created=created)
+        with self.current_user(self.super_django_user):
+            response = self.get(url)
+        for n, d in enumerate(reversed(response['hosts'])):
+            self.assertEqual(d[1], max(len(hostnames2) - n, 0) + max(len(hostnames) - n, 0))
+        # Delete recently added hosts and verify the count drops.
+        hostnames4 = list('defg')
+        for host in Host.objects.filter(name__in=hostnames4):
+            host.mark_inactive()
+        with self.current_user(self.super_django_user):
+            response = self.get(url)
+        for n, d in enumerate(reversed(response['hosts'])):
+            count = max(len(hostnames2) - n, 0) + max(len(hostnames) - n, 0)
+            if n == 0:
+                count -= 4
+            self.assertEqual(d[1], count)
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True,
                    CELERY_EAGER_PROPAGATES_EXCEPTIONS=True,
                    IGNORE_CELERY_INSPECTOR=True,