Now working with PostgreSQL.

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

1 files changed, 53 insertions, 52 deletions

diff --git a/rpki/rpkidb/migrations/0001_initial.py b/rpki/rpkidb/migrations/0001_initial.py
index f88f0cdd..a313ba63 100644
--- a/rpki/rpkidb/migrations/0001_initial.py
+++ b/rpki/rpkidb/migrations/0001_initial.py
@@ -16,11 +16,11 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('bsc_handle', models.SlugField(max_length=255)),
-                ('private_key_id', rpki.fields.KeyField(default=None, serialize=False, blank=True)),
-                ('pkcs10_request', rpki.fields.PKCS10Field(default=None, serialize=False, blank=True)),
-                ('hash_alg', rpki.fields.EnumField(choices=[(1, 'sha256')])),
-                ('signing_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('signing_cert_crl', rpki.fields.CRLField(default=None, serialize=False, null=True, blank=True)),
+                ('private_key_id', rpki.fields.RSAPrivateKeyField()),
+                ('pkcs10_request', rpki.fields.PKCS10Field()),
+                ('hash_alg', rpki.fields.EnumField(default='sha256', choices=[(1, 'sha256')])),
+                ('signing_cert', rpki.fields.CertificateField(null=True)),
+                ('signing_cert_crl', rpki.fields.CRLField(null=True)),
             ],
         ),
         migrations.CreateModel(
@@ -40,15 +40,15 @@ class Migration(migrations.Migration):
             name='CADetail',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('public_key', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)),
-                ('private_key_id', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)),
-                ('latest_crl', rpki.fields.CRLField(default=None, serialize=False, null=True, blank=True)),
+                ('public_key', rpki.fields.PublicKeyField(null=True)),
+                ('private_key_id', rpki.fields.RSAPrivateKeyField(null=True)),
+                ('latest_crl', rpki.fields.CRLField(null=True)),
                 ('crl_published', rpki.fields.SundialField(null=True)),
-                ('latest_ca_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('manifest_private_key_id', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)),
-                ('manifest_public_key', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)),
-                ('latest_manifest_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('latest_manifest', rpki.fields.ManifestField(default=None, serialize=False, null=True, blank=True)),
+                ('latest_ca_cert', rpki.fields.CertificateField(null=True)),
+                ('manifest_private_key_id', rpki.fields.RSAPrivateKeyField(null=True)),
+                ('manifest_public_key', rpki.fields.PublicKeyField(null=True)),
+                ('latest_manifest_cert', rpki.fields.CertificateField(null=True)),
+                ('latest_manifest', rpki.fields.ManifestField(null=True)),
                 ('manifest_published', rpki.fields.SundialField(null=True)),
                 ('state', rpki.fields.EnumField(choices=[(1, 'pending'), (2, 'active'), (3, 'deprecated'), (4, 'revoked')])),
                 ('ca_cert_uri', models.TextField(null=True)),
@@ -60,8 +60,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('child_handle', models.SlugField(max_length=255)),
-                ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
+                ('bpki_cert', rpki.fields.CertificateField(null=True)),
+                ('bpki_glue', rpki.fields.CertificateField(null=True)),
                 ('last_cms_timestamp', rpki.fields.SundialField(null=True)),
                 ('bsc', models.ForeignKey(related_name='children', to='rpkidb.BSC')),
             ],
@@ -70,21 +70,21 @@ class Migration(migrations.Migration):
             name='ChildCert',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('cert', rpki.fields.CertificateField()),
                 ('published', rpki.fields.SundialField(null=True)),
-                ('ski', rpki.fields.BlobField(default=None, serialize=False, blank=True)),
+                ('gski', models.CharField(max_length=27)),
                 ('ca_detail', models.ForeignKey(related_name='child_certs', to='rpkidb.CADetail')),
                 ('child', models.ForeignKey(related_name='child_certs', to='rpkidb.Child')),
             ],
         ),
         migrations.CreateModel(
-            name='EECert',
+            name='EECertificate',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('ski', rpki.fields.BlobField(default=None, serialize=False, blank=True)),
-                ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
+                ('gski', models.CharField(max_length=27)),
+                ('cert', rpki.fields.CertificateField()),
                 ('published', rpki.fields.SundialField(null=True)),
-                ('ca_detail', models.ForeignKey(related_name='ee_certs', to='rpkidb.CADetail')),
+                ('ca_detail', models.ForeignKey(related_name='ee_certificates', to='rpkidb.CADetail')),
             ],
         ),
         migrations.CreateModel(
@@ -92,8 +92,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('vcard', models.TextField()),
-                ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
-                ('ghostbuster', rpki.fields.GhostbusterField(default=None, serialize=False, blank=True)),
+                ('cert', rpki.fields.CertificateField()),
+                ('ghostbuster', rpki.fields.GhostbusterField()),
                 ('published', rpki.fields.SundialField(null=True)),
                 ('ca_detail', models.ForeignKey(related_name='ghostbusters', to='rpkidb.CADetail')),
             ],
