rework cacheview models to separate validation status from accepted objects

optimize import of rcynic xml summary

svn path=/branches/tk161/; revision=4330

5 files changed, 188 insertions, 264 deletions

diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index da75aa8f..3c738675 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2011  SPARTA, Inc. dba Cobham Analytic Solutions
+# Copyright (C) 2012  SPARTA, Inc. a Parsons Company
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -23,6 +24,7 @@ import logging
 
 from django.db import transaction
 import django.db.models
+from django.core.exceptions import ObjectDoesNotExist
 
 import rpki
 import rpki.gui.app.timestamp
@@ -33,18 +35,135 @@ from rpki.sundial import datetime
 logger = logging.getLogger(__name__)
 
 
-class rcynic_object(object):
-    def __call__(self, vs):
-        """Do initial processing on a rcynic_object instance."""
-        logger.debug('processing %s at %s' % (vs.file_class.__name__, vs.uri))
+def rcynic_cert(cert, obj):
+    obj.sia = cert.sia_directory_uri
+    logger.debug('issuer=%s' % obj.issuer)
 
-        # rcynic will generation <validation_status/> elements for objects
-        # listed in the manifest but not found on disk
-        if os.path.exists(vs.filename):
-            q = self.model_class.objects.filter(uri=vs.uri)
+    # object must be saved for the related manager methods below to work
+    obj.save()
+    # resources can change when a cert is updated
+    obj.asns.clear()
+    obj.addresses.clear()
+
+    for asr in cert.resources.asn:
+        logger.debug('processing %s' % asr)
+
+        attrs = {'min': asr.min, 'max': asr.max}
+        q = models.ASRange.objects.filter(**attrs)
+        if not q:
+            obj.asns.create(**attrs)
+        else:
+            obj.asns.add(q[0])
+
+    for cls, addr_obj, addrset in (models.AddressRange, obj.addresses, cert.resources.v4), (models.AddressRangeV6, obj.addresses_v6, cert.resources.v6):
+        for rng in addrset:
+            logger.debug('processing %s' % rng)
+
+            attrs = {'prefix_min': rng.min, 'prefix_max': rng.max}
+            q = cls.objects.filter(**attrs)
+            if not q:
+                addr_obj.create(**attrs)
+            else:
+                addr_obj.add(q[0])
+
+
+def rcynic_roa(roa, obj):
+    obj.asid = roa.asID
+    # object must be saved for the related manager methods below to work
+    obj.save()
+    obj.prefixes.clear()
+    obj.prefixes_v6.clear()
+    for pfxset in roa.prefix_sets:
+        if pfxset.__class__.__name__ == 'roa_prefix_set_ipv6':
+            roa_cls = models.ROAPrefixV6
+            prefix_obj = obj.prefixes_v6
+        else:
+            roa_cls = models.ROAPrefixV4
+            prefix_obj = obj.prefixes
+
+        for pfx in pfxset:
+            attrs = {'prefix_min': pfx.min(),
+                        'prefix_max': pfx.max(),
+                        'max_length': pfx.max_prefixlen}
+            q = roa_cls.objects.filter(**attrs)
+            if not q:
+                prefix_obj.create(**attrs)
+            else:
+                prefix_obj.add(q[0])
+
+
+def rcynic_gbr(gbr, obj):
+    vcard = vobject.readOne(gbr.vcard)
+    logger.debug(vcard.prettyPrint())
+    obj.full_name = vcard.fn.value if hasattr(vcard, 'fn') else None
+    obj.email_address = vcard.email.value if hasattr(vcard, 'email') else None
+    obj.telephone = vcard.tel.value if hasattr(vcard, 'tel') else None
+    obj.organization = vcard.org.value[0] if hasattr(vcard, 'org') else None
+
+LABEL_CACHE = {}
+
+
+def save_statuses(inst, statuses):
+    for vs in statuses:
+        timestamp = datetime.fromXMLtime(vs.timestamp).to_sql()
+
+        # cache validation labels
+        if vs.status in LABEL_CACHE:
+            status = LABEL_CACHE[vs.status]
+        else:
+            status = models.ValidationLabel.objects.get(label=vs.status)
+            LABEL_CACHE[vs.status] = status
+
+        g = models.generations_dict[vs.generation] if vs.generation else None
+
+        inst.statuses.create(generation=g, timestamp=timestamp, status=status)
+
+@transaction.commit_on_success
+def process_cache(root, xml_file):
+    dispatch = {
+      'rcynic_certificate': rcynic_cert,
+      'rcynic_roa': rcynic_roa,
+      'rcynic_ghostbuster': rcynic_gbr
+    }
+    model_class = {
+      'rcynic_certificate': models.Cert,
+      'rcynic_roa': models.ROA,
+      'rcynic_ghostbuster': models.Ghostbuster
+    }
+
+    last_uri = None
+    statuses = []
+
+    logger.info('clearing validation statuses')
+    models.ValidationStatus.objects.all().delete()
+
+    logger.info('updating validation status')
+    for vs in rcynic_xml_iterator(root, xml_file):
+        if vs.uri != last_uri:
+            if statuses:
+                obj, created = models.RepositoryObject.objects.get_or_create(uri=last_uri)
+                save_statuses(obj, statuses)
+
+            statuses = []
+            last_uri = vs.uri
+
+        statuses.append(vs)
+
+        if vs.status == 'object_accepted':
+            logger.debug('processing %s at %s' % (vs.filename, vs.uri))
+
+            # rcynic will generation <validation_status/> elements for objects
+            # listed in the manifest but not found on disk
+            if not os.path.exists(vs.filename):
+                logger.warning('file is missing: %s' % vs.filename)
+                continue
+
+            cls = model_class[vs.file_class.__name__]
+            q = cls.objects.filter(repo__uri=vs.uri)
             if not q:
                 logger.debug('creating new db instance')
