Changeset 5fc8fc0082bfa6f10d4a3a4edc64612ee737aab6

Timestamp:

02/11/09 19:38:27 (3 years ago)

Author:

Frederic Lepied <frederic.lepied@…>

Children:

3d3414278502ad60842ab623bcae9692a7b9ec7b

Parents:

920e704d3e590918bbcc96affb46112454862f18

git-committer:

Frederic Lepied <frederic.lepied@…> (02/11/09 19:38:27)

Message:

- activated admin interface by default.
- put in place a mini web site to navigate through the tests reports.

Files:

• pxe/models.py (modified) (1 diff)
• pxe/views.py (modified) (1 diff)
• settings.py (modified) (2 diffs)
• tester/models.py (modified) (2 diffs)
• tester/templates/base.html (added)
• tester/templates/index.html (added)
• tester/templates/log.html (added)
• tester/templates/logs.html (added)
• tester/templates/versions.html (added)
• tester/views.py (modified) (4 diffs)
• urls.py (modified) (2 diffs)

pxe/models.py

@@ -25 +25 @@
     system = models.ForeignKey(System)
     boot_name = models.ForeignKey(BootName)
-    
+
+from django.contrib import admin
+admin.site.register(System)
+admin.site.register(MacAddress)
+admin.site.register(BootName)
+admin.site.register(Log)
+
 # models.py ends here

pxe/views.py

@@ -10 +10 @@
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404
-from common import *
-from models import *
+from pxe.common import *
+from pxe.models import *
 
 def localboot1(request):

settings.py

@@ -28 +28 @@
 TESTS_DIR = '/home/flepied/work/tests/'
 TEST_SUFFIX = '.test'
-TEST_UPLOAD_DIR = '/home/flepied/work/tests/results/'
+TEST_UPLOAD_DIR = '/home/flepied/work/test-results/'
 
 # Local time zone for this installation. Choices can be found here:
@@ -95 +95 @@
     'pxe',
     'tester',
-    #'django.contrib.admin',
+    'django.contrib.admin',
 )

tester/models.py

@@ -5 +5 @@
     name = models.CharField(max_length=100)
     available = models.BooleanField()
+
+class SystemVersion(models.Model):
+    name = models.CharField(max_length=100)
 
 class TestLog(models.Model):
@@ -18 +21 @@
     system = models.ForeignKey(System)
     test_name = models.ForeignKey(TestName)
+    warnings = models.IntegerField(default=0)
+    infos = models.IntegerField(default=0)
+    errors = models.IntegerField(default=0)
+    version = models.ForeignKey(SystemVersion, null=True)
+
+class InfoLine(models.Model):
+    type = models.CharField(max_length=1)
+    log = models.ForeignKey(TestLog)
+    text = models.CharField(max_length=100)
+
+from django.contrib import admin
+admin.site.register(SystemVersion)
+admin.site.register(TestName)
+admin.site.register(TestLog)
+admin.site.register(InfoLine)

tester/views.py

@@ +1 @@
+import re
 from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.shortcuts import render_to_response, get_object_or_404
+from django.core.servers.basehttp import FileWrapper
 from forms import UploadFileForm
 from pxe.common import *
@@ -20 +22 @@
             print 'valid', log.status
             handle_uploaded_file(request.FILES['file'], log.id)
+            process_file(log)
             return HttpResponse("uploaded", mimetype="text/plain")
         else:
@@ -29 +32 @@
     return render_to_response('upload.html', {'form': form})
 
+def get_filename(id):
+    return '%s/%d.log' % (settings.TEST_UPLOAD_DIR, id)
+
 def handle_uploaded_file(f, id):
-    destination = open('%s/%d.log' % (settings.TEST_UPLOAD_DIR, id), 'wb+')
+    destination = open(get_filename(id), 'wb+')
     for chunk in f.chunks():
         destination.write(chunk)
     destination.close()
 
+info_regexp = re.compile('^([IEWSVT]): (.*)')
+
+def add_info_line(type, text, log):
+    i = InfoLine(type=type, text=text, log=log)
+    i.save()
+    return i
+
+def process_file(log):
+    info = 0
+    error = 0
+    warning = 0
+    for line in open(get_filename(log.id)).readlines():
+        res = info_regexp.search(line)
+        if res:
+            if res.group(1) == 'I':
+                info = info + 1
+                add_info_line(res.group(1), res.group(2), log)
+            elif res.group(1) == 'E':
+                error = error + 1
+                add_info_line(res.group(1), res.group(2), log)
+            elif res.group(1) == 'W':
+                warning = warning + 1
+                add_info_line(res.group(1), res.group(2), log)
+            elif res.group(1) == 'V':
+                version = res.group(2)
+                try:
+                    v = SystemVersion.objects.get(name=version)
+                except SystemVersion.DoesNotExist:
+                    v = SystemVersion(name=version)
+                    v.save()
+                log.version = v
+    log.warnings = warning
+    log.infos = info
+    log.errors = error
+    log.save()
+    
 def next_test1(request):
     mac = get_mac(request)
@@ -49 +91 @@
         log.status = 'S'
         log.save()
-    return render_to_response(name + settings.TEST_SUFFIX, {'testname', name})
+    print "%s (%s) -> %s" % (s.name, mac, name)
+    return render_to_response(name + settings.TEST_SUFFIX, {'testname': name, 'system': s.name})
+
+def logs(request, verid):
+    version = get_object_or_404(SystemVersion, id=verid)
+    logs = TestLog.objects.filter(version=version).order_by('-date')
+    return render_to_response('logs.html', {'logs': logs, 'version': version})    
+
+def log(request, logid):
+    log = get_object_or_404(TestLog, id=logid)
+    infos = InfoLine.objects.filter(log=log).order_by('id')
+    return render_to_response('log.html', {'log': log, 'infos': infos})    
+
+def content(request, logid):
+    log = get_object_or_404(TestLog, id=logid)
+    filename = get_filename(log.id)
+    wrapper = FileWrapper(file(filename))
+    response = HttpResponse(wrapper, content_type='text/plain')
+    response['Content-Length'] = os.path.getsize(filename)
+    return response
+
+def index(request):
+    versions = SystemVersion.objects.all().order_by('-id')
+    return render_to_response('index.html', {'versions': versions})    
     
 # views.py ends here

urls.py

@@ -2 +2 @@
 
 # Uncomment the next two lines to enable the admin:
-#from django.contrib import admin
-#admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
@@ -22 +22 @@
     (r'^nexttest/(?P<mac>[a-fA-F0-9:-]+)/$', 'tester.views.next_test'),
     
+    (r'^$', 'tester.views.index'),
+    (r'^tests/(?P<verid>[0-9]+)/$', 'tester.views.logs'),
+    (r'^test/(?P<logid>[0-9]+)/$', 'tester.views.log'),
+    (r'^testcontent/(?P<logid>[0-9]+)/$', 'tester.views.content'),
+
     # Uncomment the next line to enable the admin:
-    #(r'^admin/(.*)', admin.site.root),
+    (r'^admin/(.*)', admin.site.root),
 )