Merge lp:~cjohnston/qa-dashboard/dashboard-sru-2-sru into lp:qa-dashboard

[Chris Johnston]

Moves sru code from dashboard to new sru app

[Joe Talbott (joetalbott)]

I'd prefer to change have jenkins_get() and friends in common/management/__init__.py rather than common/helpers.py since that code is only used in management commands.

The sru/migrations/0001_initial.py logic needs to test if the table name exists and add it if it doesn't. This means we can't return after each check because none of the other checks will happen. I propose something like this:

   table_names = connection.introspection.table_names()

   if 'kernels' not in table_names:
      db.create_table('kernels'...

   if 'sru_results' not in talbe_names:
      db.create_table('sru_results'...

review: Needs Fixing

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Joe Talbott (joetalbott)]

Remove lines 24-93 please.

Line 365 needs inserted 'from django.db import connection'

review: Needs Fixing

[Joe Talbott (joetalbott)]

Looks good, thanks.

review: Approve

[Chris Johnston (cjohnston)]

The attempt to merge lp:~chrisjohnston/qa-dashboard/dashboard-sru-2-sru into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...

Traceback (most recent call last):
  File "manage.py", line 26, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 429, in execute_from_command_line
    utility.execute()
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/test.py", line 8, in handle
    super(Command, self).handle(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 296, in setup_databases
    test_db_name = connection.creation.create_test_db(self.verbosity, autoclobber=not self.interactive)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/creation.py", line 366, in create_test_db
    load_initial_data=False)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 351, in handle
    return self.handle_noargs(**options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/syncdb.py", line 99, in handle_noargs
    management.call_command('migrate', **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/migrate.py", line 105, in handle
    ignore_ghosts = ignore_ghosts,
  File "/usr/lib/python2.7/dist-packages/south/migration/__init__.py", line 191, in migrate_app
    success = migrator.migrate_many(target, workplan, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 221, in migrate_many
    result = migrator.__class__.migrate_many(migrator, target, migrations, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 292, in migrate_many
    result = self.migrate(migration, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", l...

Unmerged revisions

205. By Chris Johnston on 2013-01-04

requested changes

204. By Chris Johnston on 2013-01-04

Fixes indentation

203. By Chris Johnston on 2013-01-04

Fixes indentation

202. By Chris Johnston on 2013-01-04

Updates SRU

=== added file 'dashboard/migrations/0014_remove_sru_models.py'
--- dashboard/migrations/0014_remove_sru_models.py	1970-01-01 00:00:00 +0000
+++ dashboard/migrations/0014_remove_sru_models.py	2013-01-04 18:06:05 +0000
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    depends_on = (
+        ('sru', '0001_add_initial_models'),
+    )
+
+    def forwards(self, orm):
+        pass
+
+    def backwards(self, orm):
+        pass

=== modified file 'dashboard/models.py'
--- dashboard/models.py	2013-01-03 19:40:12 +0000
+++ dashboard/models.py	2013-01-04 18:06:05 +0000
@@ -19,9 +19,6 @@
 from common.models import DashboardBaseModel, Bug
 
 
-###
-# Smoke
-###
 class ResultLog(DashboardBaseModel):
     class Meta:
         db_table = 'result_logs'
@@ -237,132 +234,3 @@
     @property
     def log_count(self):
         return self.resultlog_set.count()
-
-###
-# Kernel SRU
-###
-
-class Kernel(DashboardBaseModel):
-    class Meta:
-        db_table = "kernels"
-
-    job_type = models.CharField(max_length=100)
-    release = models.CharField(max_length=100)
-    variant = models.CharField(max_length=100)
-    arch = models.CharField(max_length=100)
-    gpu = models.CharField(max_length=100)
-    version = models.CharField(max_length=100)
-
-    # Used by MySerializer to add property fields to the JSON representation
-    # of an instance of this class.
-    extra_fields = [
-            'pass_count',
-            'skip_count',
-            'fail_count',
-            'total_count',
-            'pass_rate',
-            'pass_rate_pct',
-            'bug_count',
-            'log_count',
-            ]
-
-    def debug_str(self):
-        return "{}-{}-{}-{}".format(
-                self.release,
-                self.variant,
-                self.arch,
-                self.gpu,
-                )
-
-    @property
-    def name(self):
-        return "{}-{}".format(self.release, self.variant)
-
-    @property
-    def total_count(self):
-        return self.sruresult_set.aggregate(models.Sum('total_count'))['total_count__sum'] or 0
-
-    @property
-    def pass_count(self):
-        return self.sruresult_set.aggregate(models.Sum('pass_count'))['pass_count__sum'] or 0
-
-    @property
-    def fail_count(self):
-        return self.sruresult_set.aggregate(models.Sum('fail_count'))['fail_count__sum'] or 0
-
-    @property
-    def skip_count(self):
-        return self.sruresult_set.aggregate(models.Sum('skip_count'))['skip_count__sum'] or 0
-
-    @property
-    def pass_rate(self):
-        return self.pass_count*1.0 / self.total_count if self.total_count > 0 else 0
-
-    @property
-    def pass_rate_pct(self):
-        return "%d%%" % int(self.pass_rate*100)
-
-    @property
-    def bug_count(self):
-        return self.sruresult_set.annotate(num_bugs=models.Count('bugs')).aggregate(models.Sum('num_bugs'))['num_bugs__sum'] or 0
-
-    @property
-    def log_count(self):
-        return self.sruresultlog_set.count()
-
-    @property
-    def last_run_date(self):
-        return self.sruresult_set.aggregate(models.Max('ran_at'))['ran_at__max'].strftime("%Y-%m-%d %H:%M")
-
-# XXX: refactor this and Result
-class SRUResult(DashboardBaseModel):
-    class Meta:
-        db_table = 'sru_results'
-
-    kernel = models.ForeignKey(Kernel)
-    bugs = models.ManyToManyField(Bug)
-
-    jenkins_build = models.CharField(max_length=255)
-    jenkins_url = models.URLField()
-    name = models.CharField(max_length=255)
-    pass_count = models.IntegerField()
-    fail_count = models.IntegerField()
-    skip_count = models.IntegerField()
-    total_count = models.IntegerField()
-    ran_at = models.DateTimeField('date run')
-
-    # Used by MySerializer to add property fields to the JSON representation
-    # of an instance of this class.
-    extra_fields = [
-            'pass_rate',
-            'pass_rate_pct',
-            'bug_count',
-            'log_count',
-            ]
-
-    @property
-    def pass_rate(self):
-        return self.pass_count*1.0 / self.total_count if self.total_count > 0 else 0
-
-    @property
-    def pass_rate_pct(self):
-        return "%d%%" % int(self.pass_rate*100)
-
-    @property
-    def bug_count(self):
-        return self.bugs.count()
-
-    @property
-    def log_count(self):
-        return self.resultlog_set.count()
-
-class SRUResultLog(DashboardBaseModel):
-    class Meta:
-        db_table = 'sru_result_logs'
-    display_name = models.CharField(max_length=255, null = True)
-    path = models.TextField() 
-    sru_result = models.ForeignKey('SRUResult')
-    remote_url = models.URLField()
-
-    def __unicode__(self):
-        return self.path

=== removed directory 'dashboard/templatetags'
=== removed file 'dashboard/templatetags/__init__.py'
--- dashboard/templatetags/__init__.py	2012-12-02 02:51:10 +0000
+++ dashboard/templatetags/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# QA Dashboard
-# Copyright 2012 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License version 3, as published
-# by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-

=== modified file 'qa_dashboard/settings.py'
--- qa_dashboard/settings.py	2012-12-14 23:59:31 +0000
+++ qa_dashboard/settings.py	2013-01-04 18:06:05 +0000
@@ -146,6 +146,7 @@
     'bootspeed',
     'common',
     'south',
+    'sru',
 )
 
 # A sample logging configuration. The only tangible logging

=== modified file 'qa_dashboard/urls.py'
--- qa_dashboard/urls.py	2012-12-13 03:33:47 +0000
+++ qa_dashboard/urls.py	2013-01-04 18:06:05 +0000
@@ -35,15 +35,15 @@
     url(r'^api/smoke/run/(?P<run_id>\d+)/image/(?P<image_id>\d+)/$', 'api.smoke.api_image'),
     url(r'^api/smoke/run/(?P<run_id>\d+)/image/(?P<image_id>\d+)/result/$', 'api.smoke.api_results'),
     url(r'^api/smoke/run/(?P<run_id>\d+)/image/(?P<image_id>\d+)/result/(?P<result_id>\d+)/$', 'api.smoke.api_result'),
-    url(r'^sru/$', 'sru.overview', name='sru'),
-    url(r'^sru/(?P<release>\w+)/$', 'sru.overview', name='sru_overview'),
-    url(r'^sru/(?P<release>\w+)/version/(?P<kernel_version>[^/]+)/$', 'sru.overview_kernel', name='sru_overview_kernel'),
-    url(r'^api/sru/$', 'sru.api_overview'),
-    url(r'^api/sru/(?P<release>\w+)/$', 'sru.api_overview'),
-    url(r'^api/sru/(?P<release>\w+)/(?P<version>[^/]+)/$', 'sru.api_overview'),
     url(r'^api/help/$', 'api.api_help', name='api_help'),
 )
-    
+
+urlpatterns += patterns('sru.views',
+    url(r'^sru/$', 'overview', name='sru'),
+    url(r'^sru/(?P<release>\w+)/$', 'overview', name='sru_overview'),
+    url(r'^sru/(?P<release>\w+)/version/(?P<kernel_version>[^/]+)/$', 'overview_kernel', name='sru_overview_kernel'),
+)
+
 urlpatterns += patterns('bootspeed.views',
     url(r'^bootspeed/$', 'arch_overview', name='bootspeed_arch'),
     url(r'^bootspeed/arch/(?P<arch>\w+)/$', 'arch_overview', name='bootspeed_arch_overview'),

=== added directory 'sru'
=== added file 'sru/__init__.py'
=== added directory 'sru/management'
=== added file 'sru/management/__init__.py'
--- sru/management/__init__.py	1970-01-01 00:00:00 +0000
+++ sru/management/__init__.py	2013-01-04 18:06:05 +0000
@@ -0,0 +1,14 @@
+# QA Dashboard
+# Copyright 2012 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.

=== added directory 'sru/management/commands'
=== added file 'sru/management/commands/__init__.py'
--- sru/management/commands/__init__.py	1970-01-01 00:00:00 +0000
+++ sru/management/commands/__init__.py	2013-01-04 18:06:05 +0000
@@ -0,0 +1,14 @@
+# QA Dashboard
+# Copyright 2012 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.

=== renamed file 'dashboard/management/commands/jenkins_pull_sru.py' => 'sru/management/commands/jenkins_pull_sru.py'
--- dashboard/management/commands/jenkins_pull_sru.py	2013-01-03 21:22:50 +0000
+++ sru/management/commands/jenkins_pull_sru.py	2013-01-04 18:06:05 +0000
@@ -28,7 +28,7 @@
 
 from common.utils import regexes
 
-from dashboard.models import (
+from sru.models import (
         Kernel,
         SRUResult,
         SRUResultLog,

=== added directory 'sru/migrations'
=== added file 'sru/migrations/0001_add_initial_models.py'
--- sru/migrations/0001_add_initial_models.py	1970-01-01 00:00:00 +0000
+++ sru/migrations/0001_add_initial_models.py	2013-01-04 18:06:05 +0000
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models, connection
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        table_names = connection.introspection.table_names()
+
+        if 'kernels' not in table_names:
+            # Adding model 'Kernel'
+            db.create_table('kernels', (
+                ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+                ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+                ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+                ('internal', self.gf('django.db.models.fields.BooleanField')(default=True)),
+                ('publish', self.gf('django.db.models.fields.BooleanField')(default=True)),
+                ('job_type', self.gf('django.db.models.fields.CharField')(max_length=100)),
+                ('release', self.gf('django.db.models.fields.CharField')(max_length=100)),
+                ('variant', self.gf('django.db.models.fields.CharField')(max_length=100)),
+                ('arch', self.gf('django.db.models.fields.CharField')(max_length=100)),
+                ('gpu', self.gf('django.db.models.fields.CharField')(max_length=100)),
+                ('version', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ))
+            db.send_create_signal('sru', ['Kernel'])
+
+        if 'sru_results' not in table_names:
+            # Adding model 'SRUResult'
+            db.create_table('sru_results', (
+                ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+                ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+                ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+                ('internal', self.gf('django.db.models.fields.BooleanField')(default=True)),
+                ('publish', self.gf('django.db.models.fields.BooleanField')(default=True)),
+                ('kernel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['sru.Kernel'])),
+                ('jenkins_build', self.gf('django.db.models.fields.CharField')(max_length=255)),
+                ('jenkins_url', self.gf('django.db.models.fields.URLField')(max_length=200)),
+                ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+                ('pass_count', self.gf('django.db.models.fields.IntegerField')()),
+                ('fail_count', self.gf('django.db.models.fields.IntegerField')()),
+                ('skip_count', self.gf('django.db.models.fields.IntegerField')()),
+                ('total_count', self.gf('django.db.models.fields.IntegerField')()),
+                ('ran_at', self.gf('django.db.models.fields.DateTimeField')()),
+            ))
+            db.send_create_signal('sru', ['SRUResult'])
+
+        if 'sru_results_bugs' not in table_names:
+            # Adding M2M table for field bugs on 'SRUResult'
+            db.create_table('sru_results_bugs', (
+                ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+                ('sruresult', models.ForeignKey(orm['sru.sruresult'], null=False)),
+                ('bug', models.ForeignKey(orm['common.bug'], null=False))
+            ))
+            db.create_unique('sru_results_bugs', ['sruresult_id', 'bug_id'])
+
+        if 'sru_result_logs' not in table_names:
+            # Adding model 'SRUResultLog'
+            db.create_table('sru_result_logs', (
+                ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+                ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+                ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+                ('internal', self.gf('django.db.models.fields.BooleanField')(default=True)),
+                ('publish', self.gf('django.db.models.fields.BooleanField')(default=True)),
+                ('display_name', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
+                ('path', self.gf('django.db.models.fields.TextField')()),
+                ('sru_result', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['sru.SRUResult'])),
+                ('remote_url', self.gf('django.db.models.fields.URLField')(max_length=200)),
+            ))
+            db.send_create_signal('sru', ['SRUResultLog'])
+
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+        'common.bug': {
+            'Meta': {'object_name': 'Bug', 'db_table': "'bugs'"},
+            'bug_no': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'sru.kernel': {
+            'Meta': {'object_name': 'Kernel', 'db_table': "'kernels'"},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'gpu': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'job_type': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'release': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'variant': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'sru.sruresult': {
+            'Meta': {'object_name': 'SRUResult', 'db_table': "'sru_results'"},
+            'bugs': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['common.Bug']", 'symmetrical': 'False'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'fail_count': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'jenkins_build': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'jenkins_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'kernel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sru.Kernel']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'pass_count': ('django.db.models.fields.IntegerField', [], {}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'skip_count': ('django.db.models.fields.IntegerField', [], {}),
+            'total_count': ('django.db.models.fields.IntegerField', [], {}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'sru.sruresultlog': {
+            'Meta': {'object_name': 'SRUResultLog', 'db_table': "'sru_result_logs'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'path': ('django.db.models.fields.TextField', [], {}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'remote_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'sru_result': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sru.SRUResult']"}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['sru']

=== added file 'sru/migrations/__init__.py'
=== added file 'sru/models.py'
--- sru/models.py	1970-01-01 00:00:00 +0000
+++ sru/models.py	2013-01-04 18:06:05 +0000
@@ -0,0 +1,144 @@
+# QA Dashboard
+# Copyright 2012 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.db import models
+import datetime
+
+from common.models import DashboardBaseModel, Bug
+
+class Kernel(DashboardBaseModel):
+    class Meta:
+        db_table = "kernels"
+
+    job_type = models.CharField(max_length=100)
+    release = models.CharField(max_length=100)
+    variant = models.CharField(max_length=100)
+    arch = models.CharField(max_length=100)
+    gpu = models.CharField(max_length=100)
+    version = models.CharField(max_length=100)
+
+    # Used by MySerializer to add property fields to the JSON representation
+    # of an instance of this class.
+    extra_fields = [
+            'pass_count',
+            'skip_count',
+            'fail_count',
+            'total_count',
+            'pass_rate',
+            'pass_rate_pct',
+            'bug_count',
+            'log_count',
+            ]
+
+    def debug_str(self):
+        return "{}-{}-{}-{}".format(
+                self.release,
+                self.variant,
+                self.arch,
+                self.gpu,
+                )
+
+    @property
+    def name(self):
+        return "{}-{}".format(self.release, self.variant)
+
+    @property
+    def total_count(self):
+        return self.sruresult_set.aggregate(models.Sum('total_count'))['total_count__sum'] or 0
+
+    @property
+    def pass_count(self):
+        return self.sruresult_set.aggregate(models.Sum('pass_count'))['pass_count__sum'] or 0
+
+    @property
+    def fail_count(self):
+        return self.sruresult_set.aggregate(models.Sum('fail_count'))['fail_count__sum'] or 0
+
+    @property
+    def skip_count(self):
+        return self.sruresult_set.aggregate(models.Sum('skip_count'))['skip_count__sum'] or 0
+
+    @property
+    def pass_rate(self):
+        return self.pass_count*1.0 / self.total_count if self.total_count > 0 else 0
+
+    @property
+    def pass_rate_pct(self):
+        return "%d%%" % int(self.pass_rate*100)
+
+    @property
+    def bug_count(self):
+        return self.sruresult_set.annotate(num_bugs=models.Count('bugs')).aggregate(models.Sum('num_bugs'))['num_bugs__sum'] or 0
+
+    @property
+    def log_count(self):
+        return self.sruresultlog_set.count()
+
+    @property
+    def last_run_date(self):
+        return self.sruresult_set.aggregate(models.Max('ran_at'))['ran_at__max'].strftime("%Y-%m-%d %H:%M")
+
+# XXX: refactor this and Result
+class SRUResult(DashboardBaseModel):
+    class Meta:
+        db_table = 'sru_results'
+
+    kernel = models.ForeignKey(Kernel)
+    bugs = models.ManyToManyField(Bug)
+
+    jenkins_build = models.CharField(max_length=255)
+    jenkins_url = models.URLField()
+    name = models.CharField(max_length=255)
+    pass_count = models.IntegerField()
+    fail_count = models.IntegerField()
+    skip_count = models.IntegerField()
+    total_count = models.IntegerField()
+    ran_at = models.DateTimeField('date run')
+
+    # Used by MySerializer to add property fields to the JSON representation
+    # of an instance of this class.
+    extra_fields = [
+            'pass_rate',
+            'pass_rate_pct',
+            'bug_count',
+            'log_count',
+            ]
+
+    @property
+    def pass_rate(self):
+        return self.pass_count*1.0 / self.total_count if self.total_count > 0 else 0
+
+    @property
+    def pass_rate_pct(self):
+        return "%d%%" % int(self.pass_rate*100)
+
+    @property
+    def bug_count(self):
+        return self.bugs.count()
+
+    @property
+    def log_count(self):
+        return self.resultlog_set.count()
+
+class SRUResultLog(DashboardBaseModel):
+    class Meta:
+        db_table = 'sru_result_logs'
+    display_name = models.CharField(max_length=255, null = True)
+    path = models.TextField() 
+    sru_result = models.ForeignKey('SRUResult')
+    remote_url = models.URLField()
+
+    def __unicode__(self):
+        return self.path

=== added directory 'sru/templates'
=== renamed directory 'dashboard/templates/sru' => 'sru/templates/sru'
=== added file 'sru/tests.py'
--- sru/tests.py	1970-01-01 00:00:00 +0000
+++ sru/tests.py	2013-01-04 18:06:05 +0000
@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)

=== renamed file 'dashboard/views/sru.py' => 'sru/views.py'
--- dashboard/views/sru.py	2013-01-03 21:22:50 +0000
+++ sru/views.py	2013-01-04 18:06:05 +0000
@@ -18,7 +18,7 @@
 from django.db.models import Sum, F
 from django.template import RequestContext
 
-from dashboard.models import Kernel
+from sru.models import Kernel
 from common.utils import (
         JSONResponse,
         MySerializer,