-                inst = self.model_class(uri=vs.uri)
+                repo, created = models.RepositoryObject.objects.get_or_create(uri=vs.uri)
+                inst = cls(repo=repo)
             else:
                 inst = q[0]
 
@@ -56,7 +175,7 @@ class rcynic_object(object):
                     obj = vs.obj  # causes object to be lazily loaded
                 except rpki.POW._der.DerError, e:
                     logger.warning('Caught %s while processing %s: %s' % (type(e), vs.filename, e))
-                    return True
+                    continue
 
                 inst.not_before = obj.notBefore.to_sql()
                 inst.not_after = obj.notAfter.to_sql()
@@ -67,148 +186,41 @@ class rcynic_object(object):
                 # look up signing cert
                 if obj.issuer == obj.subject:
                     # self-signed cert (TA)
-                    inst.cert = inst
+                    logger.debug('processing TA at %s' % vs.uri)
+                    assert(isinstance(inst, models.Cert))
+                    inst.issuer = inst
                 else:
-                    q = models.Cert.objects.filter(keyid=obj.aki, name=obj.issuer)
-                    if q:
-                        inst.issuer = q[0]
-                    else:
+                    try:
+                        inst.issuer = models.Cert.objects.get(keyid=obj.aki, name=obj.issuer)
+                    except ObjectDoesNotExist:
                         logger.warning('unable to find signing cert with ski=%s (%s)' % (obj.aki, obj.issuer))
-                        return None
-
-                self.callback(obj, inst)
-            else:
-                logger.debug('object is unchanged')
-
-            # save required to create new ValidationStatus object refering to
-            # it
-            inst.save()
-            inst.statuses.create(generation=models.generations_dict[vs.generation] if vs.generation else None,
-                    timestamp=datetime.fromXMLtime(vs.timestamp).to_sql(),
-                    status=models.ValidationLabel.objects.get(label=vs.status))
+                        continue
 
-            return inst
-        else:
-            logger.warning('file is missing: %s' % vs.filename)
-
-        return True
-
-
-class rcynic_cert(rcynic_object):
-    model_class = models.Cert
-
-    def callback(self, cert, obj):
-        """
-        Process a RPKI resource certificate.
-        """
+                # do object-specific tasks
+                dispatch[vs.file_class.__name__](obj, inst)
 
-        obj.sia = cert.sia_directory_uri
-        obj.save()
-
-        # resources can change when a cert is updated
-        obj.asns.clear()
-        obj.addresses.clear()
-
-        for asr in cert.resources.asn:
-            logger.debug('processing %s' % asr)
-
-            attrs = {'min': asr.min, 'max': asr.max}
-            q = models.ASRange.objects.filter(**attrs)
-            if not q:
-                obj.asns.create(**attrs)
+                inst.save()  # don't require a save in the dispatch methods
             else:
