diff options
| -rw-r--r-- | docs/OPERATION | 12 | ||||
| -rw-r--r-- | scripts/testbed.py | 4 | ||||
| -rw-r--r-- | scripts/testpoke.py | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/docs/OPERATION b/docs/OPERATION index 3d9e2b93..a4aeb45f 100644 --- a/docs/OPERATION +++ b/docs/OPERATION @@ -112,7 +112,7 @@ sql-password: Password to hand to MySQL when connecting to cms-ta-irdb: Name of file containing CMS trust anchor to use when authenticating messages from irdbd. -cms-ta-irdb: Name of file containing CMS trust anchor to +cms-ta-irbe: Name of file containing CMS trust anchor to use when authenticating control messages from IRBE. @@ -143,7 +143,9 @@ https-ta: Name of file containing trust anchor to use irdb-url: Service URL for irdbd. Must be a https:// URL. https-server-host: Hostname or IP address on which to listen for - HTTPS connections. Default is localhost. + HTTPS connections. Current default is + INADDR_ANY (IPv4 0.0.0.0); this will need to + be hacked to support IPv6 for production. https-server-port: TCP port on which to listen for HTTPS connections. @@ -392,7 +394,7 @@ to choose a different config file. Most options are in the section "[irbe-cli]", but a few are in the section "[irdbd]". Certificates, keys, and trust anchors may be in either DER or PEM format. -Options in the "[irbe-cli] section: +Options in the "[irbe-cli]" section: cms-ta: Name of file containing CMS trust anchor to use when authenticating messages from rpkid. @@ -612,11 +614,11 @@ http://mirin.apnic.net/svn/rpki_engine/branches/gary-poker/client/poke/README testpoke.py takes a simplified command line and uses only one YAML input file. -Usage: python testpoke.py [ { -c | --config } configfile ] +Usage: python testpoke.py [ { -y | --yaml } configfile ] [ { -r | --request } requestname ] [ { -h | --help } ] -Default configuration file is testpoke.yaml, override with --config +Default configuration file is testpoke.yaml, override with --yaml option. The --request option specifies the specific command within the YAML diff --git a/scripts/testbed.py b/scripts/testbed.py index 990e3150..c87c81b2 100644 --- a/scripts/testbed.py +++ b/scripts/testbed.py @@ -568,8 +568,8 @@ class allocation(object): def run_yaml(self): """Run YAML scripts for this leaf entity.""" rpki.log.info("Running YAML for %s" % self.name) - subprocess.check_call((prog_python, prog_poke, "-c", self.name + ".yaml", "-r", "list")) - subprocess.check_call((prog_python, prog_poke, "-c", self.name + ".yaml", "-r", "issue")) + subprocess.check_call((prog_python, prog_poke, "-y", self.name + ".yaml", "-r", "list")) + subprocess.check_call((prog_python, prog_poke, "-y", self.name + ".yaml", "-r", "issue")) def setup_biz_cert_chain(name): """Build a set of business certs.""" diff --git a/scripts/testpoke.py b/scripts/testpoke.py index 1af03a72..1a35c08d 100644 --- a/scripts/testpoke.py +++ b/scripts/testpoke.py @@ -5,9 +5,11 @@ Trivial RPKI up-down protocol client, for testing. Configuration file is YAML to be compatable with APNIC rpki_poke.pl tool. -Usage: python testpoke.py [ { -c | --config } configfile ] [ { -r | --request } requestname ] [ { -h | --help } ] +Usage: python testpoke.py [ { -y | --yaml } configfile ] + [ { -r | --request } requestname ] + [ { -h | --help } ] -Default configuration file is testpoke.yaml, override with --config option. +Default configuration file is testpoke.yaml, override with --yaml option. """ import traceback, os, time, getopt, sys, lxml, yaml @@ -25,11 +27,11 @@ def usage(code): yaml_file = "testpoke.yaml" yaml_cmd = None -opts,argv = getopt.getopt(sys.argv[1:], "c:r:h?", ["config=", "request=", "help"]) +opts,argv = getopt.getopt(sys.argv[1:], "y:r:h?", ["yaml=", "request=", "help"]) for o,a in opts: if o in ("-h", "--help", "-?"): usage(0) - elif o in ("-c", "--config"): + elif o in ("-y", "--yaml"): yaml_file = a elif o in ("-r", "--request"): yaml_cmd = a |