diff options
| -rw-r--r-- | ca/tests/smoketest.1.yaml | 8 | ||||
| -rw-r--r-- | ca/tests/smoketest.3.yaml | 4 | ||||
| -rw-r--r-- | ca/tests/smoketest.7.yaml | 2 | ||||
| -rwxr-xr-x | rp/rpki-rtr/rtr-origin | 30 |
4 files changed, 21 insertions, 23 deletions
diff --git a/ca/tests/smoketest.1.yaml b/ca/tests/smoketest.1.yaml index 81bc887a..0e9acb85 100644 --- a/ca/tests/smoketest.1.yaml +++ b/ca/tests/smoketest.1.yaml @@ -52,8 +52,8 @@ kids: --- - shell set -x; - rtr_origin='python ../../../rp/rpki-rtr/rtr-origin.py'; - $rtr_origin --cronjob rcynic-data/authenticated && + rtr_origin='../../../rp/rpki-rtr/rtr-origin'; + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show --- - name: R0 @@ -70,8 +70,8 @@ kids: ipv4: 10.3.0.1/32, 10.0.0.44/32 --- - shell set -x; - rtr_origin='python ../../../rp/rpki-rtr/rtr-origin.py'; - $rtr_origin --cronjob rcynic-data/authenticated && + rtr_origin='../../../rp/rpki-rtr/rtr-origin'; + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show --- - sleep 30 diff --git a/ca/tests/smoketest.3.yaml b/ca/tests/smoketest.3.yaml index 41a88643..df308ebe 100644 --- a/ca/tests/smoketest.3.yaml +++ b/ca/tests/smoketest.3.yaml @@ -62,7 +62,7 @@ kids: #--- - shell set -x; rtr_origin=../../../rp/rpki-rtr/rtr-origin; - $rtr_origin --cronjob rcynic-data/authenticated && + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show --- - name: Alice @@ -77,5 +77,5 @@ kids: --- - shell set -x; rtr_origin=../../../rp/rpki-rtr/rtr-origin; - $rtr_origin --cronjob rcynic-data/authenticated && + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show diff --git a/ca/tests/smoketest.7.yaml b/ca/tests/smoketest.7.yaml index 7c808552..2da48770 100644 --- a/ca/tests/smoketest.7.yaml +++ b/ca/tests/smoketest.7.yaml @@ -73,5 +73,5 @@ roa_request: -print -exec ../../../rp/utils/print_roa {} \; ; rtr_origin=../../../rp/rpki-rtr/rtr-origin; - $rtr_origin --cronjob rcynic-data/authenticated && + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show diff --git a/rp/rpki-rtr/rtr-origin b/rp/rpki-rtr/rtr-origin index 73f4474d..24400f77 100755 --- a/rp/rpki-rtr/rtr-origin +++ b/rp/rpki-rtr/rtr-origin @@ -898,7 +898,7 @@ class axfr_set(pdu_set): asn = line[1] self.extend(prefix.from_text(asn, addr) for addr in line[2:]) except OSError, e: - sys.exit("Could not run %s, check your $PATH variable? (%s)" % (scan_roas, e)) + sys.exit("Could not run %s: %s" % (scan_roas, e)) try: p = subprocess.Popen((scan_routercerts, rcynic_dir), stdout = subprocess.PIPE) @@ -908,7 +908,7 @@ class axfr_set(pdu_set): key = line[-1] self.extend(router_key.from_text(asn, gski, key) for asn in line[1:-1]) except OSError, e: - sys.exit("Could not run %s, check your $PATH variable? (%s)" % (scan_routercerts, e)) + sys.exit("Could not run %s: %s" % (scan_routercerts, e)) self.sort() for i in xrange(len(self) - 2, -1, -1): @@ -2160,19 +2160,8 @@ def bgpdump_server_main(argv): except KeyboardInterrupt: sys.exit(0) -# Figure out where the scan_roas utility program is today -for scan_roas in (os.path.join(rpki.autoconf.bindir, "scan_roas"), - os.path.normpath(os.path.join(sys.path[0], "..", "utils", "scan_roas")), - "scan_roas"): - if os.path.exists(scan_roas): - break - -# Same for scan_routercerts -for scan_routercerts in (os.path.join(rpki.autoconf.bindir, "scan_routercerts"), - os.path.normpath(os.path.join(sys.path[0], "..", "utils", "scan_routercerts")), - "scan_routercerts"): - if os.path.exists(scan_routercerts): - break +scan_roas = os.path.join(rpki.autoconf.bindir, "scan_roas") +scan_routercerts = os.path.join(rpki.autoconf.bindir, "scan_routercerts") force_zero_nonce = False @@ -2195,6 +2184,10 @@ def usage(msg = None): f.write("\n") f.write("where options are zero or more of:\n") f.write("\n") + f.write("--scan-roas /path/to/scan_roas\n") + f.write("\n") + f.write("--scan-routercerts /path/to/scan_routercerts\n") + f.write("\n") f.write("--syslog facility.warning_priority[.info_priority]\n") f.write("\n") f.write("--zero-nonce\n") @@ -2216,7 +2209,8 @@ if __name__ == "__main__": syslog_facility, syslog_warning, syslog_info = syslog.LOG_DAEMON, syslog.LOG_WARNING, syslog.LOG_INFO - opts, argv = getopt.getopt(sys.argv[1:], "hs:z?", ["help", "syslog=", "zero-nonce"] + main_dispatch.keys()) + opts, argv = getopt.getopt(sys.argv[1:], "hs:z?", ["help", "scan-roas=", "scan-routercerts=", + "syslog=", "zero-nonce"] + main_dispatch.keys()) for o, a in opts: if o in ("-h", "--help", "-?"): usage() @@ -2232,6 +2226,10 @@ if __name__ == "__main__": raise ValueError except: usage("Bad value specified for --syslog option") + elif o == "--scan-roas": + scan_roas = a + elif o == "--scan-routercerts": + scan_routercerts = a elif len(o) > 2 and o[2:] in main_dispatch: if mode is not None: sys.exit("Conflicting modes specified") |