Merge lp:~cjohnston/helipad/remove-hard-coding into lp:helipad/graphics

[Chris Johnston]

[lp:~cjohnston/helipad/remove-hard-coding]

27. By Chris Johnston on 2013-08-25

Updates

Unmerged revisions

27. By Chris Johnston on 2013-08-25

Updates

26. By Chris Johnston on 2013-08-25

Begin the process of removing hard coding

=== modified file 'dashboard.py'
--- dashboard.py	2013-08-21 19:19:40 +0000
+++ dashboard.py	2013-08-25 15:52:26 +0000
@@ -17,7 +17,7 @@
     LINKS = [
         {
             'name': 'graphics',
-            'url': reverse_lazy('openarena'),
+            'url': reverse_lazy('graphics_overview'),
             'label': 'Graphics',
             'index': 800,
         },

=== modified file 'management/commands/jenkins_pull_phoronix.py'
--- management/commands/jenkins_pull_phoronix.py	2013-08-25 15:52:26 +0000
+++ management/commands/jenkins_pull_phoronix.py	2013-08-25 15:52:26 +0000
@@ -136,6 +136,7 @@
                                     jenkins_url=url_file,
                                     test_resolution=dic['options'],
                                     framework='utah',
+                                    testsuite=dic['name'],
                                 )
 
         job_list = []

=== modified file 'migrations/0001_initial.py'
--- migrations/0001_initial.py	2013-08-25 15:52:26 +0000
+++ migrations/0001_initial.py	2013-08-25 15:52:26 +0000
@@ -57,7 +57,8 @@
             ('machine', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['graphics.GraphicsMachine'])),
             ('jenkins_build', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['common.JenkinsBuild'], null=True)),
             ('test_resolution', self.gf('django.db.models.fields.CharField')(max_length=4096)),
-            ('framework', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('framework', self.gf('django.db.models.fields.CharField')(max_length=4096)),
+            ('testsuite', self.gf('django.db.models.fields.CharField')(max_length=4096)),
         ))
         db.send_create_signal('graphics', ['GraphicsMetric'])
 
@@ -143,7 +144,7 @@
             'Meta': {'object_name': 'GraphicsMetric', 'db_table': "'graphics_metrics'"},
             'average': ('django.db.models.fields.FloatField', [], {'default': '0'}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'framework': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'framework': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['graphics.GraphicsImage']", 'null': 'True'}),
             'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
@@ -157,6 +158,7 @@
             'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
             'stddev': ('django.db.models.fields.FloatField', [], {'default': '0'}),
             'test_resolution': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'testsuite': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
             'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
         }
     }

=== modified file 'models.py'
--- models.py	2013-08-25 15:52:26 +0000
+++ models.py	2013-08-25 15:52:26 +0000
@@ -53,7 +53,8 @@
     # build description - charfield
     # ran_at
     test_resolution = models.CharField(max_length=4096)
-    framework = models.CharField(max_length=128)
+    framework = models.CharField(max_length=4096)
+    testsuite = models.CharField(max_length=4096)
     # name - charfield
     # minimum - float
     # maximum - float

