From bbde00990b0aae93d4b3d9fac8d163f66eca0c43 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 16 Dec 2011 02:44:20 +0000
Subject: Checkpoint. Add EnumField. Debug CertificateManager.
svn path=/branches/tk100/; revision=4124
---
scripts/convert-from-entitydb-to-sql.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'scripts/convert-from-entitydb-to-sql.py')
diff --git a/scripts/convert-from-entitydb-to-sql.py b/scripts/convert-from-entitydb-to-sql.py
index bea12e84..d0a080e9 100644
--- a/scripts/convert-from-entitydb-to-sql.py
+++ b/scripts/convert-from-entitydb-to-sql.py
@@ -121,7 +121,7 @@ def get_or_create_CA(purpose):
return rpki.irdb.CA.objects.get_or_create(
identity = identity,
- purpose = rpki.irdb.CA.purpose_map[purpose],
+ purpose = purpose,
certificate = cer,
private_key = key,
latest_crl = crl,
@@ -135,7 +135,7 @@ def get_or_create_EECertificate(issuer, capurpose, eepurpose):
key = rpki.x509.RSA(Auto_file = os.path.join(bpki, capurpose, eepurpose + ".key"))
rpki.irdb.EECertificate.objects.get_or_create(
issuer = issuer,
- purpose = rpki.irdb.EECertificate.purpose_map[eepurpose],
+ purpose = eepurpose,
certificate = cer,
private_key = key)
@@ -301,7 +301,7 @@ for filename in glob.iglob(os.path.join(entitydb, "parents", "*.xml")):
child_handle = e.get("child_handle"),
ta = ta,
certificate = xcert,
- repository_type = rpki.irdb.Parent.repository_type_map[repository_type],
+ repository_type = repository_type,
referrer = referrer,
referral_authorization = referral_authorization,
issuer = resource_ca)[0]
--
cgit v1.2.3