Salvage bgpdump-driven test code from rtr-origin, as separate module

rpki.rtr.bgpdump.  The normal rpki-rtr program intentionally does not
even import this module, because all of the bgpdump-* code is just a
confusing distraction to users who want the normal rpki-rtr code.

The refactored bgpdump-* code has passed pylint but otherwise has not
yet been tested, and may not work at all.  Since, as far as we know,
nobody but the author has ever run any of the code in this module,
this should not be a problem.

svn path=/trunk/; revision=5824

1 files changed, 9 insertions, 0 deletions

diff --git a/rpki/rtr/main.py b/rpki/rtr/main.py
index e5b50ef5..6add407d 100644
--- a/rpki/rtr/main.py
+++ b/rpki/rtr/main.py
@@ -22,6 +22,7 @@ RFC and Internet-Draft repositories near you.
 """
 
 import os
+import sys
 import time
 import logging
 import logging.handlers
@@ -31,6 +32,7 @@ from rpki.rtr.server    import argparse_setup as argparse_setup_server
 from rpki.rtr.client    import argparse_setup as argparse_setup_client
 from rpki.rtr.generator import argparse_setup as argparse_setup_generator
 
+
 class Formatter(logging.Formatter):
 
   converter = time.gmtime
@@ -55,6 +57,12 @@ def main():
   os.environ["TZ"] = "UTC"
   time.tzset()
 
+  if "rpki.rtr.bgpdump" in sys.modules:
+    from rpki.rtr.bgpdump import argparse_setup as argparse_setup_bgpdump
+  else:
+    def argparse_setup_bgpdump(ignored):
+      pass
+
   argparser = argparse.ArgumentParser(description = __doc__)
   argparser.add_argument("--debug", action = "store_true", help = "debugging mode")
   argparser.add_argument("--log-level", default = logging.DEBUG,
@@ -66,6 +74,7 @@ def main():
   argparse_setup_server(subparsers)
   argparse_setup_client(subparsers)
   argparse_setup_generator(subparsers)
+  argparse_setup_bgpdump(subparsers)
   args = argparser.parse_args()
 
   fmt = "rpki-rtr/" + args.mode + "%(connection)s[%(process)d] %(message)s"