Cleanup

svn path=/myrpki.rototill/examples/children.csv; revision=3075

5 files changed, 18 insertions, 35 deletions

diff --git a/myrpki.rototill/examples/children.csv b/myrpki.rototill/examples/children.csv
deleted file mode 100644
index da29e8b5..00000000
--- a/myrpki.rototill/examples/children.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Syntax: <child_handle> <validitydate> <bpki_cert_filename>
-#
-# NB: Comment lines are not allowed in these files, this one is only
-# present to explain the example
-#
-Alice	2009-07-27T08:24:53Z	Alice.ta.cer
-Bob	2009-07-27T08:24:53Z	Bob.ta.cer
diff --git a/myrpki.rototill/examples/parents.csv b/myrpki.rototill/examples/parents.csv
deleted file mode 100644
index f92eddeb..00000000
--- a/myrpki.rototill/examples/parents.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Syntax: <parent_handle> <service_uri> <cms_bpki_cert_filename> <https_bpki_cert_filename> <myhandle>	<sia_base>
-#
-# NB: Comment lines are not allowed in these files, this one is only
-# present to explain the example
-#
-Mom	https://localhost:4414/up-down/Mom/Becca	Mom.ta.cer	Mom.rpkid.cer	Becca	rsync://rpki.example.org/Me/
diff --git a/myrpki.rototill/examples/pubclients.csv b/myrpki.rototill/examples/pubclients.csv
deleted file mode 100644
index dcba14e7..00000000
--- a/myrpki.rototill/examples/pubclients.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id$
-#
-# Syntax: <client_handle> <bpki_cert_filename> <sia_base>
-#
-# NB: Comment lines are not allowed in these files, this one is only
-# present to explain the example
-#
-Me	bpki/resources/ca.cer	rsync://rpki.example.org/Me/
-Me/Alice	pubd-client-certs/Alice.cer	rsync://rpki.example.org/Me/Alice/
-Me/Bob	pubd-client-certs/Bob.cer	rsync://rpki.example.org/Me/Bob/
diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py
index 7d039e89..cabdc4ef 100644
--- a/myrpki.rototill/myrpki.py
+++ b/myrpki.rototill/myrpki.py
@@ -781,6 +781,16 @@ class main(rpki.cli.Cmd):
     rpki.cli.Cmd.__init__(self, argv)
 
 
+  def help_overview(self):
+    """
+    Show program __doc__ string.  Perhaps there's some clever way to
+    do this using the textwrap module, but for now something simple
+    and crude will suffice.
+    """
+    for line in __doc__.splitlines(True):
+      self.stdout.write(" " * 4 + line)
+    self.stdout.write("\n")
+
   def read_config(self):
 
     self.cfg = rpki.config.parser(self.cfg_file, "myrpki")
diff --git a/myrpki.rototill/yamltest.py b/myrpki.rototill/yamltest.py
index f50db49d..601d3dcb 100644
--- a/myrpki.rototill/yamltest.py
+++ b/myrpki.rototill/yamltest.py
@@ -460,13 +460,13 @@ class allocation(object):
     Run myirbe.py if this entity is not hosted by another engine.
     """
     if not self.is_hosted():
-      self.run_setup("myirbe", *[h.path("myrpki.xml") for h in self.hosts])
+      self.run_setup("configure_daemons", *[h.path("myrpki.xml") for h in self.hosts])
 
   def run_myrpki(self):
     """
     Run myrpki.py for this entity.
     """
-    self.run_setup("myrpki")
+    self.run_setup("configure_resources")
 
   def run_setup(self, *args):
     """
@@ -626,20 +626,20 @@ try:
   for d in db:
     if d.is_root():
       print
-      d.run_setup("answer_repository_client", d.path("entitydb", "repositories", "%s.xml" % d.name))
+      d.run_setup("configure_publication_client", d.path("entitydb", "repositories", "%s.xml" % d.name))
       print
-      d.run_setup("process_repository_answer", d.path("entitydb", "pubclients", "%s.xml" % d.name))
+      d.run_setup("configure_repository", d.path("entitydb", "pubclients", "%s.xml" % d.name))
       print
     else:
       print
-      d.parent.run_setup("answer_child", d.path("entitydb", "identity.xml"))
+      d.parent.run_setup("configure_child", d.path("entitydb", "identity.xml"))
       print
-      d.run_setup("process_parent_answer", d.parent.path("entitydb", "children", "%s.xml" % d.name))
+      d.run_setup("configure_parent", d.parent.path("entitydb", "children", "%s.xml" % d.name))
       print
       p, n = d.find_pubd(want_path = True)
-      p.run_setup("answer_repository_client", d.path("entitydb", "repositories", "%s.xml" % d.parent.name))
+      p.run_setup("configure_publication_client", d.path("entitydb", "repositories", "%s.xml" % d.parent.name))
       print
-      d.run_setup("process_repository_answer", p.path("entitydb", "pubclients", "%s.xml" % n))
+      d.run_setup("configure_repository", p.path("entitydb", "pubclients", "%s.xml" % n))
       print
 
   # Run myrpki.py several times for each entity.  First pass misses