-                obj.asns.add(q[0])
-
-        for cls, addr_obj, addrset in (models.AddressRange, obj.addresses, cert.resources.v4), (models.AddressRangeV6, obj.addresses_v6, cert.resources.v6):
-            for rng in addrset:
-                logger.debug('processing %s' % rng)
-
-                attrs = {'prefix_min': rng.min, 'prefix_max': rng.max}
-                q = cls.objects.filter(**attrs)
-                if not q:
-                    addr_obj.create(**attrs)
-                else:
-                    addr_obj.add(q[0])
-
-        logger.debug('finished processing rescert at %s' % cert.uri)
-
-
-class rcynic_roa(rcynic_object):
-    model_class = models.ROA
-
-    def callback(self, roa, obj):
-        obj.asid = roa.asID
-        obj.save()
-        obj.prefixes.clear()
-        obj.prefixes_v6.clear()
-        for pfxset in roa.prefix_sets:
-            if pfxset.__class__.__name__ == 'roa_prefix_set_ipv6':
-                roa_cls = models.ROAPrefixV6
-                prefix_obj = obj.prefixes_v6
-            else:
-                roa_cls = models.ROAPrefixV4
-                prefix_obj = obj.prefixes
-
-            for pfx in pfxset:
-                attrs = {'prefix_min': pfx.min(),
-                         'prefix_max': pfx.max(),
-                         'max_length': pfx.max_prefixlen}
-                q = roa_cls.objects.filter(**attrs)
-                if not q:
-                    prefix_obj.create(**attrs)
-                else:
-                    prefix_obj.add(q[0])
-
-
-class rcynic_gbr(rcynic_object):
-    model_class = models.Ghostbuster
-
-    def callback(self, gbr, obj):
-        vcard = vobject.readOne(gbr.vcard)
-        logger.debug(vcard.prettyPrint())
-        obj.full_name = vcard.fn.value if hasattr(vcard, 'fn') else None
-        obj.email_address = vcard.email.value if hasattr(vcard, 'email') else None
-        obj.telephone = vcard.tel.value if hasattr(vcard, 'tel') else None
-        obj.organization = vcard.org.value[0] if hasattr(vcard, 'org') else None
-
-
-def process_cache(root, xml_file):
-    start = time.time()
+                logger.debug('object is unchanged')
 
-    dispatch = {
-      'rcynic_certificate': rcynic_cert(),
-      'rcynic_roa': rcynic_roa(),
-      'rcynic_ghostbuster': rcynic_gbr()
-    }
+            # insert the saved validation statuses now that the object has been
+            # created.
+            save_statuses(inst.repo, statuses)
+            statuses = []
 
-    # remove all existing ValidationStatus_* entries
-    logger.info('removing existing validation status')
-    models.ValidationStatus_Cert.objects.all().delete()
-    models.ValidationStatus_ROA.objects.all().delete()
-    models.ValidationStatus_Ghostbuster.objects.all().delete()
-
-    logger.info('updating validation status')
-    elts = rcynic_xml_iterator(root, xml_file)
-    for vs in elts:
-        with transaction.commit_on_success():
-            dispatch[vs.file_class.__name__](vs)
+    # process any left over statuses for an object that was not ultimately
+    # accepted
+    if statuses:
+        obj, created = models.RepositoryObject.objects.get_or_create(uri=last_uri)
+        save_statuses(obj, statuses)
 
     # garbage collection
     # remove all objects which have no ValidationStatus references, which
     # means they did not appear in the last XML output
     logger.info('performing garbage collection')
 
-    # trying to .delete() the querysets directly results in a "too many sql
-    # variables" exception
-    for qs in (models.Cert.objects.annotate(num_statuses=django.db.models.Count('statuses')).filter(num_statuses=0),
-            models.Ghostbuster.objects.annotate(num_statuses=django.db.models.Count('statuses')).filter(num_statuses=0),
-            models.ROA.objects.annotate(num_statuses=django.db.models.Count('statuses')).filter(num_statuses=0)):
-        for e in qs:
-            e.delete()
-
-    stop = time.time()
-    logger.info('elapsed time %d seconds.' % (stop - start))
-
+    # Delete all objects that have zero validation status elements.
+    models.RepositoryObject.objects.annotate(num_statuses=django.db.models.Count('statuses')).filter(num_statuses=0).delete()
 
 @transaction.commit_on_success
 def process_labels(xml_file):
