diff --git a/lib/main/admin.py b/lib/main/admin.py
index 2b1e5dca11..0f074e8293 100644
--- a/lib/main/admin.py
+++ b/lib/main/admin.py
@@ -15,6 +15,8 @@
# along with Ansible Commander. If not, see .
+import json
+
from django.conf.urls import *
from django.contrib import admin
from django.contrib.admin.util import unquote
@@ -22,6 +24,7 @@ from django.contrib import messages
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.utils.translation import ugettext_lazy as _
+from django.utils.html import format_html
from lib.main.models import *
from django.contrib.auth.models import User
@@ -108,6 +111,39 @@ class VariableDataInline(admin.StackedInline):
# FIXME: Doesn't yet work as inline due to the way the OneToOne field is
# defined.
+class LaunchJobHostSummaryInline(admin.TabularInline):
+
+ model = LaunchJobHostSummary
+ extra = 0
+ can_delete = False
+
+ def has_add_permission(self, request):
+ return False
+
+class LaunchJobStatusEventInline(admin.StackedInline):
+
+ model = LaunchJobStatusEvent
+ extra = 0
+ can_delete = False
+
+ def has_add_permission(self, request):
+ return False
+
+ def get_event_data_display(self, obj):
+ return format_html('{0}', json.dumps(obj.event_data, indent=4))
+ get_event_data_display.short_description = _('Event data')
+ get_event_data_display.allow_tags = True
+
+class LaunchJobHostSummaryInlineForHost(LaunchJobHostSummaryInline):
+
+ fields = ('launch_job_status', 'changed', 'dark', 'failures', 'ok', 'processed', 'skipped')
+ readonly_fields = ('launch_job_status', 'changed', 'dark', 'failures', 'ok', 'processed', 'skipped')
+
+class LaunchJobStatusEventInlineForHost(LaunchJobStatusEventInline):
+
+ fields = ('created', 'event', 'get_event_data_display', 'launch_job_status')
+ readonly_fields = ('created', 'event', 'get_event_data_display', 'launch_job_status')
+
class HostAdmin(admin.ModelAdmin):
list_display = ('name', 'inventory', 'description', 'active')
@@ -117,6 +153,7 @@ class HostAdmin(admin.ModelAdmin):
filter_horizontal = ('tags',)
# FIXME: Edit reverse of many to many for groups.
#inlines = [VariableDataInline]
+ inlines = [LaunchJobHostSummaryInlineForHost, LaunchJobStatusEventInlineForHost]
class GroupAdmin(admin.ModelAdmin):
@@ -200,31 +237,57 @@ class LaunchJobAdmin(admin.ModelAdmin):
messages.success(request, '%s has been started.' % ljs)
return HttpResponseRedirect(status_url)
-class LaunchJobStatusEventInline(admin.StackedInline):
+class LaunchJobHostSummaryInlineForLaunchJobStatus(LaunchJobHostSummaryInline):
- model = LaunchJobStatusEvent
- extra = 0
- can_delete = False
- fields = ('created', 'event', 'event_data')
- readonly_fields = ('created', 'event', 'event_data')
+ fields = ('host', 'changed', 'dark', 'failures', 'ok', 'processed', 'skipped')
+ readonly_fields = ('host', 'changed', 'dark', 'failures', 'ok', 'processed', 'skipped')
- def has_add_permission(self, request):
- return False
+class LaunchJobStatusEventInlineForLaunchJobStatus(LaunchJobStatusEventInline):
+
+ fields = ('created', 'event', 'get_event_data_display', 'host')
+ readonly_fields = ('created', 'event', 'get_event_data_display', 'host')
class LaunchJobStatusAdmin(admin.ModelAdmin):
list_display = ('name', 'launch_job', 'status')
- fields = ('name', 'launch_job', 'status', 'result_stdout', 'result_stderr',
- 'result_traceback', 'celery_task_id', 'tags', 'created_by')
- readonly_fields = ('name', 'description', 'status', 'launch_job',
- 'result_stdout', 'result_stderr', 'result_traceback',
- 'celery_task_id', 'created_by', 'tags', 'audit_trail', 'active')
+ fields = ('name', 'get_launch_job_display', 'status',
+ 'get_result_stdout_display', 'get_result_stderr_display',
+ 'get_result_traceback_display', 'celery_task_id', 'tags',
+ 'created_by')
+ readonly_fields = ('name', 'description', 'status', 'get_launch_job_display',
+ 'get_result_stdout_display', 'get_result_stderr_display',
+ 'get_result_traceback_display', 'celery_task_id',
+ 'created_by', 'tags', 'audit_trail', 'active')
filter_horizontal = ('tags',)
- inlines = [LaunchJobStatusEventInline]
+ inlines = [LaunchJobHostSummaryInlineForLaunchJobStatus,
+ LaunchJobStatusEventInlineForLaunchJobStatus]
def has_add_permission(self, request):
return False
+ def get_launch_job_display(self, obj):
+ info = obj.launch_job._meta.app_label, obj.launch_job._meta.module_name
+ lj_url = reverse('admin:%s_%s_change' % info, args=(obj.launch_job.pk,),
+ current_app=self.admin_site.name)
+ return format_html('{1}', lj_url, obj.launch_job)
+ get_launch_job_display.short_description = _('Launch job')
+ get_launch_job_display.allow_tags = True
+
+ def get_result_stdout_display(self, obj):
+ return format_html('{0}', obj.result_stdout or ' ')
+ get_result_stdout_display.short_description = _('Stdout')
+ get_result_stdout_display.allow_tags = True
+
+ def get_result_stderr_display(self, obj):
+ return format_html('{0}', obj.result_stderr or ' ')
+ get_result_stderr_display.short_description = _('Stderr')
+ get_result_stderr_display.allow_tags = True
+
+ def get_result_traceback_display(self, obj):
+ return format_html('{0}', obj.result_traceback or ' ')
+ get_result_traceback_display.short_description = _('Traceback')
+ get_result_traceback_display.allow_tags = True
+
# FIXME: Add the rest of the models...
admin.site.register(Organization, OrganizationAdmin)
diff --git a/lib/main/migrations/0012_changes.py b/lib/main/migrations/0012_changes.py
new file mode 100644
index 0000000000..fef65a94b8
--- /dev/null
+++ b/lib/main/migrations/0012_changes.py
@@ -0,0 +1,274 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'LaunchJobHostSummary'
+ db.create_table(u'main_launchjobhostsummary', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('launch_job_status', self.gf('django.db.models.fields.related.ForeignKey')(related_name='launch_job_host_summaries', to=orm['main.LaunchJobStatus'])),
+ ('host', self.gf('django.db.models.fields.related.ForeignKey')(related_name='launch_job_host_summaries', to=orm['main.Host'])),
+ ('skipped', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+ ('ok', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+ ('changed', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+ ('dark', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+ ('processed', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+ ('failures', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+ ))
+ db.send_create_signal(u'main', ['LaunchJobHostSummary'])
+
+ # Adding unique constraint on 'LaunchJobHostSummary', fields ['launch_job_status', 'host']
+ db.create_unique(u'main_launchjobhostsummary', ['launch_job_status_id', 'host_id'])
+
+
+ def backwards(self, orm):
+ # Removing unique constraint on 'LaunchJobHostSummary', fields ['launch_job_status', 'host']
+ db.delete_unique(u'main_launchjobhostsummary', ['launch_job_status_id', 'host_id'])
+
+ # Deleting model 'LaunchJobHostSummary'
+ db.delete_table(u'main_launchjobhostsummary')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'main.audittrail': {
+ 'Meta': {'object_name': 'AuditTrail'},
+ 'comment': ('django.db.models.fields.TextField', [], {}),
+ 'delta': ('django.db.models.fields.TextField', [], {}),
+ 'detail': ('django.db.models.fields.TextField', [], {}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
+ 'resource_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+ 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Tag']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'})
+ },
+ 'main.credential': {
+ 'Meta': {'object_name': 'Credential'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'credential_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'credential\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'default_username': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+ 'ssh_key_data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ 'ssh_key_unlock': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}),
+ 'ssh_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}),
+ 'sudo_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'credential_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'team': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'credentials'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['main.Team']", 'blank': 'True', 'null': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'credentials'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['auth.User']", 'blank': 'True', 'null': 'True'})
+ },
+ 'main.group': {
+ 'Meta': {'unique_together': "(('name', 'inventory'),)", 'object_name': 'Group'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'group_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'group\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ 'hosts': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'groups'", 'blank': 'True', 'to': "orm['main.Host']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'inventory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'groups'", 'to': "orm['main.Inventory']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+ 'parents': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'children'", 'blank': 'True', 'to': "orm['main.Group']"}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'group_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'variable_data': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'group'", 'unique': 'True', 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['main.VariableData']", 'blank': 'True', 'null': 'True'})
+ },
+ 'main.host': {
+ 'Meta': {'unique_together': "(('name', 'inventory'),)", 'object_name': 'Host'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'host_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'host\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'inventory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'hosts'", 'to': "orm['main.Inventory']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'host_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'variable_data': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'host'", 'unique': 'True', 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['main.VariableData']", 'blank': 'True', 'null': 'True'})
+ },
+ 'main.inventory': {
+ 'Meta': {'unique_together': "(('name', 'organization'),)", 'object_name': 'Inventory'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'inventory_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'inventory\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+ 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'inventories'", 'to': "orm['main.Organization']"}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'inventory_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"})
+ },
+ 'main.launchjob': {
+ 'Meta': {'object_name': 'LaunchJob'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'launchjob_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'launchjob\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'credential': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_jobs'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['main.Credential']", 'blank': 'True', 'null': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'inventory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_jobs'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['main.Inventory']", 'blank': 'True', 'null': 'True'}),
+ 'job_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+ 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_jobs'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['main.Project']", 'blank': 'True', 'null': 'True'}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'launchjob_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_jobs'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['auth.User']", 'blank': 'True', 'null': 'True'})
+ },
+ u'main.launchjobhostsummary': {
+ 'Meta': {'unique_together': "[('launch_job_status', 'host')]", 'object_name': 'LaunchJobHostSummary'},
+ 'changed': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'dark': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'failures': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'host': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_job_host_summaries'", 'to': "orm['main.Host']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'launch_job_status': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_job_host_summaries'", 'to': "orm['main.LaunchJobStatus']"}),
+ 'ok': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'processed': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'skipped': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'})
+ },
+ 'main.launchjobstatus': {
+ 'Meta': {'object_name': 'LaunchJobStatus'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'launchjobstatus_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'celery_task_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'launchjobstatus\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ 'hosts': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'launch_job_statuses'", 'blank': 'True', 'through': u"orm['main.LaunchJobHostSummary']", 'to': "orm['main.Host']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'launch_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_job_statuses'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['main.LaunchJob']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+ 'result_stderr': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ 'result_stdout': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ 'result_traceback': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '20'}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'launchjobstatus_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"})
+ },
+ 'main.launchjobstatusevent': {
+ 'Meta': {'object_name': 'LaunchJobStatusEvent'},
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'event': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'event_data': ('jsonfield.fields.JSONField', [], {'default': "''", 'blank': 'True'}),
+ 'host': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_job_status_events'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['main.Host']", 'blank': 'True', 'null': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'launch_job_status': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'launch_job_status_events'", 'to': "orm['main.LaunchJobStatus']"})
+ },
+ 'main.organization': {
+ 'Meta': {'object_name': 'Organization'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'admins': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'admin_of_organizations'", 'blank': 'True', 'to': u"orm['auth.User']"}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'organization_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'organization\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+ 'projects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'organizations'", 'blank': 'True', 'to': u"orm['main.Project']"}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'organization_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'organizations'", 'blank': 'True', 'to': u"orm['auth.User']"})
+ },
+ 'main.permission': {
+ 'Meta': {'object_name': 'Permission'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'permission_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'permission\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'inventory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'permissions'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['main.Inventory']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+ 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+ 'project': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'permissions'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['main.Project']"}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'permission_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'team': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'permissions'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['main.Team']"}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'permissions'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"})
+ },
+ u'main.project': {
+ 'Meta': {'object_name': 'Project'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'project_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'project\', \'app_label\': u\'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'default_playbook': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'local_repository': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+ 'scm_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'project_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"})
+ },
+ 'main.tag': {
+ 'Meta': {'object_name': 'Tag'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+ },
+ 'main.team': {
+ 'Meta': {'object_name': 'Team'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'team_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'team\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+ 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'teams'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['main.Organization']"}),
+ 'projects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'teams'", 'blank': 'True', 'to': u"orm['main.Project']"}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'team_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'teams'", 'blank': 'True', 'to': u"orm['auth.User']"})
+ },
+ 'main.variabledata': {
+ 'Meta': {'object_name': 'VariableData'},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'audit_trail': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'variabledata_by_audit_trail'", 'blank': 'True', 'to': "orm['main.AuditTrail']"}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': '"{\'class\': \'variabledata\', \'app_label\': \'main\'}(class)s_created"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'data': ('django.db.models.fields.TextField', [], {}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+ 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'variabledata_by_tag'", 'blank': 'True', 'to': "orm['main.Tag']"})
+ }
+ }
+
+ complete_apps = ['main']
\ No newline at end of file
diff --git a/lib/main/models/__init__.py b/lib/main/models/__init__.py
index 085b26fad8..e67b41bdbb 100644
--- a/lib/main/models/__init__.py
+++ b/lib/main/models/__init__.py
@@ -383,7 +383,6 @@ class Inventory(CommonModel):
def can_user_delete(cls, user, obj):
return cls._has_permission_types(user, obj, PERMISSION_TYPES_ALLOWING_INVENTORY_ADMIN)
-
class Host(CommonModelNameNotUnique):
'''
A managed node
@@ -780,8 +779,7 @@ class LaunchJobStatus(CommonModel):
result_stderr = models.TextField(blank=True, default='')
result_traceback = models.TextField(blank=True, default='')
celery_task_id = models.CharField(max_length=100, blank=True, default='', editable=False)
- #hosts = models.ManyToManyField('Host', blank=True, related_name='launch_job_statuses')
- # FIXME: Connect hosts based on inventory.
+ hosts = models.ManyToManyField('Host', related_name='launch_job_statuses', blank=True, through='LaunchJobHostSummary')
@property
def celery_task(self):
@@ -791,6 +789,37 @@ class LaunchJobStatus(CommonModel):
except TaskMeta.DoesNotExist:
pass
+ def save(self, *args, **kwargs):
+ super(LaunchJobStatus, self).save(*args, **kwargs)
+ # Create a new host summary for each host in the inventory.
+ for host in self.launch_job.inventory.hosts.all():
+ # Due to the way the inventory script is called, hosts without a group won't be affected.
+ if host.groups.count():
+ self.launch_job_host_summaries.get_or_create(host=host)
+
+class LaunchJobHostSummary(models.Model):
+
+ class Meta:
+ unique_together = [('launch_job_status', 'host')]
+ verbose_name_plural = _('Launch Job Host Summaries')
+ ordering = ('-pk',)
+
+ launch_job_status = models.ForeignKey('LaunchJobStatus', on_delete=models.CASCADE, related_name='launch_job_host_summaries')
+ host = models.ForeignKey('Host', on_delete=models.CASCADE, related_name='launch_job_host_summaries')
+ # FIXME: Can't use SET_NULL for host relationship because of unique constraint.
+
+ changed = models.PositiveIntegerField(default=0)
+ dark = models.PositiveIntegerField(default=0)
+ failures = models.PositiveIntegerField(default=0)
+ ok = models.PositiveIntegerField(default=0)
+ processed = models.PositiveIntegerField(default=0)
+ skipped = models.PositiveIntegerField(default=0)
+
+ def __unicode__(self):
+ return '%s changed=%d dark=%d failures=%d ok=%d processed=%d skipped=%s' % \
+ (self.host.name, self.changed, self.dark, self.failures, self.ok,
+ self.processed, self.skipped)
+
class LaunchJobStatusEvent(models.Model):
'''
An event/message logged from the callback when running a job.
@@ -826,7 +855,39 @@ class LaunchJobStatusEvent(models.Model):
event_data = JSONField(blank=True, default='')
host = models.ForeignKey('Host', blank=True, null=True, default=None, on_delete=SET_NULL, related_name='launch_job_status_events')
- # FIXME: Connect host based on event_data.
+ def __unicode__(self):
+ return u'%s @ %s' % (self.get_event_display(), self.created.isoformat())
+
+ def save(self, *args, **kwargs):
+ try:
+ if not self.host and self.event_data.get('host', ''):
+ # Make sure we're looking at only the hosts from this launch job's associated inventory.
+ self.host = self.launch_job_status.launch_job.inventory.hosts.get(name=self.event_data['host'])
+ except (Host.DoesNotExist, AttributeError):
+ pass
+ super(LaunchJobStatusEvent, self).save(*args, **kwargs)
+ self.update_host_summary_from_stats()
+
+ def update_host_summary_from_stats(self):
+ if self.event != 'playbook_on_stats':
+ return
+ hostnames = set()
+ for v in self.event_data.values():
+ hostnames.update(v.keys())
+ for hostname in hostnames:
+ try:
+ host = self.launch_job_status.launch_job.inventory.hosts.get(name=hostname)
+ except Host.DoesNotExist:
+ continue
+ host_summary = self.launch_job_status.launch_job_host_summaries.get_or_create(host=host)[0]
+ host_summary_changed = False
+ for stat in ('changed', 'dark', 'failures', 'ok', 'processed', 'skipped'):
+ value = self.event_data.get(stat, {}).get(hostname, 0)
+ if getattr(host_summary, stat) != value:
+ setattr(host_summary, stat, value)
+ host_summary_changed = True
+ if host_summary_changed:
+ host_summary.save()
# TODO: reporting (MPD)
diff --git a/lib/main/tests/tasks.py b/lib/main/tests/tasks.py
index 022abcb358..9c6147c18f 100644
--- a/lib/main/tests/tasks.py
+++ b/lib/main/tests/tasks.py
@@ -27,6 +27,8 @@ TEST_PLAYBOOK = '''- hosts: test-group
tasks:
- name: should pass
command: test 1 = 1
+ - name: should also pass
+ command: test 2 = 2
'''
TEST_PLAYBOOK2 = '''- hosts: test-group
@@ -86,6 +88,8 @@ class RunLaunchJobTest(BaseCeleryTest):
self.create_test_playbook(TEST_PLAYBOOK)
launch_job_status = self.launch_job.start()
self.assertEqual(launch_job_status.status, 'pending')
+ self.assertEqual(set(launch_job_status.hosts.values_list('pk', flat=True)),
+ set([self.host.pk]))
launch_job_status = LaunchJobStatus.objects.get(pk=launch_job_status.pk)
#print 'stdout:', launch_job_status.result_stdout
#print 'stderr:', launch_job_status.result_stderr
@@ -98,8 +102,10 @@ class RunLaunchJobTest(BaseCeleryTest):
# print ev.event, ev.event_data
self.assertEqual(launch_job_status_events.filter(event='playbook_on_start').count(), 1)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_play_start').count(), 1)
- self.assertEqual(launch_job_status_events.filter(event='playbook_on_task_start').count(), 1)
- self.assertEqual(launch_job_status_events.filter(event='runner_on_ok').count(), 1)
+ self.assertEqual(launch_job_status_events.filter(event='playbook_on_task_start').count(), 2)
+ self.assertEqual(launch_job_status_events.filter(event='runner_on_ok').count(), 2)
+ for evt in launch_job_status_events.filter(event='runner_on_ok'):
+ self.assertEqual(evt.host, self.host)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_stats').count(), 1)
def test_check_launch_job(self):
@@ -108,20 +114,26 @@ class RunLaunchJobTest(BaseCeleryTest):
self.launch_job.save()
launch_job_status = self.launch_job.start()
self.assertEqual(launch_job_status.status, 'pending')
+ self.assertEqual(set(launch_job_status.hosts.values_list('pk', flat=True)),
+ set([self.host.pk]))
launch_job_status = LaunchJobStatus.objects.get(pk=launch_job_status.pk)
self.assertEqual(launch_job_status.status, 'successful')
self.assertTrue(launch_job_status.result_stdout)
launch_job_status_events = launch_job_status.launch_job_status_events.all()
self.assertEqual(launch_job_status_events.filter(event='playbook_on_start').count(), 1)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_play_start').count(), 1)
- self.assertEqual(launch_job_status_events.filter(event='playbook_on_task_start').count(), 1)
- self.assertEqual(launch_job_status_events.filter(event='runner_on_skipped').count(), 1)
+ self.assertEqual(launch_job_status_events.filter(event='playbook_on_task_start').count(), 2)
+ self.assertEqual(launch_job_status_events.filter(event='runner_on_skipped').count(), 2)
+ for evt in launch_job_status_events.filter(event='runner_on_skipped'):
+ self.assertEqual(evt.host, self.host)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_stats').count(), 1)
def test_run_launch_job_that_fails(self):
self.create_test_playbook(TEST_PLAYBOOK2)
launch_job_status = self.launch_job.start()
self.assertEqual(launch_job_status.status, 'pending')
+ self.assertEqual(set(launch_job_status.hosts.values_list('pk', flat=True)),
+ set([self.host.pk]))
launch_job_status = LaunchJobStatus.objects.get(pk=launch_job_status.pk)
self.assertEqual(launch_job_status.status, 'failed')
self.assertTrue(launch_job_status.result_stdout)
@@ -130,6 +142,7 @@ class RunLaunchJobTest(BaseCeleryTest):
self.assertEqual(launch_job_status_events.filter(event='playbook_on_play_start').count(), 1)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_task_start').count(), 1)
self.assertEqual(launch_job_status_events.filter(event='runner_on_failed').count(), 1)
+ self.assertEqual(launch_job_status_events.get(event='runner_on_failed').host, self.host)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_stats').count(), 1)
def test_check_launch_job_where_task_would_fail(self):
@@ -138,6 +151,8 @@ class RunLaunchJobTest(BaseCeleryTest):
self.launch_job.save()
launch_job_status = self.launch_job.start()
self.assertEqual(launch_job_status.status, 'pending')
+ self.assertEqual(set(launch_job_status.hosts.values_list('pk', flat=True)),
+ set([self.host.pk]))
launch_job_status = LaunchJobStatus.objects.get(pk=launch_job_status.pk)
# Since we don't actually run the task, the --check should indicate
# everything is successful.
@@ -148,4 +163,5 @@ class RunLaunchJobTest(BaseCeleryTest):
self.assertEqual(launch_job_status_events.filter(event='playbook_on_play_start').count(), 1)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_task_start').count(), 1)
self.assertEqual(launch_job_status_events.filter(event='runner_on_skipped').count(), 1)
+ self.assertEqual(launch_job_status_events.get(event='runner_on_skipped').host, self.host)
self.assertEqual(launch_job_status_events.filter(event='playbook_on_stats').count(), 1)
diff --git a/lib/settings/defaults.py b/lib/settings/defaults.py
index 47ceb8c5af..910ec9d51c 100644
--- a/lib/settings/defaults.py
+++ b/lib/settings/defaults.py
@@ -167,6 +167,9 @@ DEVSERVER_MODULES = (
#'devserver.modules.profile.LineProfilerModule',
)
+# Skip migrations when running tests.
+SOUTH_TESTS_MIGRATE = False
+
if 'djcelery' in INSTALLED_APPS:
import djcelery
djcelery.setup_loader()
diff --git a/lib/templates/admin/base_site.html b/lib/templates/admin/base_site.html
index 3299ba93cf..7de1915db6 100644
--- a/lib/templates/admin/base_site.html
+++ b/lib/templates/admin/base_site.html
@@ -102,6 +102,26 @@ ul.messagelist li {
.errors textarea {
border: 1px solid #b22222 !important;
}
+pre.json-display, pre.result-display {
+ display: inline-block;
+ margin: 0;
+ padding: 0;
+ font-size: 0.9em;
+}
+pre.result-display {
+ width: 75%;
+ border: 1px solid #ccc;
+ background: #444;
+ color: #eee;
+ max-height: 300px;
+ overflow: auto;
+}
+#launch_job_host_summaries-group table td.original p {
+ display: none
+}
+#launch_job_host_summaries-group table tr.has_original td {
+ padding-top: 5px;
+}
{% endblock %}