@@ -103,8 +103,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('parent_handle', models.SlugField(max_length=255)),
-                ('bpki_cms_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('bpki_cms_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
+                ('bpki_cert', rpki.fields.CertificateField(null=True)),
+                ('bpki_glue', rpki.fields.CertificateField(null=True)),
                 ('peer_contact_uri', models.TextField(null=True)),
                 ('sia_base', models.TextField(null=True)),
                 ('sender_name', models.TextField(null=True)),
@@ -119,8 +119,9 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('repository_handle', models.SlugField(max_length=255)),
                 ('peer_contact_uri', models.TextField(null=True)),
-                ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
+                ('rrdp_notification_uri', models.TextField(null=True)),
+                ('bpki_cert', rpki.fields.CertificateField(null=True)),
+                ('bpki_glue', rpki.fields.CertificateField(null=True)),
                 ('last_cms_timestamp', rpki.fields.SundialField(null=True)),
                 ('bsc', models.ForeignKey(related_name='repositories', to='rpkidb.BSC')),
             ],
@@ -142,33 +143,33 @@ class Migration(migrations.Migration):
                 ('asn', models.BigIntegerField()),
                 ('ipv4', models.TextField(null=True)),
                 ('ipv6', models.TextField(null=True)),
-                ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)),
-                ('roa', rpki.fields.ROAField(default=None, serialize=False, blank=True)),
+                ('cert', rpki.fields.CertificateField()),
+                ('roa', rpki.fields.ROAField()),
                 ('published', rpki.fields.SundialField(null=True)),
                 ('ca_detail', models.ForeignKey(related_name='roas', to='rpkidb.CADetail')),
             ],
         ),
         migrations.CreateModel(
-            name='Self',
+            name='Tenant',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('self_handle', models.SlugField(max_length=255)),
+                ('tenant_handle', models.SlugField(max_length=255)),
                 ('use_hsm', models.BooleanField(default=False)),
                 ('crl_interval', models.BigIntegerField(null=True)),
                 ('regen_margin', models.BigIntegerField(null=True)),
-                ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
-                ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)),
+                ('bpki_cert', rpki.fields.CertificateField(null=True)),
+                ('bpki_glue', rpki.fields.CertificateField(null=True)),
             ],
         ),
         migrations.AddField(
             model_name='roa',
-            name='self',
-            field=models.ForeignKey(related_name='roas', to='rpkidb.Self'),
+            name='tenant',
+            field=models.ForeignKey(related_name='roas', to='rpkidb.Tenant'),
         ),
         migrations.AddField(
             model_name='repository',
-            name='self',
-            field=models.ForeignKey(related_name='repositories', to='rpkidb.Self'),
+            name='tenant',
+            field=models.ForeignKey(related_name='repositories', to='rpkidb.Tenant'),
         ),
         migrations.AddField(
             model_name='parent',
@@ -177,23 +178,23 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='parent',
-            name='self',
-            field=models.ForeignKey(related_name='parents', to='rpkidb.Self'),
+            name='tenant',
+            field=models.ForeignKey(related_name='parents', to='rpkidb.Tenant'),
         ),
         migrations.AddField(
             model_name='ghostbuster',
-            name='self',
-            field=models.ForeignKey(related_name='ghostbusters', to='rpkidb.Self'),
+            name='tenant',
+            field=models.ForeignKey(related_name='ghostbusters', to='rpkidb.Tenant'),
         ),
         migrations.AddField(
-            model_name='eecert',
-            name='self',
-            field=models.ForeignKey(related_name='ee_certs', to='rpkidb.Self'),
+            model_name='eecertificate',
+            name='tenant',
+            field=models.ForeignKey(related_name='ee_certificates', to='rpkidb.Tenant'),
         ),
         migrations.AddField(
             model_name='child',
-            name='self',
-            field=models.ForeignKey(related_name='children', to='rpkidb.Self'),
+            name='tenant',
+            field=models.ForeignKey(related_name='children', to='rpkidb.Tenant'),
         ),
         migrations.AddField(
             model_name='ca',
@@ -202,23 +203,23 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='bsc',
-            name='self',
-            field=models.ForeignKey(related_name='bscs', to='rpkidb.Self'),
+            name='tenant',
+            field=models.ForeignKey(related_name='bscs', to='rpkidb.Tenant'),
         ),
         migrations.AlterUniqueTogether(
             name='repository',
-            unique_together=set([('self', 'repository_handle')]),
+            unique_together=set([('tenant', 'repository_handle')]),
         ),
         migrations.AlterUniqueTogether(
             name='parent',
-            unique_together=set([('self', 'parent_handle')]),
+            unique_together=set([('tenant', 'parent_handle')]),
         ),
         migrations.AlterUniqueTogether(
             name='child',
-            unique_together=set([('self', 'child_handle')]),
+            unique_together=set([('tenant', 'child_handle')]),
         ),
         migrations.AlterUniqueTogether(
             name='bsc',
-            unique_together=set([('self', 'bsc_handle')]),
+            unique_together=set([('tenant', 'bsc_handle')]),
         ),
     ]