From 677683695dd063ed7fe80e4abf20dfa9638578e5 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 4 May 2012 23:00:44 +0000 Subject: Add delete_rootd. svn path=/branches/tk33/; revision=4464 --- rpkid/rpki/irdb/zookeeper.py | 12 ++++++++++++ rpkid/rpki/rpkic.py | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/rpkid/rpki/irdb/zookeeper.py b/rpkid/rpki/irdb/zookeeper.py index d172e18e..b8ed1245 100644 --- a/rpkid/rpki/irdb/zookeeper.py +++ b/rpkid/rpki/irdb/zookeeper.py @@ -593,6 +593,18 @@ class Zookeeper(object): self.log("No such parent \"%s\"" % arg) + @django.db.transaction.commit_on_success + def delete_rootd(self): + """ + Delete rootd associated with this RPKI entity. + """ + + try: + self.resource_ca.rootd.delete() + except rpki.irdb.Rootd.DoesNotExist: + self.log("No associated rootd") + + @django.db.transaction.commit_on_success def configure_publication_client(self, filename, sia_base = None): """ diff --git a/rpkid/rpki/rpkic.py b/rpkid/rpki/rpkic.py index a94954a2..1ec1014a 100644 --- a/rpkid/rpki/rpkic.py +++ b/rpkid/rpki/rpkic.py @@ -299,6 +299,18 @@ class main(rpki.cli.Cmd): return self.irdb_handle_complete(rpki.irdb.Parent, *args) + def do_delete_rootd(self, arg): + """ + Delete rootd associated with this RPKI entity. + """ + + try: + self.zoo.delete_rootd() + self.zoo.synchronize() + except rpki.irdb.Rootd.DoesNotExist: + print "No associated rootd" + + def do_configure_publication_client(self, arg): """ Configure publication server to know about a new client, given the -- cgit v1.2.3