Merge lp:~elachuni/ubuntu-webcatalog/machine-model into lp:ubuntu-webcatalog

[Anthony Lenton]

Added a Machine model and fleshes out the api to interact with it.

Overview
========
This branch adds a Machine model and fleshes out the api to interact with the model.

Details
=======
Work was based on a stub api provided by didrocks, that's been merged into this branch already.
Code has been tested using the oneconf client, besides the handler tests included.
The model itself is just a boilerplate bag of fields, so no tests added for that. Client tests (using the piston-mini-client code oneconf uses) can be included in a later branch.
There's no auth protection on the handlers yet, so all machine data gets piled onto the first user in the system. This needs to be added for the api to be really usable, but can also be included in a later branch.

[lp:~elachuni/ubuntu-webcatalog/machine-model]

50. By Anthony Lenton on 2011-07-27

Two small code style fixes

51. By Anthony Lenton on 2011-07-27

Merged in latest changes from trunk

52. By Anthony Lenton on 2011-07-28

Plugged in authentication.

53. By Anthony Lenton on 2011-07-28

Plugged in api tests.

54. By Anthony Lenton on 2011-07-28

Completed tests for list-machines.

55. By Anthony Lenton on 2011-07-29

Completed API tests.

[Ricardo Kirkner (ricardokirkner)]

Some comments:

l. 115: still using hardcoded User instead of the one from the request
l. 736: factory methods default prefix don't end in '-' (let's be consistent)
l. 845: you don't want to 'import simplejson' directly, but 'from django.utils import simplejson', as that will try to load python's json module first, and fallback to the simplejson module provided by django if not found
l. 911, why not check for status code here? to make sure it's 204?
l. 1003 why test for the content instead of the status code ('Success' vs 200)?. Why is the content not the same as with the status ('Success' vs 'ok')?
l. 1064: why use None for the request when you have a request you can use (self.request)?

Otherwise looks pretty nice.

review: Needs Fixing

[Anthony Lenton (elachuni)]

Hi Ricardo,

Thanks for the review! I'm attaching a diff that fixes all your
 comments.

On 07/29/2011 11:31 AM, Ricardo Kirkner wrote:
> l. 115: still using hardcoded User instead of the one from the request
True! Fixed

> l. 736: factory methods default prefix don't end in '-' (let's be consistent)
Yep, fixed also.

> l. 845: you don't want to 'import simplejson' directly, but 'from django.utils import simplejson', as that will try to load python's json module first, and fallback to the simplejson module provided by django if not found
Fixed.

> l. 911, why not check for status code here? to make sure it's 204?
Yep, it makes sense to check the status also. The test wants to verify
 that the instance was actually deleted from the db, hence the model
 check.

> l. 1003 why test for the content instead of the status code ('Success' vs 200)?. Why is the content not the same as with the status ('Success' vs 'ok')?

Fixed the test so that it checks for both status and content (with
 assertContains).
The 'Success' and 'ok' responses are for different things (command was
 successful, vs. current status of the server). I don't think it makes
 much sense to make these two response messages the same.

> l. 1064: why use None for the request when you have a request you can use (self.request)?
And, also fixed.

I'm attaching a diff with just these fixes, hope it works :)

[lp:~elachuni/ubuntu-webcatalog/machine-model]

56. By Anthony Lenton on 2011-07-29

Minor changes per code review.

[Ricardo Kirkner (ricardokirkner)]

Lovely!

review: Approve

=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2011-07-02 04:53:26 +0000
+++ src/webcatalog/admin.py	2011-07-29 15:59:29 +0000
@@ -26,11 +26,13 @@
     Application,
     Department,
     DistroSeries,
+    Machine,
     )
 
 __metaclass__ = type
 __all__ = [
     'ApplicationAdmin',
+    'MachineAdmin',
     ]
 
 
@@ -40,6 +42,11 @@
     list_filter = ('distroseries', 'departments')
     exclude = ('for_purchase', 'archive_id')
 
+class MachineAdmin(admin.ModelAdmin):
+    search_fields = ('owner__username', 'hostname', 'uuid')
+    list_display = ('hostname', 'uuid', 'owner')
+
 admin.site.register(Application, ApplicationAdmin)
 admin.site.register(Department)
 admin.site.register(DistroSeries)
+admin.site.register(Machine, MachineAdmin)

=== added file 'src/webcatalog/api/forms.py'
--- src/webcatalog/api/forms.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/api/forms.py	2011-07-29 15:59:29 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+#   This file is part of the Ubuntu Web Catalog
+#   Copyright (C) 2011 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 as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY 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/>.
+
+"""Forms for using within the Ubuntu Web Catalog API."""
+
+from __future__ import absolute_import
+
+__metaclass__ = type
+__all__ = [
+    'MachineCreateUpdateForm',
+    'MachineUpdatePackagesForm',
+]
+
+from django import forms
+
+from webcatalog.models import Machine
+
+class MachineCreateUpdateForm(forms.ModelForm):
+    class Meta:
+        model = Machine
+        fields = (
+            'hostname',
+            'logo_checksum',
+            )
+
+class MachineUpdatePackagesForm(forms.ModelForm):
+    class Meta:
+        model = Machine
+        fields = (
+            'packages_checksum',
+            'package_list',
+            )

