Now working with PostgreSQL.

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

5 files changed, 26 insertions, 244 deletions

diff --git a/rpki/irdb/migrations/0001_initial.py b/rpki/irdb/migrations/0001_initial.py
index d10b62d3..019328b3 100644
--- a/rpki/irdb/migrations/0001_initial.py
+++ b/rpki/irdb/migrations/0001_initial.py
@@ -16,9 +16,9 @@ class Migration(migrations.Migration):
             name='BSC',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
                 ('handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('pkcs10', rpki.fields.PKCS10Field(default=None, serialize=False, blank=True)),
+                ('pkcs10', rpki.fields.PKCS10Field()),
             ],
             options={
                 'abstract': False,
@@ -28,9 +28,9 @@ class Migration(migrations.Migration):
             name='Child',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
                 ('handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('ta', rpki.fields.CertificateField()),
                 ('valid_until', rpki.fields.SundialField()),
                 ('name', models.TextField(null=True, blank=True)),
             ],
@@ -58,11 +58,10 @@ class Migration(migrations.Migration):
             name='Client',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
                 ('handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('ta', rpki.fields.CertificateField()),
                 ('sia_base', models.TextField()),
-                ('parent_handle', rpki.irdb.models.HandleField(max_length=120)),
             ],
         ),
         migrations.CreateModel(
@@ -70,7 +69,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('valid_until', rpki.fields.SundialField()),
-                ('pkcs10', rpki.fields.PKCS10Field(default=None, serialize=False, blank=True)),
+                ('pkcs10', rpki.fields.PKCS10Field()),
                 ('gski', models.CharField(max_length=27)),
                 ('cn', models.CharField(max_length=64)),
                 ('sn', models.CharField(max_length=64)),
@@ -107,15 +106,15 @@ class Migration(migrations.Migration):
             name='HostedCA',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
             ],
         ),
         migrations.CreateModel(
             name='Referral',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
-                ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
+                ('private_key', rpki.fields.RSAPrivateKeyField()),
             ],
             options={
                 'abstract': False,
@@ -125,21 +124,22 @@ class Migration(migrations.Migration):
             name='Repository',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
                 ('handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('ta', rpki.fields.CertificateField()),
                 ('client_handle', rpki.irdb.models.HandleField(max_length=120)),
                 ('service_uri', models.CharField(max_length=255)),
                 ('sia_base', models.TextField()),
+                ('rrdp_notification_uri', models.TextField(null=True)),
             ],
         ),
         migrations.CreateModel(
             name='ResourceHolderCA',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
-                ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)),
-                ('latest_crl', rpki.fields.CRLField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
+                ('private_key', rpki.fields.RSAPrivateKeyField()),
+                ('latest_crl', rpki.fields.CRLField()),
                 ('next_serial', models.BigIntegerField(default=1)),
                 ('next_crl_number', models.BigIntegerField(default=1)),
                 ('last_crl_update', rpki.fields.SundialField()),
@@ -186,9 +186,9 @@ class Migration(migrations.Migration):
             name='ServerCA',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
-                ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)),
-                ('latest_crl', rpki.fields.CRLField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
+                ('private_key', rpki.fields.RSAPrivateKeyField()),
+                ('latest_crl', rpki.fields.CRLField()),
                 ('next_serial', models.BigIntegerField(default=1)),
                 ('next_crl_number', models.BigIntegerField(default=1)),
                 ('last_crl_update', rpki.fields.SundialField()),
@@ -202,8 +202,8 @@ class Migration(migrations.Migration):
             name='ServerEE',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
-                ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
+                ('private_key', rpki.fields.RSAPrivateKeyField()),
                 ('purpose', rpki.fields.EnumField(choices=[(1, b'rpkid'), (2, b'pubd'), (3, b'irdbd'), (4, b'irbe')])),
                 ('issuer', models.ForeignKey(related_name='ee_certificates', to='irdb.ServerCA')),
             ],