@@ -247,9 +259,13 @@ if __name__ == '__main__':
     logging.basicConfig()
     logger.info('log level set to %s' % logging.getLevelName(v))
 
+    start = time.time()
     process_labels(options.logfile)
     process_cache(options.root, options.logfile)
 
     rpki.gui.app.timestamp.update('rcynic_import')
 
+    stop = time.time()
+    logger.info('elapsed time %d seconds.' % (stop - start))
+
     logging.shutdown()
diff --git a/rpkid/rpki/gui/app/templates/app/route_roa_list.html b/rpkid/rpki/gui/app/templates/app/route_roa_list.html
index ad8b11f6..1907315d 100644
--- a/rpkid/rpki/gui/app/templates/app/route_roa_list.html
+++ b/rpkid/rpki/gui/app/templates/app/route_roa_list.html
@@ -1,5 +1,7 @@
 {% extends "app/object_table.html" %}
 
+{# template for displaying the list of ROAs covering a specific route #}
+
 {% block table_header %}
 <th>Prefix</th>
 <th>Max Length</th>
@@ -13,5 +15,5 @@
 <td>{{ object.max_length }}</td>
 <td>{{ object.roas.all.0.asid }}</td>
 <td>{{ object.roas.all.0.not_after }}</td>
-<td>{{ object.roas.all.0.uri }}</td>
+<td>{{ object.roas.all.0.repo.uri }}</td>
 {% endblock object_detail %}
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 9d691156..6c4d1719 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -42,8 +42,7 @@ from rpki.resource_set import (resource_range_as, resource_range_ipv4,
 from rpki.exceptions import BadIPResource
 from rpki import sundial
 
-from rpki.gui.cacheview.models import (ROAPrefixV4, ROAPrefixV6,
-                                       ValidationLabel, ROA)
+from rpki.gui.cacheview.models import ROAPrefixV4, ROAPrefixV6, ROA
 
 
 def superuser_required(f):
@@ -716,12 +715,7 @@ def child_delete(request, pk):
 
 
 def roa_match(rng):
-    """
-    Return a list of tuples of matching routes and roas.
-
-    """
-    object_accepted = ValidationLabel.objects.get(label='object_accepted')
-
+    """Return a list of tuples of matching routes and roas."""
     if isinstance(rng, resource_range_ipv6):
         route_manager = models.RouteOriginV6.objects
         pfx = 'prefixes_v6'
@@ -735,8 +729,7 @@ def roa_match(rng):
         # prefixes have different names.
         args = {'%s__prefix_min__lte' % pfx: obj.prefix_min,
                 '%s__prefix_max__gte' % pfx: obj.prefix_max}
-        roas = ROA.objects.filter(statuses__status=object_accepted,
-                                  **args)
+        roas = ROA.objects.filter(**args)
         rv.append((obj, roas))
 
     return rv
@@ -805,11 +798,9 @@ def route_detail(request, pk):
 def route_roa_list(request, pk):
     """Show a list of ROAs that match a given route."""
     object = get_object_or_404(models.RouteOrigin, pk=pk)
-    object_accepted = ValidationLabel.objects.get(label='object_accepted')
     # select accepted ROAs which cover this route
     qs = ROAPrefixV4.objects.filter(prefix_min__lte=object.prefix_min,
-                                    prefix_max__gte=object.prefix_max,
-                                    roas__statuses__status=object_accepted).select_related()
+                                    prefix_max__gte=object.prefix_max).select_related()
     return object_list(request, qs, template_name='app/route_roa_list.html')
 
 
diff --git a/rpkid/rpki/gui/cacheview/admin.py b/rpkid/rpki/gui/cacheview/admin.py
deleted file mode 100644
index 74b62961..00000000
--- a/rpkid/rpki/gui/cacheview/admin.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-$Id$
-
-Copyright (C) 2011  SPARTA, Inc. dba Cobham Analytic Solutions
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-"""
-
-from django.contrib import admin
-from rpki.gui.cacheview import models
-
-class ASRangeAdmin(admin.ModelAdmin):
-    pass
-
-class AddressRangeAdmin(admin.ModelAdmin):
-    pass
-
-class AddressRangeV6Admin(admin.ModelAdmin):
-    pass
-
-class CertAdmin(admin.ModelAdmin):
-    pass
-
-class ROAPrefixV4Admin(admin.ModelAdmin):
-    pass
-
-class ROAPrefixV6Admin(admin.ModelAdmin):
-    pass
-
-class ROAAdmin(admin.ModelAdmin):
-    pass
-
-class GhostbusterAdmin(admin.ModelAdmin):
-    pass
-
-class ValidationLabelAdmin(admin.ModelAdmin): pass
-
-class ValidationStatus_CertAdmin(admin.ModelAdmin): pass
-
-class ValidationStatus_ROAAdmin(admin.ModelAdmin): pass
-
-class ValidationStatus_GhostbusterAdmin(admin.ModelAdmin): pass
-
-admin.site.register(models.AddressRange, AddressRangeAdmin)
-admin.site.register(models.AddressRangeV6, AddressRangeV6Admin)
-admin.site.register(models.ASRange, AddressRangeAdmin)
-admin.site.register(models.Cert, CertAdmin)
-admin.site.register(models.Ghostbuster, GhostbusterAdmin)
-admin.site.register(models.ROA, ROAAdmin)
-admin.site.register(models.ROAPrefixV4, ROAPrefixV4Admin)
-admin.site.register(models.ROAPrefixV6, ROAPrefixV6Admin)
-admin.site.register(models.ValidationLabel, ValidationLabelAdmin)
-admin.site.register(models.ValidationStatus_Cert, ValidationStatus_CertAdmin)
-admin.site.register(models.ValidationStatus_ROA, ValidationStatus_ROAAdmin)
-admin.site.register(models.ValidationStatus_Ghostbuster, ValidationStatus_GhostbusterAdmin)
-
-# vim:sw=4 ts=8
diff --git a/rpkid/rpki/gui/cacheview/models.py b/rpkid/rpki/gui/cacheview/models.py
index c4429709..4be45b5c 100644
--- a/rpkid/rpki/gui/cacheview/models.py
+++ b/rpkid/rpki/gui/cacheview/models.py
@@ -50,7 +50,7 @@ class ASRange(rpki.gui.models.ASN):
         return ('rpki.gui.cacheview.views.asrange_detail', [str(self.pk)])
 
 kinds = list(enumerate(('good', 'warn', 'bad')))
-kinds_dict = dict((v, k) for k,v in kinds)
+kinds_dict = dict((v, k) for k, v in kinds)
 
 
 class ValidationLabel(models.Model):
@@ -58,24 +58,29 @@ class ValidationLabel(models.Model):
     Represents a specific error condition defined in the rcynic XML
     output file.
     """
-    label = models.CharField(max_length=79, db_index=True, unique=True, null=False)
-    status = models.CharField(max_length=255, null=False)
-    kind = models.PositiveSmallIntegerField(choices=kinds, null=False)
+    label = models.CharField(max_length=79, db_index=True, unique=True)
+    status = models.CharField(max_length=255)
+    kind = models.PositiveSmallIntegerField(choices=kinds)
 
     def __unicode__(self):
         return self.label
 
+
+class RepositoryObject(models.Model):
+    """
+    Represents a globally unique RPKI repository object, specified by its URI.
+    """
+    uri = models.URLField(unique=True, db_index=True)
+
 generations = list(enumerate(('current', 'backup')))
 generations_dict = dict((val, key) for (key, val) in generations)
 
 
 class ValidationStatus(models.Model):
-    timestamp = models.DateTimeField(null=False)
+    timestamp = models.DateTimeField()
     generation = models.PositiveSmallIntegerField(choices=generations, null=True)
-    status = models.ForeignKey('ValidationLabel', null=False)
-
-    class Meta:
-        abstract = True
+    status = models.ForeignKey(ValidationLabel)
+    repo = models.ForeignKey(RepositoryObject, related_name='statuses')
 
 
 class SignedObject(models.Model):
@@ -84,24 +89,20 @@ class SignedObject(models.Model):
     The signing certificate is ommitted here in order to give a proper
     value for the 'related_name' attribute.
     """
-    # attributes from rcynic's output XML file
-    uri = models.URLField(unique=True, db_index=True, null=False)
+    repo = models.ForeignKey(RepositoryObject, related_name='cert', unique=True)
 
     # on-disk file modification time
-    mtime = models.PositiveIntegerField(default=0, null=False)
+    mtime = models.PositiveIntegerField(default=0)
 
     # SubjectName
-    name = models.CharField(max_length=255, null=False)
+    name = models.CharField(max_length=255)
 
     # value from the SKI extension
-    keyid = models.CharField(max_length=60, db_index=True, null=False)
+    keyid = models.CharField(max_length=60, db_index=True)
 
     # validity period from EE cert which signed object
-    not_before = models.DateTimeField(null=False)
-    not_after = models.DateTimeField(null=False)
-
-    class Meta:
-        abstract = True
+    not_before = models.DateTimeField()
+    not_after = models.DateTimeField()
 
     def mtime_as_datetime(self):
         """
@@ -109,13 +110,6 @@ class SignedObject(models.Model):
         """
         return datetime.utcfromtimestamp(self.mtime + time.timezone)
 
-    def is_valid(self):
-        """
-        Returns a boolean value indicating whether this object has passed
-        validation checks.
-        """
-        return bool(self.statuses.filter(status=ValidationLabel.objects.get(label="object_accepted")))
-
     def status_id(self):
         """
         Returns a HTML class selector for the current object based on its validation status.
@@ -138,22 +132,18 @@ class Cert(SignedObject):
     addresses = models.ManyToManyField(AddressRange, related_name='certs')
     addresses_v6 = models.ManyToManyField(AddressRangeV6, related_name='certs')
     asns = models.ManyToManyField(ASRange, related_name='certs')
-    issuer = models.ForeignKey('Cert', related_name='children', null=True, blank=True)
-    sia = models.CharField(max_length=255, null=False)
+    issuer = models.ForeignKey('self', related_name='children', null=True)
+    sia = models.CharField(max_length=255)
 
     @models.permalink
     def get_absolute_url(self):
         return ('rpki.gui.cacheview.views.cert_detail', [str(self.pk)])
 
 
-class ValidationStatus_Cert(ValidationStatus):
-    cert = models.ForeignKey('Cert', related_name='statuses', null=False)
-
-
 class ROAPrefix(models.Model):
     "Abstract base class for ROA mixin."
 
-    max_length = models.PositiveSmallIntegerField(null=False)
+    max_length = models.PositiveSmallIntegerField()
 
     class Meta:
         abstract = True
@@ -191,10 +181,10 @@ class ROAPrefixV6(ROAPrefix, rpki.gui.models.PrefixV6):
 
 
 class ROA(SignedObject):
-    asid = models.PositiveIntegerField(null=False)
+    asid = models.PositiveIntegerField()
     prefixes = models.ManyToManyField(ROAPrefixV4, related_name='roas')
     prefixes_v6 = models.ManyToManyField(ROAPrefixV6, related_name='roas')
-    issuer = models.ForeignKey('Cert', related_name='roas', null=False)
+    issuer = models.ForeignKey('Cert', related_name='roas')
 
     @models.permalink
     def get_absolute_url(self):
@@ -207,16 +197,12 @@ class ROA(SignedObject):
         return u'ROA for AS%d' % self.asid
 
 
-class ValidationStatus_ROA(ValidationStatus):
-    roa = models.ForeignKey('ROA', related_name='statuses', null=False)
-
-
 class Ghostbuster(SignedObject):
     full_name = models.CharField(max_length=40)
     email_address = models.EmailField(blank=True, null=True)
     organization = models.CharField(blank=True, null=True, max_length=255)
     telephone = TelephoneField(blank=True, null=True)
-    issuer = models.ForeignKey('Cert', related_name='ghostbusters', null=False)
+    issuer = models.ForeignKey('Cert', related_name='ghostbusters')
 
     @models.permalink
     def get_absolute_url(self):
@@ -230,7 +216,3 @@ class Ghostbuster(SignedObject):
         if self.email_address:
             return self.email_address
         return self.telephone
-
-
-class ValidationStatus_Ghostbuster(ValidationStatus):
-    gbr = models.ForeignKey('Ghostbuster', related_name='statuses', null=False)