=== modified file 'static/graphics/js/phoronix.js'
--- static/graphics/js/phoronix.js	2013-08-25 15:52:26 +0000
+++ static/graphics/js/phoronix.js	2013-08-25 15:52:26 +0000
@@ -1,5 +1,7 @@
 function create_phoronix_chart(data_url, chart_name){
 d3.json(data_url, function(data) {
+  var chart_size = 400
+  document.querySelector('div#' + chart_name).style.height = chart_size + "px";
 
   nv.addGraph(function() {
       var chart = nv.models.multiBarChart()

=== modified file 'templates/graphics/graphics_layout.html'
--- templates/graphics/graphics_layout.html	2013-08-16 18:53:01 +0000
+++ templates/graphics/graphics_layout.html	2013-08-25 15:52:26 +0000
@@ -12,7 +12,7 @@
 
 
 {% block sub_nav_links %}
-<li {% ifequal url.1 'openarena' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url openarena %}'>openarena</a></li>
-<li {% ifequal url.1 'guitoolkits' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url guitoolkits %}'>gui-toolkits</a></li>
-<li {% ifequal url.1 'nexuiz' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url nexuiz %}'>nexuiz</a></li>
+<li {% ifequal url.1 'openarena' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url graphics_overview "openarena" %}'>openarena</a></li>
+<li {% ifequal url.1 'guitoolkits' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url graphics_overview "guitoolkits" %}'>gui-toolkits</a></li>
+<li {% ifequal url.1 'nexuiz' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url graphics_overview "nexuiz" %}'>nexuiz</a></li>
 {% endblock %}

=== added file 'templates/graphics/help.html'
--- templates/graphics/help.html	1970-01-01 00:00:00 +0000
+++ templates/graphics/help.html	2013-08-25 15:52:26 +0000
@@ -0,0 +1,3 @@
+<a class="css-tooltip no-border" href="#"><div class="help">?</div><span class="classic">
+  Legend help: Double click a machine to disable all other machines; single click a machine to enable/disable that machine. Double click bar to see build results for the jobs in Jenkins.
+</span></a>

=== added file 'templates/graphics/overview.html'
--- templates/graphics/overview.html	1970-01-01 00:00:00 +0000
+++ templates/graphics/overview.html	2013-08-25 15:52:26 +0000
@@ -0,0 +1,22 @@
+{% extends "graphics/graphics_layout.html" %}
+{% load dashboard_extras staticfiles %}
+
+{% block page_name %}{{ testsuite|capfirst }} graphics benchmarking for XMir{% endblock %}
+
+{% block content %}
+<div class='grid_15'>
+    <h2>
+        {{ testsuite|capfirst }} @ {{ resolution }}
+        {% include "graphics/help.html" %}
+    </h2>
+    {% for machine in machines %}
+    <h3>{{ machine.gfx_manufacturer }}</h3>
+    <script>
+        create_phoronix_chart("{% url graphics_api_result_filter_resolution testsuite machine.gfx_manufacturer resolution %}", "{{ machine.gfx_manufacturer }}", "https://jenkins.qa.ubuntu.com/view/MIR/view/{{ machine.gfx_manufacturer }}")
+    </script>
+    <div id="{{ machine.gfx_manufacturer }}">
+        <svg></svg>
+    </div>
+    {% endfor %}
+</div>
+{% endblock %}

=== modified file 'urls.py'
--- urls.py	2013-08-09 20:40:01 +0000
+++ urls.py	2013-08-25 15:52:26 +0000
@@ -6,7 +6,9 @@
 
 urlpatterns = patterns(
     'graphics.views',
-    url(r'^openarena/$', 'openarena', name='openarena'),
-    url(r'^guitoolkits/$', 'gui_toolkits', name='guitoolkits'),
-    url(r'^nexuiz/$', 'nexuiz', name='nexuiz')
+    url(
+        r'^(?:(?P<testsuite>\w+)/)?(?:(?P<resolution>\w+)/)?$',
+        'overview',
+        name='graphics_overview',
+    ),
 )

=== modified file 'views.py'
--- views.py	2013-08-21 16:28:33 +0000
+++ views.py	2013-08-25 15:52:26 +0000
@@ -1,45 +1,34 @@
 from django.template import RequestContext
 from django.views.decorators.http import require_GET
-from django.shortcuts import render_to_response
-
-
-@require_GET
-def openarena(request):
-
-    data = {'help_info': str("""
-        Double click circle to disable all other results.
-        Single click circle to enable/disable result.
-        Double click bar to see build results for all Openarena jobs
-        on jenkins.""")}
-
-    return render_to_response('graphics/openarena.html',
-                              data,
-                              RequestContext(request))
-
-
-@require_GET
-def gui_toolkits(request):
-
-    data = {'help_info': str("""
-        Double click circle to disable all other results.
-        Single click circle to enable/disable result.
-        Double click bar to see build results for all Gui-toolkits jobs
-        on jenkins""")}
-
-    return render_to_response('graphics/guitoolkits.html',
-                              data,
-                              RequestContext(request))
-
-
-@require_GET
-def nexuiz(request):
-
-    data = {'help_info': str("""
-        Double click circle to disable all other results.
-        Single click circle to enable/disable result.
-        Double click bar to see build results for all Nexuiz jobs
-        on jenkins""")}
-
-    return render_to_response('graphics/nexuiz.html',
-                              data,
-                              RequestContext(request))
+from django.shortcuts import render_to_response, redirect
+
+from graphics.models import GraphicsMachine
+
+
+@require_GET
+def overview(request, testsuite=None, resolution=None):
+
+    if testsuite is None:
+        testsuite = 'openarena'
+        return redirect('openarena/')
+
+    if resolution is None:
+        resolution = '1024x768'
+
+    machines = GraphicsMachine.objects.filter(
+        publish=True,
+        graphicsmetric__testsuite=testsuite,
+        graphicsmetric__test_resolution=resolution,
+    ).distinct('gfx_manufacturer')
+    print machines
+    data = {
+        'machines': machines,
+        'testsuite': testsuite,
+        'resolution': resolution,
+    }
+
+    return render_to_response(
+        'graphics/overview.html',
+        data,
+        RequestContext(request),
+    )