merge with ^/tk316

add db migrations

svn path=/branches/tk316_317_integration/; revision=4828

8 files changed, 508 insertions, 21 deletions

diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py
index 6d168b26..bf68170e 100644
--- a/rpkid/rpki/gui/app/glue.py
+++ b/rpkid/rpki/gui/app/glue.py
@@ -78,19 +78,23 @@ def list_received_resources(log, conf):
     z = Zookeeper(handle=conf.handle)
     pdus = z.call_rpkid(list_received_resources_elt.make_pdu(self_handle=conf.handle))
 
-    models.ResourceCert.objects.filter(parent__issuer=conf).delete()
+    models.ResourceCert.objects.filter(conf=conf).delete()
 
     for pdu in pdus:
         if isinstance(pdu, list_received_resources_elt):
-            parent = models.Parent.objects.get(issuer=conf,
-                                               handle=pdu.parent_handle)
+            if pdu.parent_handle != conf.handle:
+                parent = models.Parent.objects.get(issuer=conf,
+                                                   handle=pdu.parent_handle)
+            else:
+                # root cert, self-signed
+                parent = None
 
             not_before = datetime.strptime(pdu.notBefore, "%Y-%m-%dT%H:%M:%SZ")
             not_after = datetime.strptime(pdu.notAfter, "%Y-%m-%dT%H:%M:%SZ")
 
-            cert = models.ResourceCert.objects.create(parent=parent,
-                    not_before=not_before, not_after=not_after,
-                    uri=pdu.uri)
+            cert = models.ResourceCert.objects.create(
+                conf=conf, parent=parent, not_before=not_before,
+                not_after=not_after, uri=pdu.uri)
 
             for asn in resource_set_as(pdu.asn):
                 cert.asn_ranges.create(min=asn.min, max=asn.max)