=== modified file 'src/webcatalog/api/handlers.py'
--- src/webcatalog/api/handlers.py	2011-06-29 11:40:16 +0000
+++ src/webcatalog/api/handlers.py	2011-07-29 15:59:29 +0000
@@ -24,11 +24,92 @@
     'ServerStatusHandler',
 ]
 
+import json
+
+from django.contrib.auth.models import User
+from django.http import (
+    HttpResponse,
+    HttpResponseBadRequest,
+    HttpResponseNotFound,
+    )
 from piston.handler import BaseHandler
 
+from webcatalog.models import Machine
+from .forms import MachineCreateUpdateForm, MachineUpdatePackagesForm
+
 class ServerStatusHandler(BaseHandler):
     allowed_methods = ('GET',)
 
     def read(self, request):
         return "ok"
 
+class ListMachinesHandler(BaseHandler):
+    allowed_methods = ('GET',)
+    model = Machine
+    fields = ('uuid', 'hostname', 'logo_checksum', 'packages_checksum')
+
+    def read(self, request):
+        result = Machine.objects.filter(owner=request.user)
+        return result.defer('package_list')
+
+class MachineHandler(BaseHandler):
+    allowed_methods = ('GET', 'POST', 'DELETE')
+    model = Machine
+    fields = ('uuid', 'hostname', 'logo_checksum', 'packages_checksum')
+
+    def read(self, request, uuid):
+        try:
+            return Machine.objects.get(owner=request.user, uuid=uuid)
+        except Machine.DoesNotExist:
+            return HttpResponseNotFound('Invalid machine UUID')
+
+    def create(self, request, uuid):
+        if not hasattr(request, 'data'):
+            return HttpResponseBadRequest("Unable to deserialize request")
+        form = MachineCreateUpdateForm(request.data)
+        if form.is_valid():
+            # Make this call work both for updating and creating machines
+            instance, created = Machine.objects.get_or_create(
+                owner=request.user, uuid=uuid)
+            form = MachineCreateUpdateForm(request.data, instance=instance)
+            return form.save()
+        else:
+            errors = dict((k, map(unicode, v))
+                          for (k, v) in form.errors.items())
+            result = {'status': 'error', 'errors': errors}
+            return result
+        
+    def delete(self, request, uuid):
+        instances = Machine.objects.filter(owner=request.user, uuid=uuid)
+        if instances.count() > 0:
+            instances.delete()
+            return HttpResponse(status=204)
+        else:
+            return HttpResponseNotFound('Invalid machine UUID')
+            
+
+class PackagesHandler(BaseHandler):
+    allowed_methods = ('GET', 'POST',)  
+    def read(self, request, uuid):
+        try:
+            instance = Machine.objects.get(owner=request.user, uuid=uuid)
+            return instance.package_list
+        except Machine.DoesNotExist:
+            return HttpResponseNotFound('Invalid machine UUID')
+        
+    def create(self, request, uuid):
+        try:
+            instance = Machine.objects.get(owner=request.user, uuid=uuid)
+        except Machine.DoesNotExist:
+            return HttpResponseNotFound('Invalid machine UUID')
+        if not hasattr(request, 'data'):
+            return HttpResponseBadRequest("Unable to deserialize request")
+        form = MachineUpdatePackagesForm(request.data, instance=instance)
+        if form.is_valid():
+            form.save()
+            return 'Success'
+        else:
+            errors = dict((k, map(unicode, v))
+                          for (k, v) in form.errors.items())
+            result = {'status': 'error', 'errors': errors}
+            return result

=== modified file 'src/webcatalog/api/urls.py'
--- src/webcatalog/api/urls.py	2011-06-29 11:40:16 +0000
+++ src/webcatalog/api/urls.py	2011-07-29 15:59:29 +0000
@@ -18,13 +18,25 @@
 
 from piston.resource import Resource
 from webcatalog.api.handlers import (
+    ListMachinesHandler,
+    MachineHandler,
+    PackagesHandler,
     ServerStatusHandler,
 )
 from webcatalog.auth import SSOOAuthAuthentication
 
 auth = SSOOAuthAuthentication(realm="Ubuntu Web Catalog")
 
+class CSRFExemptResource(Resource):
+    """A Custom Resource that is csrf exempt"""
+    def __init__(self, handler, authentication=None):
+        super(CSRFExemptResource, self).__init__(handler, authentication)
+        self.csrf_exempt = True
+
 server_status_resource = Resource(handler=ServerStatusHandler)
