Merge pull request #2444 from jakemcdermott/fix-2334

add host_status_counts to adhoc commands; fix status display for adhoc commands

awx/main/models/events.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+from collections import defaultdict
 
 from django.conf import settings
 from django.db import models, DatabaseError
@@ -39,6 +40,21 @@ def sanitize_event_keys(kwargs, valid_keys):
                 kwargs[key] = Truncator(kwargs[key]).chars(1024)
 
 
+def create_host_status_counts(event_data):
+    host_status = {}
+    host_status_keys = ['skipped', 'ok', 'changed', 'failures', 'dark']
+
+    for key in host_status_keys:
+        for host in event_data.get(key, {}):
+            host_status[host] = key
+
+    host_status_counts = defaultdict(lambda: 0)
+
+    for value in host_status.values():
+        host_status_counts[value] += 1
+
+    return dict(host_status_counts)
+
 
 class BasePlaybookEvent(CreatedModifiedModel):
     '''
@@ -194,6 +210,9 @@ class BasePlaybookEvent(CreatedModifiedModel):
     def event_level(self):
         return self.LEVEL_FOR_EVENT.get(self.event, 0)
 
+    def get_host_status_counts(self):
+        return create_host_status_counts(getattr(self, 'event_data', {}))
+
     def get_event_display2(self):
         msg = self.get_event_display()
         if self.event == 'playbook_on_play_start':
@@ -588,6 +607,9 @@ class BaseCommandEvent(CreatedModifiedModel):
         '''
         return self.event
 
+    def get_host_status_counts(self):
+        return create_host_status_counts(getattr(self, 'event_data', {}))
+
 
 class AdHocCommandEvent(BaseCommandEvent):