A Farewell To Turtles.

svn path=/branches/tk705/; revision=6417

3 files changed, 34 insertions, 101 deletions

diff --git a/rpki/irdb/migrations/0001_initial.py b/rpki/irdb/migrations/0001_initial.py
index 019328b3..f2d34d8b 100644
--- a/rpki/irdb/migrations/0001_initial.py
+++ b/rpki/irdb/migrations/0001_initial.py
@@ -110,6 +110,24 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
+            name='Parent',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('certificate', rpki.fields.CertificateField()),
+                ('handle', rpki.irdb.models.HandleField(max_length=120)),
+                ('ta', rpki.fields.CertificateField()),
+                ('service_uri', models.CharField(max_length=255)),
+                ('parent_handle', rpki.irdb.models.HandleField(max_length=120)),
+                ('child_handle', rpki.irdb.models.HandleField(max_length=120)),
+                ('repository_type', rpki.fields.EnumField(choices=[(1, b'none'), (2, b'offer'), (3, b'referral')])),
+                ('referrer', rpki.irdb.models.HandleField(max_length=120, null=True, blank=True)),
+                ('referral_authorization', rpki.irdb.models.SignedReferralField(null=True)),
+                ('asn_resources', models.TextField(blank=True)),
+                ('ipv4_resources', models.TextField(blank=True)),
+                ('ipv6_resources', models.TextField(blank=True)),
+            ],
+        ),
+        migrations.CreateModel(
             name='Referral',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
@@ -221,42 +239,6 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
-        migrations.CreateModel(
-            name='Turtle',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('service_uri', models.CharField(max_length=255)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Parent',
-            fields=[
-                ('turtle_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='irdb.Turtle')),
-                ('certificate', rpki.fields.CertificateField()),
-                ('handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('ta', rpki.fields.CertificateField()),
-                ('parent_handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('child_handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('repository_type', rpki.fields.EnumField(choices=[(1, b'none'), (2, b'offer'), (3, b'referral')])),
-                ('referrer', rpki.irdb.models.HandleField(max_length=120, null=True, blank=True)),
-                ('referral_authorization', rpki.irdb.models.SignedReferralField(null=True)),
-                ('issuer', models.ForeignKey(related_name='parents', to='irdb.ResourceHolderCA')),
-            ],
-            bases=('irdb.turtle', models.Model),
-        ),
-        migrations.CreateModel(
-            name='Rootd',
-            fields=[
-                ('turtle_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='irdb.Turtle')),
-                ('certificate', rpki.fields.CertificateField()),
-                ('private_key', rpki.fields.RSAPrivateKeyField()),
-                ('issuer', models.OneToOneField(related_name='rootd', to='irdb.ResourceHolderCA')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=('irdb.turtle', models.Model),
-        ),
         migrations.AddField(
             model_name='repository',
             name='issuer',
@@ -264,8 +246,8 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='repository',
-            name='turtle',
-            field=models.OneToOneField(related_name='repository', to='irdb.Turtle'),
+            name='parent',
+            field=models.OneToOneField(related_name='repository', to='irdb.Parent'),
         ),
         migrations.AddField(
             model_name='referral',
@@ -273,6 +255,11 @@ class Migration(migrations.Migration):
             field=models.OneToOneField(related_name='referral_certificate', to='irdb.ResourceHolderCA'),
         ),
         migrations.AddField(
+            model_name='parent',
+            name='issuer',
+            field=models.ForeignKey(related_name='parents', to='irdb.ResourceHolderCA'),
+        ),
+        migrations.AddField(
             model_name='hostedca',
             name='hosted',
             field=models.OneToOneField(related_name='hosted_by', to='irdb.ResourceHolderCA'),
@@ -288,6 +275,11 @@ class Migration(migrations.Migration):
             field=models.ForeignKey(related_name='ghostbuster_requests', to='irdb.ResourceHolderCA'),
         ),
         migrations.AddField(
+            model_name='ghostbusterrequest',
+            name='parent',
+            field=models.ForeignKey(related_name='ghostbuster_requests', to='irdb.Parent', null=True),
+        ),
+        migrations.AddField(
             model_name='eecertificaterequest',
             name='issuer',
             field=models.ForeignKey(related_name='ee_certificate_requests', to='irdb.ResourceHolderCA'),
@@ -328,14 +320,13 @@ class Migration(migrations.Migration):
             unique_together=set([('issuer', 'handle')]),
         ),
         migrations.AlterUniqueTogether(
+            name='parent',
+            unique_together=set([('issuer', 'handle')]),
+        ),
+        migrations.AlterUniqueTogether(
             name='hostedca',
             unique_together=set([('issuer', 'hosted')]),
         ),
-        migrations.AddField(
-            model_name='ghostbusterrequest',
-            name='parent',
-            field=models.ForeignKey(related_name='ghostbuster_requests', to='irdb.Parent', null=True),
-        ),
         migrations.AlterUniqueTogether(
             name='eecertificaterequestnet',
             unique_together=set([('ee_certificate_request', 'start_ip', 'end_ip', 'version')]),
@@ -368,8 +359,4 @@ class Migration(migrations.Migration):
             name='bsc',
             unique_together=set([('issuer', 'handle')]),
         ),
-        migrations.AlterUniqueTogether(
-            name='parent',
-            unique_together=set([('issuer', 'handle')]),
-        ),
     ]
diff --git a/rpki/irdb/migrations/0002_root.py b/rpki/irdb/migrations/0002_root.py
deleted file mode 100644
index 6bdc060e..00000000
--- a/rpki/irdb/migrations/0002_root.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('irdb', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='parent',
-            name='asn_resources',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='parent',
-            name='ipv4_resources',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='parent',
-            name='ipv6_resources',
-            field=models.TextField(blank=True),
-        ),
-    ]
diff --git a/rpki/irdb/migrations/0003_remove_rootd.py b/rpki/irdb/migrations/0003_remove_rootd.py
deleted file mode 100644
index aef4c5ab..00000000
--- a/rpki/irdb/migrations/0003_remove_rootd.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('irdb', '0002_root'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='rootd',
-            name='issuer',
-        ),
-        migrations.RemoveField(
-            model_name='rootd',
-            name='turtle_ptr',
-        ),
-        migrations.DeleteModel(
-            name='Rootd',
-        ),
-    ]