+list_machines_resource = Resource(handler=ListMachinesHandler, authentication=auth)
+machine_resource = CSRFExemptResource(handler=MachineHandler, authentication=auth)
+packages_resource = CSRFExemptResource(handler=PackagesHandler, authentication=auth)
 
 urlpatterns = patterns('',
     # get status of the service (usually just "ok", might be "read-only")
@@ -32,6 +44,12 @@
     # send a moderation request
     #  GET /1.0/server-status/
     url(r'^1.0/server-status/$', server_status_resource,
-        name='server-status'),
-
+        name='wb-server-status'),
+    #  GET /1.0/list-machines/
+    url(r'^1.0/list-machines/$', list_machines_resource,
+        name='wb-list-machines'),
+    url(r'^1.0/machine/(?P<uuid>[-\w]+)/$',
+        machine_resource, name='wb-machine'),
+    url(r'^1.0/packages/(?P<uuid>[-\w]+)/$',
+        packages_resource, name='wb-packages'),
 )

=== added file 'src/webcatalog/migrations/0007_add_machine.py'
--- src/webcatalog/migrations/0007_add_machine.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0007_add_machine.py	2011-07-29 15:59:29 +0000
@@ -0,0 +1,136 @@
+# encoding: 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 'Machine'
+        db.create_table('webcatalog_machine', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('uuid', self.gf('django.db.models.fields.CharField')(max_length=32, db_index=True)),
+            ('hostname', self.gf('django.db.models.fields.CharField')(max_length=64)),
+            ('packages_checksum', self.gf('django.db.models.fields.CharField')(max_length=56)),
+            ('package_list', self.gf('django.db.models.fields.TextField')()),
+            ('logo_checksum', self.gf('django.db.models.fields.CharField')(max_length=56, blank=True)),
+        ))
+        db.send_create_signal('webcatalog', ['Machine'])
+
+        # Adding unique constraint on 'Machine', fields ['owner', 'uuid']
+        db.create_unique('webcatalog_machine', ['owner_id', 'uuid'])
+
+        # Adding unique constraint on 'ReviewStatsImport', fields ['distroseries']
+        db.create_unique('webcatalog_reviewstatsimport', ['distroseries_id'])
+
+
+    def backwards(self, orm):
+        
+        # Removing unique constraint on 'ReviewStatsImport', fields ['distroseries']
+        db.delete_unique('webcatalog_reviewstatsimport', ['distroseries_id'])
+
+        # Removing unique constraint on 'Machine', fields ['owner', 'uuid']
+        db.delete_unique('webcatalog_machine', ['owner_id', 'uuid'])
+
+        # Deleting model 'Machine'
+        db.delete_table('webcatalog_machine')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        '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': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        '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'}),
+            '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'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'screenshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== added file 'src/webcatalog/migrations/0008_add_oauth_tables.py'
--- src/webcatalog/migrations/0008_add_oauth_tables.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0008_add_oauth_tables.py	2011-07-29 15:59:29 +0000
@@ -0,0 +1,176 @@
+# encoding: 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 'Consumer'
+        db.create_table('webcatalog_consumer', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='oauth_consumer', unique=True, to=orm['auth.User'])),
+            ('key', self.gf('django.db.models.fields.CharField')(max_length=64)),
+            ('secret', self.gf('django.db.models.fields.CharField')(default='PxDdsAQWcEFXUXmyQfsceNTJmgxcsQ', max_length=255, blank=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)),
+        ))
+        db.send_create_signal('webcatalog', ['Consumer'])
+
+        # Adding model 'Token'
+        db.create_table('webcatalog_token', (
+            ('consumer', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['webcatalog.Consumer'])),
+            ('token', self.gf('django.db.models.fields.CharField')(default='rLuJPRLPHKDpxPqeaiytxwZctoWUdjRfbUvinaCSKrsTyZWGsV', max_length=50, primary_key=True)),
+            ('token_secret', self.gf('django.db.models.fields.CharField')(default='UoHiMuBdlsZxAZYHrDCnJnEnBJBKrTmZXGsqlMGXFENLtXeAvq', max_length=50)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255, blank=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)),
+        ))
+        db.send_create_signal('webcatalog', ['Token'])
+
+        # Adding model 'Nonce'
+        db.create_table('webcatalog_nonce', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('token', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['webcatalog.Token'])),
+            ('consumer', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['webcatalog.Consumer'])),
+            ('nonce', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)),
+            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('webcatalog', ['Nonce'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Consumer'
+        db.delete_table('webcatalog_consumer')
+
+        # Deleting model 'Token'
+        db.delete_table('webcatalog_token')
+
+        # Deleting model 'Nonce'
+        db.delete_table('webcatalog_nonce')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        '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': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        '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'}),
+            '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'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'screenshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'hFuSuGGcaWAcAgjRlcWbIuHVTutivv'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'BzXRMTLNLbCqttuBrpPirPQnsUJNctCyykYYhMruecOojcBlGf'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'aYiLvMWQoXqKdlQXJSPFgRLXnQxUHpfXHdpdSLKCcfmMZRWMNw'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/__init__.py'
--- src/webcatalog/models/__init__.py	2011-07-19 12:42:03 +0000
+++ src/webcatalog/models/__init__.py	2011-07-29 15:59:29 +0000
@@ -27,6 +27,7 @@
     'Application',
     'Department',
     'ReviewStatsImport',
