Add "--flat_publication" option to yamltest, and corresponding

"--flat" option to rpkic configure_publication_client.  These are for
testing and simulation, do not use them in production.

svn path=/trunk/; revision=4545

1 files changed, 5 insertions, 1 deletions

diff --git a/rpkid/rpki/irdb/zookeeper.py b/rpkid/rpki/irdb/zookeeper.py
index 83fd8665..7dedeb7e 100644
--- a/rpkid/rpki/irdb/zookeeper.py
+++ b/rpkid/rpki/irdb/zookeeper.py
@@ -606,7 +606,7 @@ class Zookeeper(object):
 
 
   @django.db.transaction.commit_on_success
-  def configure_publication_client(self, filename, sia_base = None):
+  def configure_publication_client(self, filename, sia_base = None, flat = False):
     """
     Configure publication server to know about a new client, given the
     client's request-for-service message as input.  Reads the client's
@@ -619,6 +619,10 @@ class Zookeeper(object):
 
     client_ta = rpki.x509.X509(Base64 = client.findtext("bpki_client_ta"))
 
+    if sia_base is None and flat:
+      self.log("Flat publication structure forced, homing client at top-level")
+      sia_base = "rsync://%s/%s/%s/" % (self.rsync_server, self.rsync_module, client.get("handle"))
+
     if sia_base is None and client.get("handle") == self.handle and self.resource_ca.certificate == client_ta:
       self.log("This looks like self-hosted publication")
       sia_base = "rsync://%s/%s/%s/" % (self.rsync_server, self.rsync_module, self.handle)