Changeset 531ce3a6fd488efc448d608ddc575d3ac5545710

Timestamp:

02/13/09 14:09:59 (3 years ago)

Author:

Frederic Lepied <frederic.lepied@…>

Children:

bcaf3494df73e30262f508a84aa50fad8bc1d24a

Parents:

1641e797df31622a217ebb7904b766db82a1209d

git-committer:

Frederic Lepied <frederic.lepied@…> (02/13/09 14:09:59)

Message:

pass the logid to the upload url/function

Files:

• README (modified) (1 diff)
• tester/views.py (modified) (3 diffs)
• urls.py (modified) (1 diff)

README

@@ -75 +75 @@
 
 After the execution of a test script, the result is sent back to the
-server using the following url: http://<ipaddr>:<port>/upload/. I
+server using the following url: http://<ipaddr>:<port>/upload/<test id>/. I
 usualy run the following curl command to upload the result:
 
-curl --retry 0 -s -f -F "file=@$output" http://<ipaddr>:<port>/upload/
+curl --retry 0 -s -f -F "file=@$output" http://<ipaddr>:<port>/upload/<test id>/
 
 These uploaded files are stored under the directory set by the

tester/views.py

@@ -7 +7 @@
 from tester.models import *
 
-def upload_file(request):
-    print 'upload_file'
+def upload_file(request, logid):
+    print 'upload_file', logid
     if request.method == 'POST':
         form = UploadFileForm(request.POST, request.FILES)
         mac = get_mac(request)
         s = get_object_or_404(System, macaddress__mac=simplify_mac(mac))
-        logs = TestLog.objects.filter(system=s, status='S').order_by('date')
-        if len(logs) == 0:
-            raise Http404
-        log = logs[0]
+        log = get_object_or_404(TestLog, id=logid)
         if form.is_valid():
             log.status = 'D'
@@ -91 +88 @@
         log.status = 'S'
         log.save()
-    print "%s (%s) -> %s" % (s.name, mac, name)
-    return render_to_response(name + settings.TEST_SUFFIX, {'testname': name, 'system': s.name})
+    else:
+        log = None
+    print "%s (%s) -> %s (%s)" % (s.name, mac, name, str(log))
+    return render_to_response(name + settings.TEST_SUFFIX, {'testname': name, 'system': s.name, 'log': log})
 
 def logs(request, verid):
@@ -102 +101 @@
     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})    
+    return render_to_response('log.html', {'log': log, 'infos': infos})
 
 def content(request, logid):

urls.py

@@ -18 +18 @@
     (r'^profile/$', 'pxe.views.profile1'),
                        
-    (r'^upload/$', 'tester.views.upload_file'),
+    (r'^upload/(?P<logid>[0-9]+)/$', 'tester.views.upload_file'),
     (r'^nexttest/$', 'tester.views.next_test1'),
     (r'^nexttest/(?P<mac>[a-fA-F0-9:-]+)/$', 'tester.views.next_test'),