+    'Machine',
 ]
 
 from .oauthtoken import Token, Consumer, Nonce, DataStore
@@ -34,5 +35,6 @@
     Application,
     Department,
     DistroSeries,
+    Machine,
     ReviewStatsImport,
 )

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2011-07-20 15:27:06 +0000
+++ src/webcatalog/models/applications.py	2011-07-29 15:59:29 +0000
@@ -26,6 +26,7 @@
 import re
 from datetime import datetime
 
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import models
 
@@ -34,7 +35,9 @@
 __metaclass__ = type
 __all__ = [
     'Application',
+    'Department',
     'DistroSeries',
+    'Machine',
     'ReviewStatsImport',
     ]
 
@@ -183,6 +186,17 @@
 class ReviewStatsImport(models.Model):
     distroseries = models.ForeignKey(DistroSeries, unique=True)
     last_import = models.DateTimeField(default=datetime.utcnow)
-
-    class Meta:
-        app_label = 'webcatalog'
+    class Meta:
+        app_label = 'webcatalog'
+
+
+class Machine(models.Model):
+    owner = models.ForeignKey(User, db_index=True)
+    uuid = models.CharField(max_length=32, db_index=True)
+    hostname = models.CharField(max_length=64)
+    packages_checksum = models.CharField(max_length=56)
+    package_list = models.TextField()
+    logo_checksum = models.CharField(max_length=56, blank=True)
+    class Meta:
+        app_label = 'webcatalog'
+        unique_together = ('owner', 'uuid')

=== modified file 'src/webcatalog/models/oauthtoken.py'
--- src/webcatalog/models/oauthtoken.py	2011-06-27 16:31:36 +0000
+++ src/webcatalog/models/oauthtoken.py	2011-07-29 15:59:29 +0000
@@ -84,7 +84,7 @@
         return self.token
 
     class Meta:
-        app_label = 'reviewsapp'
+        app_label = 'webcatalog'
 
 
 class Consumer(models.Model):
@@ -130,7 +130,7 @@
         return OAuthConsumer(self.key, self.secret)
 
     class Meta:
-        app_label = 'reviewsapp'
+        app_label = 'webcatalog'
 
 
 class Nonce(models.Model):
@@ -149,7 +149,7 @@
         return consumer.nonce_set.create(token=token, nonce=nonce)
 
     class Meta:
-        app_label = 'reviewsapp'
+        app_label = 'webcatalog'
 
 class DataStore(OAuthDataStore):
 

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2011-07-19 15:44:09 +0000
+++ src/webcatalog/schema.py	2011-07-29 15:59:29 +0000
@@ -49,6 +49,9 @@
     webcatalog.disk_apt_cache_location = StringConfigOption()
     webcatalog.default_distro = StringConfigOption()
     webcatalog.page_batch_size = IntConfigOption(default=20)
+    webcatalog.preload_api_service_roots = BoolConfigOption()
+    webcatalog.oauth_data_store = StringConfigOption(
+        default='webcatalog.models.oauthtoken.DataStore')
 
     google = ConfigSection()
     google.google_analytics_id = StringConfigOption()

=== modified file 'src/webcatalog/tests/__init__.py'
--- src/webcatalog/tests/__init__.py	2011-06-30 17:18:27 +0000
+++ src/webcatalog/tests/__init__.py	2011-07-29 15:59:29 +0000
@@ -16,10 +16,16 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Import various view, model and other tests for django's default runner."""
+from .test_api import *
 from .test_commands import *
 from .test_department_filters import *
 from .test_forms import *
+from .test_handlers import *
 from .test_models import *
 from .test_templatetags import *
 from .test_utilities import *
 from .test_views import *
+
+# disable logging when running tests
+import logging
+logging.disable(logging.CRITICAL)

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2011-07-21 13:18:39 +0000
+++ src/webcatalog/tests/factory.py	2011-07-29 15:59:29 +0000
@@ -26,12 +26,17 @@
 
 from django.contrib.auth.models import User
 from django.test import TestCase
+from django_openid_auth.models import UserOpenID
 
 from webcatalog.models import (
     Application,
+    Consumer,
     Department,
     DistroSeries,
+    Machine,
+    Token,
     )