diff --git a/rpkid/rpki/gui/app/migrations/0002_auto__add_field_resourcecert_conf.py b/rpkid/rpki/gui/app/migrations/0002_auto__add_field_resourcecert_conf.py
new file mode 100644
index 00000000..d3326f90
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0002_auto__add_field_resourcecert_conf.py
@@ -0,0 +1,117 @@
+# -*- coding: 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 field 'ResourceCert.conf'
+        db.add_column('app_resourcecert', 'conf',
+                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='certs', null=True, to=orm['irdb.ResourceHolderCA']),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'ResourceCert.conf'
+        db.delete_column('app_resourcecert', 'conf_id')
+
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'null': 'True', 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py b/rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py
new file mode 100644
index 00000000..a90a11cc
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Write your forwards methods here."
+        # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..."
+        for cert in orm.ResourceCert.objects.all():
+            cert.conf = cert.parent.issuer
+            cert.save()
+
+    def backwards(self, orm):
+        "Write your backwards methods here."
+        pass
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'null': 'True', 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
+    symmetrical = True
diff --git a/rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py b/rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py
new file mode 100644
index 00000000..b5ce9c26
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py
@@ -0,0 +1,115 @@
+# -*- coding: 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):
+
+        # Changing field 'ResourceCert.conf'
+        db.alter_column('app_resourcecert', 'conf_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['irdb.ResourceHolderCA']))
+
+    def backwards(self, orm):
+
+        # Changing field 'ResourceCert.conf'
+        db.alter_column('app_resourcecert', 'conf_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['irdb.ResourceHolderCA']))
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/migrations/0005_auto__chg_field_resourcecert_parent.py b/rpkid/rpki/gui/app/migrations/0005_auto__chg_field_resourcecert_parent.py
new file mode 100644
index 00000000..11e9c814
--- /dev/null
+++ b/rpkid/rpki/gui/app/migrations/0005_auto__chg_field_resourcecert_parent.py
@@ -0,0 +1,115 @@
+# -*- coding: 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):
+
+        # Changing field 'ResourceCert.parent'
+        db.alter_column('app_resourcecert', 'parent_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['irdb.Parent']))
+
+    def backwards(self, orm):
+
+        # Changing field 'ResourceCert.parent'
+        db.alter_column('app_resourcecert', 'parent_id', self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['irdb.Parent']))
+
+    models = {
+        'app.ghostbusterrequest': {
+            'Meta': {'ordering': "('family_name', 'given_name')", 'object_name': 'GhostbusterRequest', '_ormbases': ['irdb.GhostbusterRequest']},
+            'additional_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'box': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'extended': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'family_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'ghostbusterrequest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.GhostbusterRequest']", 'unique': 'True', 'primary_key': 'True'}),
+            'given_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'honorific_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'honorific_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'organization': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'street': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'telephone': ('rpki.gui.app.models.TelephoneField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'app.resourcecert': {
+            'Meta': {'object_name': 'ResourceCert'},
+            'conf': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'not_after': ('django.db.models.fields.DateTimeField', [], {}),
+            'not_before': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'certs'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'app.resourcerangeaddressv4': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV4'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv4AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeaddressv6': {
+            'Meta': {'ordering': "('prefix_min',)", 'object_name': 'ResourceRangeAddressV6'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'address_ranges_v6'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prefix_max': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'}),
+            'prefix_min': ('rpki.gui.models.IPv6AddressField', [], {'db_index': 'True'})
+        },
+        'app.resourcerangeas': {
+            'Meta': {'ordering': "('min', 'max')", 'object_name': 'ResourceRangeAS'},
+            'cert': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'asn_ranges'", 'to': "orm['app.ResourceCert']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'min': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'app.timestamp': {
+            'Meta': {'object_name': 'Timestamp'},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}),
+            'ts': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'irdb.ghostbusterrequest': {
+            'Meta': {'object_name': 'GhostbusterRequest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ghostbuster_requests'", 'null': 'True', 'to': "orm['irdb.Parent']"}),
+            'vcard': ('django.db.models.fields.TextField', [], {})
+        },
+        'irdb.parent': {
+            'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}),
+            'parent_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}),
+            'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'repository_type': ('rpki.irdb.models.EnumField', [], {}),
+            'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'irdb.resourceholderca': {
+            'Meta': {'object_name': 'ResourceHolderCA'},
+            'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}),
+            'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'latest_crl': ('rpki.irdb.models.CRLField', [], {'default': 'None', 'blank': 'True'}),
+            'next_crl_number': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'next_crl_update': ('rpki.irdb.models.SundialField', [], {}),
+            'next_serial': ('django.db.models.fields.BigIntegerField', [], {'default': '1'}),
+            'private_key': ('rpki.irdb.models.RSAKeyField', [], {'default': 'None', 'blank': 'True'})
+        },
+        'irdb.turtle': {
+            'Meta': {'object_name': 'Turtle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service_uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['app']
\ No newline at end of file
diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py
index 8b93fbfa..2c5a81d4 100644
--- a/rpkid/rpki/gui/app/models.py
+++ b/rpkid/rpki/gui/app/models.py
@@ -120,8 +120,13 @@ class ResourceCert(models.Model):
     This model is used to cache the output of <list_received_resources/>.
 
     """
-    # pointer to the parent object in the irdb
-    parent = models.ForeignKey(Parent, related_name='certs')
+
+    # Handle to which this cert was issued
+    conf = models.ForeignKey(Conf, related_name='certs')
+
+    # The parent that issued the cert.  This field is marked null=True because
+    # the root has no parent
+    parent = models.ForeignKey(Parent, related_name='certs', null=True)
 
     # certificate validity period
     not_before = models.DateTimeField()
@@ -132,8 +137,11 @@ class ResourceCert(models.Model):
     uri = models.CharField(max_length=255)
 
     def __unicode__(self):
-        return u"%s's cert from %s" % (self.parent.issuer.handle,
-                                       self.parent.handle)
+        if self.parent:
+            return u"%s's cert from %s" % (self.conf.handle,
+                                           self.parent.handle)
+        else:
+            return u"%s's root cert" % self.conf.handle
 
 
 class ResourceRangeAddressV4(rpki.gui.models.PrefixV4):
diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html
index f74dad09..d346ce88 100644
--- a/rpkid/rpki/gui/app/templates/app/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/app/dashboard.html
@@ -29,7 +29,11 @@
       <tr>
 	<td>{{ object }}</td>
 	<td>{{ object.cert.not_after }}</td>
-	<td>{{ object.cert.parent.handle }}</td>
+	<td>
+	  {% if object.cert.parent %}
+	  {{ object.cert.parent.handle }}
+	  {% endif %}
+	</td>
       </tr>
       {% endfor %}
 
@@ -37,7 +41,11 @@
       <tr>
 	<td>{{ object.as_resource_range }}</td>
 	<td>{{ object.cert.not_after }}</td>
-	<td>{{ object.cert.parent.handle }}</td>
+	<td>
+	  {% if object.cert.parent %}
+	  {{ object.cert.parent.handle }}
+	  {% endif %}
+	</td>
       </tr>
       {% endfor %}
 
@@ -46,7 +54,11 @@
       <tr>
 	<td>{{ object.as_resource_range }}</td>
 	<td>{{ object.cert.not_after }}</td>
-	<td>{{ object.cert.parent.handle }}</td>
+	<td>
+	  {% if object.cert.parent %}
+	  {{ object.cert.parent.handle }}
+	  {% endif %}
+	</td>
       </tr>
       {% endfor %}
       {% endif %}
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 6ba6f1c4..835bf4a5 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -180,7 +180,7 @@ def dashboard(request):
     used_asns.extend((resource_range_as(obj.start_as, obj.end_as) for obj in child_asns))
 
     # my received asns
-    asns = models.ResourceRangeAS.objects.filter(cert__parent__issuer=conf)
+    asns = models.ResourceRangeAS.objects.filter(cert__conf=conf)
     my_asns = range_list.RangeList([resource_range_as(obj.min, obj.max) for obj in asns])
 
     unused_asns = my_asns.difference(used_asns)
@@ -207,8 +207,8 @@ def dashboard(request):
         used_prefixes_v6.append(obj.as_resource_range())
 
     # my received prefixes
-    prefixes = models.ResourceRangeAddressV4.objects.filter(cert__parent__issuer=conf).all()
-    prefixes_v6 = models.ResourceRangeAddressV6.objects.filter(cert__parent__issuer=conf).all()
+    prefixes = models.ResourceRangeAddressV4.objects.filter(cert__conf=conf).all()
+    prefixes_v6 = models.ResourceRangeAddressV6.objects.filter(cert__conf=conf).all()
     my_prefixes = range_list.RangeList([obj.as_resource_range() for obj in prefixes])
     my_prefixes_v6 = range_list.RangeList([obj.as_resource_range() for obj in prefixes_v6])
 
@@ -367,7 +367,7 @@ def add_asn_callback(child, form):
 def child_add_asn(request, pk):
     conf = request.session['handle']
     get_object_or_404(models.Child, issuer=conf, pk=pk)
-    qs = models.ResourceRangeAS.objects.filter(cert__parent__issuer=conf)
+    qs = models.ResourceRangeAS.objects.filter(cert__conf=conf)
     return child_add_resource(request, pk, forms.AddASNForm(qs), [],
                               add_asn_callback)
 
@@ -387,8 +387,8 @@ def add_address_callback(child, form):
 def child_add_address(request, pk):
     conf = request.session['handle']
     get_object_or_404(models.Child, issuer=conf, pk=pk)
-    qsv4 = models.ResourceRangeAddressV4.objects.filter(cert__parent__issuer=conf)
-    qsv6 = models.ResourceRangeAddressV6.objects.filter(cert__parent__issuer=conf)
+    qsv4 = models.ResourceRangeAddressV4.objects.filter(cert__conf=conf)
+    qsv6 = models.ResourceRangeAddressV6.objects.filter(cert__conf=conf)
     return child_add_resource(request, pk,
                               forms.AddNetForm(qsv4, qsv6),
                               [],
@@ -789,11 +789,11 @@ def route_view(request):
     log = request.META['wsgi.errors']
 
     routes = []
-    for p in models.ResourceRangeAddressV4.objects.filter(cert__parent__in=conf.parents.all()):
+    for p in models.ResourceRangeAddressV4.objects.filter(cert__conf=conf):
         r = p.as_resource_range()
         print >>log, 'querying for routes matching %s' % r
         routes.extend([validate_route(*x) for x in roa_match(r)])
-    for p in models.ResourceRangeAddressV6.objects.filter(cert__parent__in=conf.parents.all()):
+    for p in models.ResourceRangeAddressV6.objects.filter(cert__conf=conf):
         r = p.as_resource_range()
         print >>log, 'querying for routes matching %s' % r
         routes.extend([validate_route(*x) for x in roa_match(r)])