@@ -232,14 +232,14 @@ class Migration(migrations.Migration):
             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(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
                 ('handle', rpki.irdb.models.HandleField(max_length=120)),
-                ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('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(default=None, serialize=False, 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),
@@ -248,8 +248,8 @@ class Migration(migrations.Migration):
             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(default=None, serialize=False, blank=True)),
-                ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)),
+                ('certificate', rpki.fields.CertificateField()),
+                ('private_key', rpki.fields.RSAPrivateKeyField()),
                 ('issuer', models.OneToOneField(related_name='rootd', to='irdb.ResourceHolderCA')),
             ],
             options={
diff --git a/rpki/irdb/migrations/0002_remove_client_parent_handle.py b/rpki/irdb/migrations/0002_remove_client_parent_handle.py
deleted file mode 100644
index f86d165d..00000000
--- a/rpki/irdb/migrations/0002_remove_client_parent_handle.py
+++ /dev/null
@@ -1,18 +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.RemoveField(
-            model_name='client',
-            name='parent_handle',
-        ),
-    ]
diff --git a/rpki/irdb/migrations/0003_repository_rrdp_notification_uri.py b/rpki/irdb/migrations/0003_repository_rrdp_notification_uri.py
deleted file mode 100644
index 1e0e43c2..00000000
--- a/rpki/irdb/migrations/0003_repository_rrdp_notification_uri.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('irdb', '0002_remove_client_parent_handle'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='repository',
-            name='rrdp_notification_uri',
-            field=models.TextField(null=True),
-        ),
-    ]
diff --git a/rpki/irdb/migrations/0004_auto_20151018_1603.py b/rpki/irdb/migrations/0004_auto_20151018_1603.py
deleted file mode 100644
index 645d1eaa..00000000
--- a/rpki/irdb/migrations/0004_auto_20151018_1603.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import rpki.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('irdb', '0003_repository_rrdp_notification_uri'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='referral',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='resourceholderca',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='rootd',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='serverca',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='serveree',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True),
-        ),
-    ]
diff --git a/rpki/irdb/migrations/0005_auto_20151023_2151.py b/rpki/irdb/migrations/0005_auto_20151023_2151.py
deleted file mode 100644
index 7d16e7a0..00000000
--- a/rpki/irdb/migrations/0005_auto_20151023_2151.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import rpki.irdb.models
-import rpki.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('irdb', '0004_auto_20151018_1603'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='bsc',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='bsc',
-            name='pkcs10',
-            field=rpki.fields.PKCS10Field(),
-        ),
-        migrations.AlterField(
-            model_name='child',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='child',
-            name='ta',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='client',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='client',
-            name='ta',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='eecertificaterequest',
-            name='pkcs10',
-            field=rpki.fields.PKCS10Field(),
-        ),
-        migrations.AlterField(
-            model_name='hostedca',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='parent',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='parent',
-            name='referral_authorization',
-            field=rpki.irdb.models.SignedReferralField(null=True, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='parent',
-            name='ta',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='referral',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='referral',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(),
-        ),
-        migrations.AlterField(
-            model_name='repository',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='repository',
-            name='ta',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='resourceholderca',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='resourceholderca',
-            name='latest_crl',
-            field=rpki.fields.CRLField(),
-        ),
-        migrations.AlterField(
-            model_name='resourceholderca',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(),
-        ),
-        migrations.AlterField(
-            model_name='rootd',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='rootd',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(),
-        ),
-        migrations.AlterField(
-            model_name='serverca',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='serverca',
-            name='latest_crl',
-            field=rpki.fields.CRLField(),
-        ),
-        migrations.AlterField(
-            model_name='serverca',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(),
-        ),
-        migrations.AlterField(
-            model_name='serveree',
-            name='certificate',
-            field=rpki.fields.CertificateField(),
-        ),
-        migrations.AlterField(
-            model_name='serveree',
-            name='private_key',
-            field=rpki.fields.RSAPrivateKeyField(),
-        ),
-    ]