+from webcatalog.utilities import full_claimed_id
 
 __metaclass__ = type
 __all__ = [
@@ -74,6 +79,16 @@
             user.is_superuser = True
         user.save()
 
+        # Create an openid record too.
+        if open_id is None:
+            open_id = full_claimed_id(self.get_unique_string(prefix='ident-'))
+        elif open_id is False:
+            return user
+        useropenid = UserOpenID.objects.create(
+            user=user, claimed_id=open_id, display_id=open_id)
+
+        return user
+
     def make_application(self, package_name=None, name=None,
         comment=None, description=None, icon_name='', icon=None,
         distroseries=None, arch='i686', ratings_average=None,
@@ -112,6 +127,43 @@
         return os.path.join(
             os.path.dirname(__file__), 'test_data', file_name)
 
+    def make_machine(self, owner=None, uuid=None, hostname=None,
+        package_list=None):
+        if owner is None:
+            owner = self.make_user()
+        if hostname is None:
+            hostname = self.get_unique_string(prefix='hostname-')
+        if uuid is None:
+            uuid = self.get_unique_string(prefix='uuid-')
+        if package_list is None:
+            package_list = self.get_unique_string(prefix='package-list-')
+        packages_checksum = self.get_unique_string(prefix='package-checksum-')
+        logo_checksum = self.get_unique_string(prefix='logo-checksum-')
+
+        return Machine.objects.create(owner=owner, hostname=hostname,
+            uuid=uuid, packages_checksum=packages_checksum,
+            package_list=package_list, logo_checksum=logo_checksum)
+
+    def make_oauth_token_and_consumer(self, user=None, save=True):
+        """Create a new set of OAuth token and consumer creds."""
+        if user is None:
+            user = self.make_user()
+
+        consumer_key = user.useropenid_set.get().claimed_id.split('/')[-1]
+        consumer_secret = self.get_unique_string(prefix='consumer-secret-')
+        consumer = Consumer(user=user, key=consumer_key,
+            secret=consumer_secret)
+        if save:
+            consumer.save()
+        token_string = self.get_unique_string(prefix='token-')
+        token_secret = self.get_unique_string(prefix='token-secret-')
+        token_name = self.get_unique_string(prefix='token-name-')
+        token = Token(consumer=consumer, token=token_string,
+            token_secret=token_secret, name=token_name)
+        if save:
+            token.save()
+        return token, consumer
+
 
 class TestCaseWithFactory(TestCase):
 

=== added file 'src/webcatalog/tests/test_api.py'
--- src/webcatalog/tests/test_api.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_api.py	2011-07-29 15:59:29 +0000
@@ -0,0 +1,254 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Ubuntu Web Catalog
+#   Copyright (C) 2011 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 as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY 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/>.
+
+"""WebCatalog API tests."""
+
+from __future__ import absolute_import
+
+__metaclass__ = type
+__all__ = [
+    'DeleteMachineTestCase',
+    'GetMachineTestCase',
+    'ListPackagesTestCase',
+    'ListMachinesTestCase',
+    'ServerStatusTestCase',
+    'UpdateMachineTestCase',
+    'UpdatePackageListTestCase',
+    ]
+
+from django.utils import simplejson
+
+from django.test import TestCase
+from oauth.oauth import (
+    OAuthRequest,
+    OAuthConsumer,
+    OAuthToken,
+    OAuthSignatureMethod_PLAINTEXT,
+    )
+
+from .factory import TestCaseWithFactory
+from webcatalog.models import Machine
+
+class ServerStatusTestCase(TestCase):
+    def test_server_status(self):
+        response = self.client.get('/cat/api/1.0/server-status/')
+        self.assertEqual(response.content, '"ok"')
+
+class AuthenticatedAPITestCase(TestCaseWithFactory):
+    def auth_header_for_user(self, url, user=None, realm='OAuth'):
+        token, consumer = self.factory.make_oauth_token_and_consumer(user=user)
+        oaconsumer = OAuthConsumer(token.consumer.key, token.consumer.secret)
+        oatoken = OAuthToken(token.token, token.token_secret)
+        oarequest = OAuthRequest.from_consumer_and_token(
+            oaconsumer, oatoken, http_url=url)
+        oarequest.sign_request(OAuthSignatureMethod_PLAINTEXT(),
+            oaconsumer, oatoken)
+        header = oarequest.to_header(realm)
+        return {'HTTP_AUTHORIZATION': header['Authorization']}
+
+
+class ListMachinesTestCase(AuthenticatedAPITestCase):
+    url = '/cat/api/1.0/list-machines/'
+    def test_no_auth_returns_401(self):
+        response = self.client.get(self.url)
+        self.assertEqual(401, response.status_code)
+
+    def test_read_no_machines(self):
+        user = self.factory.make_user()
+        response = self.client.get(self.url,
+            **self.auth_header_for_user(self.url, user=user))
+        self.assertEqual('[]', response.content)
+
+    def test_read_multiple_machines(self):
+        user = self.factory.make_user()
+        machine1 = self.factory.make_machine(owner=user)
+        machine2 = self.factory.make_machine(owner=user)
+        response = self.client.get(self.url,
+            **self.auth_header_for_user(self.url, user=user))
+        data = simplejson.loads(response.content)
+        self.assertEqual(2, len(data))
+        expected = set([machine1.uuid, machine2.uuid])
+        self.assertEqual(expected, set([x['uuid'] for x in data]))
+
+    def test_only_returns_machines_for_the_authenticated_user(self):
+        mymachine = self.factory.make_machine()
+        othermachine = self.factory.make_machine()
+        response = self.client.get(self.url,
+            **self.auth_header_for_user(self.url, user=mymachine.owner))
+        data = simplejson.loads(response.content)
+
+        self.assertEqual(1, len(data))
+        self.assertEqual(mymachine.uuid, data[0]['uuid'])
+
+
+class UpdateMachineTestCase(AuthenticatedAPITestCase):
+    url = '/cat/api/1.0/machine/%s/'
+
+    def test_no_auth_returns_401(self):
+        machine = self.factory.make_machine()
+        response = self.client.get(self.url % machine.uuid)
+        self.assertEqual(401, response.status_code)
+
+    def test_update_success(self):
+        machine = self.factory.make_machine()
+        data = simplejson.dumps({'hostname': machine.hostname + '-updated'})
+        url = self.url % machine.uuid
+
+        response = self.client.post(url, data=data,
+            content_type='application/json',
+            **self.auth_header_for_user(url, user=machine.owner))
+
+        data = simplejson.loads(response.content)
+        self.assertEqual(machine.hostname + '-updated', data['hostname'])
+
+    def test_creates_new_machine_if_not_owner(self):
+        machine = self.factory.make_machine()
+        otheruser = self.factory.make_user()
+        data = simplejson.dumps({'hostname': machine.hostname + '-updated'})
+        url = self.url % machine.uuid
+
+        response = self.client.post(url, data=data,
+            content_type='application/json',
+            **self.auth_header_for_user(url, user=otheruser))
+
+        data = simplejson.loads(response.content)
+        self.assertEqual('', data['packages_checksum'])
+
+
+class DeleteMachineTestCase(AuthenticatedAPITestCase):
+    url = '/cat/api/1.0/machine/%s/'
+
+    def test_no_auth_returns_401(self):
+        machine = self.factory.make_machine()
+        response = self.client.delete(self.url % machine.uuid)
+        self.assertEqual(401, response.status_code)
+
+    def test_delete_success(self):
+        machine = self.factory.make_machine()
+        url = self.url % machine.uuid
+
+        response = self.client.delete(url,
+            **self.auth_header_for_user(url, user=machine.owner))
+
+        self.assertEqual(204, response.status_code)
+        self.assertRaises(Machine.DoesNotExist, Machine.objects.get,
+            uuid=machine.uuid, owner=machine.owner)
+
+    def test_delete_other_users_machine_fails(self):
+        machine = self.factory.make_machine()
+        otheruser = self.factory.make_user()
+        url = self.url % machine.uuid
+
+        response = self.client.delete(url,
+            **self.auth_header_for_user(url, user=otheruser))
+
+        self.assertEqual(404, response.status_code)
+
+
+class GetMachineTestCase(AuthenticatedAPITestCase):
+    url = '/cat/api/1.0/machine/%s/'
+
+    def test_no_auth_returns_401(self):
+        machine = self.factory.make_machine()
+        response = self.client.get(self.url % machine.uuid)
+        self.assertEqual(401, response.status_code)
+
+    def test_get_success(self):
+        machine = self.factory.make_machine()
+        url = self.url % machine.uuid
+
+        response = self.client.get(url,
+            **self.auth_header_for_user(url, user=machine.owner))
+
+        data = simplejson.loads(response.content)
+        self.assertEqual(machine.hostname, data['hostname'])
+        self.assertEqual(machine.logo_checksum, data['logo_checksum'])
+
+    def test_get_other_users_machine_fails(self):
+        machine = self.factory.make_machine()
+        otheruser = self.factory.make_user()
+        url = self.url % machine.uuid
+
+        response = self.client.get(url,
+            **self.auth_header_for_user(url, user=otheruser))
+
+        self.assertEqual(404, response.status_code)
+
+
+class ListPackagesTestCase(AuthenticatedAPITestCase):
+    url = '/cat/api/1.0/packages/%s/'
+
+    def test_no_auth_returns_401(self):
+        machine = self.factory.make_machine()
+        response = self.client.get(self.url % machine.uuid)
+        self.assertEqual(401, response.status_code)
+
+    def test_get_success(self):
+        expected = 'some-random-package-list'
+        machine = self.factory.make_machine(package_list=expected)
+        url = self.url % machine.uuid
+
+        response = self.client.get(url,
+            **self.auth_header_for_user(url, user=machine.owner))
+
+        data = simplejson.loads(response.content)
+        self.assertEqual(expected, data)
+
+    def test_get_other_users_package_list_fails(self):
+        machine = self.factory.make_machine()
+        otheruser = self.factory.make_user()
+        url = self.url % machine.uuid
+
+        response = self.client.get(url,
+            **self.auth_header_for_user(url, user=otheruser))
+
+        self.assertEqual(404, response.status_code)
+
+
+class UpdatePackageListTestCase(AuthenticatedAPITestCase):
+    url = '/cat/api/1.0/packages/%s/'
+
+    def test_no_auth_returns_401(self):
+        machine = self.factory.make_machine()
+        response = self.client.post(self.url % machine.uuid)
+        self.assertEqual(401, response.status_code)
+
+    def test_post_success(self):
+        expected = 'some-random-package-list'
+        machine = self.factory.make_machine(package_list=expected)
+        url = self.url % machine.uuid
+        data = simplejson.dumps({'package_list': expected,
+            'packages_checksum': 'foo'})
+
+        response = self.client.post(url, data=data,
+            content_type='application/json',
+            **self.auth_header_for_user(url, user=machine.owner))
+
+        self.assertContains(response, 'Success')
+        updated = Machine.objects.get(uuid=machine.uuid, owner=machine.owner)
+        self.assertEqual(expected, updated.package_list)
+
+    def test_get_other_users_package_list_fails(self):
+        machine = self.factory.make_machine()
+        otheruser = self.factory.make_user()
+        url = self.url % machine.uuid
+
+        response = self.client.post(url, data='"foo"',
+            content_type='application/json',
+            **self.auth_header_for_user(url, user=otheruser))
+
+        self.assertEqual(404, response.status_code)

=== modified file 'src/webcatalog/tests/test_handlers.py'
--- src/webcatalog/tests/test_handlers.py	2011-06-29 11:40:16 +0000
+++ src/webcatalog/tests/test_handlers.py	2011-07-29 15:59:29 +0000
@@ -21,17 +21,204 @@
 
 __metaclass__ = type
 __all__ = [
+    'ListMachineHandlerTestCase',
+    'MachineHandlerTestCase',
+    'PackagesHandlerTestCase',
     'ServerStatusHandlerTestCase',
     ]
 
 
+from django.http import HttpRequest
 from django.test import TestCase
+from django.contrib.auth.models import User
 
-from reviewsapp.api.handlers import (
+from webcatalog.models import Machine
+from webcatalog.api.handlers import (
+    ListMachinesHandler,
+    MachineHandler,
+    PackagesHandler,
     ServerStatusHandler,
 )
+from webcatalog.tests.factory import TestCaseWithFactory
+
 
 class ServerStatusHandlerTestCase(TestCase):
     def test_read(self):
         ss_handler = ServerStatusHandler()
         self.assertEqual('ok', ss_handler.read(None))
+
+
+class HandlerTestCase(TestCaseWithFactory):
+    def setUp(self):
+        super(HandlerTestCase, self).setUp()
+        self.user = self.factory.make_user()
+        self.request = HttpRequest()
+        self.request.user = self.user
+
+
+class ListMachineHandlerTestCase(HandlerTestCase):
+    def test_no_machines_returns_empty_list(self):
+        handler = ListMachinesHandler()
+        machines = handler.read(self.request)
+        self.assertEqual([], list(machines))
+
+    def test_multiple_machines_returns_as_expected(self):
+        machine1 = self.factory.make_machine(owner=self.user)
+        machine2 = self.factory.make_machine(owner=self.user)
+        handler = ListMachinesHandler()
+
+        machines = handler.read(self.request)
+
+        self.assertEqual(2, len(machines))
+        expected = set([machine1.uuid, machine2.uuid])
+        self.assertEqual(expected, set(x.uuid for x in machines))
+
+    def test_machine_for_user_other_than_the_first(self):
+        """Check that we're not returning only machiens for the first user"""
+        self.factory.make_user()
+        self.factory.make_user()
+        # Not the first user in the system:
+        user = User.objects.all()[1]
+        machine = self.factory.make_machine(owner=user)
+        handler = ListMachinesHandler()
+        request = HttpRequest()
+        request.user = user
+
+        machines = handler.read(request)
+
+        self.assertEqual(1, len(machines))
+        self.assertEqual(machine.uuid, machines[0].uuid)
+
+
+class MachineHandlerTestCase(HandlerTestCase):
+    def test_read_invalid_uuid_returns_404(self):
+        handler = MachineHandler()
+        response = handler.read(self.request, self.factory.get_unique_string())
+        self.assertEqual(404, response.status_code)
+
+    def test_read(self):
+        handler = MachineHandler()
+        machine = self.factory.make_machine(self.user)
+        returned = handler.read(self.request, machine.uuid)
+        self.assertEqual(machine.uuid, returned.uuid)
+
+    def test_create_no_data(self):
+        """Test the case where no data was deserialized"""
+        request = HttpRequest()
+        handler = MachineHandler()
+        response = handler.create(request, uuid='foo')
+        self.assertContains(response, "Unable to deserialize request",
+            status_code=400)
+
+    def test_create_missing_hostname(self):
+        request = HttpRequest()
+        request.data = {'logo_checksum': 'bar'}
+        handler = MachineHandler()
+        response = handler.create(request, 'uuid')
+        expected = {'status': 'error', 'errors':
+            {'hostname': [u'This field is required.']}}
+        self.assertEqual(expected, response)
+
+    def test_create_blank_logo_checksum(self):
+        request = HttpRequest()
+        data = {'hostname': 'foo', 'logo_checksum': ''}
+        request.data = data
+        request.user = self.user
+        handler = MachineHandler()
+        requested_uuid = 'uuid'
+
+        machine = handler.create(request, requested_uuid)
+
+        self.assertEqual(requested_uuid, machine.uuid)
+        self.assertEqual('', machine.logo_checksum)
+
+    def test_create_updates_existing(self):
+        machine = self.factory.make_machine(owner=self.user)
+        handler = MachineHandler()
+        request = HttpRequest()
+        request.user = self.user
+        changed_hostname = machine.hostname + '-changed'
+        request.data = {'hostname': changed_hostname}
+
+        handler.create(request, machine.uuid)
+
+        updated = Machine.objects.get(uuid=machine.uuid)
+        self.assertEqual(changed_hostname, updated.hostname)
+        self.assertEqual('', updated.logo_checksum)
+
+    def test_delete_invalid_uuid_returns_404(self):
+        handler = MachineHandler()
+        response = handler.delete(self.request,
+            self.factory.get_unique_string())
+        self.assertEqual(404, response.status_code)
+
+    def test_delete(self):
+        machine = self.factory.make_machine(owner=self.user)
+        handler = MachineHandler()
+
+        response = handler.delete(self.request, machine.uuid)
+
+        self.assertEqual(204, response.status_code)
+        self.assertEqual('', response.content)
+        self.assertRaises(Machine.DoesNotExist, Machine.objects.get,
+            uuid=machine.uuid)
+
+
+class PackagesHandlerTestCase(HandlerTestCase):
+    def test_read_invalid_uuid_returns_404(self):
+        handler = PackagesHandler()
+        response = handler.read(self.request, self.factory.get_unique_string())
+        self.assertEqual(404, response.status_code)
+
+    def test_read(self):
+        expected = 'some-package-list'
+        machine = self.factory.make_machine(owner=self.user,
+            package_list=expected)
+        handler = PackagesHandler()
+
+        response = handler.read(self.request, machine.uuid)
+        self.assertEqual(response, expected)
+
+    def test_create_invalid_uuid_returns_404(self):
+        handler = PackagesHandler()
+        response = handler.create(self.request,
+            self.factory.get_unique_string())
+        self.assertEqual(404, response.status_code)
+
+    def test_create_missing_data(self):
+        machine = self.factory.make_machine(owner=self.user)
+        request = HttpRequest()
+        request.user = self.user
+        data = {'packages_checksum': 'bar', 'package_list': 'some-data'}
+        handler = PackagesHandler()
+        for key in data:
+            request.data = dict((k, data[k]) for k in data if k != key)
+            response = handler.create(request, machine.uuid)
+            self.assertEqual('error', response['status'])
+            self.assertEqual([key], response['errors'].keys())
+
+    def test_create_success(self):
+        machine = self.factory.make_machine(owner=self.user)
+        request = HttpRequest()
+        request.user = self.user
+        data = {'packages_checksum': 'bar', 'package_list': 'some-data'}
+        request.data = data
+        handler = PackagesHandler()
+
+        response = handler.create(request, machine.uuid)
+
+        updated = Machine.objects.get(uuid=machine.uuid)
+        self.assertEqual('Success', response)
+        self.assertEqual(machine.uuid, updated.uuid)
+        self.assertEqual(data['packages_checksum'], updated.packages_checksum)
+        self.assertEqual(data['package_list'], updated.package_list)
+
+    def test_create_no_data(self):
+        """Test the case where no data was deserialized"""
+        machine = self.factory.make_machine(owner=self.user)
+        request = HttpRequest()
+        request.user = self.user
+        handler = PackagesHandler()
+        response = handler.create(request, uuid=machine.uuid)
+        self.assertContains(response, "Unable to deserialize request",
+            status_code=400)