From a078ed0fe4db23d4c98466fe8a94cbde5916d69a Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Fri, 20 Jan 2012 01:20:32 +0000 Subject: merge with ^/branches/tk100 svn path=/branches/tk161/; revision=4239 --- rpkid/rpki/irdb/zookeeper.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'rpkid/rpki/irdb/zookeeper.py') diff --git a/rpkid/rpki/irdb/zookeeper.py b/rpkid/rpki/irdb/zookeeper.py index 709006ef..08308bcf 100644 --- a/rpkid/rpki/irdb/zookeeper.py +++ b/rpkid/rpki/irdb/zookeeper.py @@ -265,8 +265,17 @@ class Zookeeper(object): if self.run_pubd: rpki.irdb.ServerEE.objects.get_or_certify(issuer = server_ca, purpose = "pubd") + return self.generate_identity() + + + def generate_identity(self): + """ + Generate identity XML. Broken out of .initialize() because it's + easier for the GUI this way. + """ + e = Element("identity", handle = self.handle) - B64Element(e, "bpki_ta", resource_ca.certificate) + B64Element(e, "bpki_ta", self.resource_ca.certificate) return etree_wrapper(e, msg = 'This is the "identity" file you will need to send to your parent') -- cgit v1.2.3