diff options
Diffstat (limited to 'ca')
| -rw-r--r-- | ca/Makefile.in | 64 | ||||
| -rw-r--r-- | ca/doc/README | 16 | ||||
| -rw-r--r-- | ca/doc/mainpage.py | 71 | ||||
| -rw-r--r-- | ca/doc/pubd-bpki.dot | 42 | ||||
| -rw-r--r-- | ca/doc/rpkid-bpki.dot | 76 | ||||
| -rw-r--r-- | ca/tests/revoke.yaml | 60 | ||||
| -rw-r--r-- | ca/tests/smoketest.1.yaml | 4 | ||||
| -rw-r--r-- | ca/tests/smoketest.3.yaml | 12 | ||||
| -rw-r--r-- | ca/tests/smoketest.7.yaml | 4 | ||||
| -rw-r--r-- | ca/tests/smoketest.py | 8 | ||||
| -rw-r--r-- | ca/tests/yamltest-test-all.sh | 6 |
11 files changed, 54 insertions, 309 deletions
diff --git a/ca/Makefile.in b/ca/Makefile.in index 0764edc1..317b8395 100644 --- a/ca/Makefile.in +++ b/ca/Makefile.in @@ -55,73 +55,23 @@ uninstall deinstall:: distclean:: rm -f installed -dont-run-trang: - touch *.rng - -relaxng: left-right-schema.rng up-down-schema.rng publication-schema.rng +relaxng: cd tests; $(MAKE) protocol-samples - xmllint --noout --relaxng left-right-schema.rng tests/left-right-protocol-samples/*.xml - xmllint --noout --relaxng up-down-schema.rng tests/up-down-protocol-samples/*.xml - xmllint --noout --relaxng publication-schema.rng tests/publication-protocol-samples/*.xml + xmllint --noout --relaxng ../schemas/relaxng/left-right-schema.rng tests/left-right-protocol-samples/*.xml + xmllint --noout --relaxng ../schemas/relaxng/up-down-schema.rng tests/up-down-protocol-samples/*.xml + xmllint --noout --relaxng ../schemas/relaxng/publication-schema.rng tests/publication-protocol-samples/*.xml unit-tests: all PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD ${PYTHON} $$i; done -all-tests:: unit-tests - -all-tests:: relaxng +all-tests:: unit-tests relaxng test all-tests parse-test profile yamltest yamlconf:: all cd tests; $(MAKE) $@ -tags: Makefile - find . -type d -name build -prune -o -type f \( -name '*.py' -o -name '*.sql' -o -name '*.rnc' -o -name '*.py.in' \) ! -name relaxng.py ! -name sql_schemas.py -print | etags - - -lint: - pylint --rcfile ${abs_top_srcdir}/buildtools/pylint.rc rpki/*.py rpki/irdb/*.py *.py tests/*.py - -# Documentation - -doc/pubd.dot: pubd.sql - sh ${abs_top_srcdir}/buildtools/graphviz-sql.sh $? >$@ - -doc/rpkid.dot: rpkid.sql - sh ${abs_top_srcdir}/buildtools/graphviz-sql.sh $? >$@ - -.SUFFIXES: .dot .png .pdf .eps - -.dot.pdf: - dot -Tps2 $? | ps2pdf - $@ - -.dot.eps: - dot -o $@ -Teps $? - -.dot.png: - dot -o $@ -Tpng $? - -dot: doc/pubd.dot doc/rpkid.dot - -eps: doc/pubd.eps doc/rpkid.eps doc/rpkid-bpki.eps doc/pubd-bpki.eps - -png: doc/pubd.png doc/rpkid.png doc/rpkid-bpki.png doc/pubd-bpki.png - -pdf: doc/pubd.pdf doc/rpkid.pdf doc/rpkid-bpki.pdf doc/pubd-bpki.pdf - -docclean: - rm -rf doc/html doc/latex doc/xml - rm -f doc/*.eps doc/*.pdf doc/*.png - rm -f doc/pubd.dot doc/rpkid.dot - -html: dot eps png - TZ='' IMAGE_PATH=${abs_builddir}/doc doxygen - -docs: dot eps png html pdf - -## - -distclean:: clean docclean +distclean:: clean cd tests; ${MAKE} $@ - rm -f TAGS Makefile + rm -f Makefile all:: examples/rpki.conf diff --git a/ca/doc/README b/ca/doc/README deleted file mode 100644 index 33902d7e..00000000 --- a/ca/doc/README +++ /dev/null @@ -1,16 +0,0 @@ -$Id$ - -Internals documentation for the RPKI CA tools. - -Once upon a time this included the hand-written documentation for the -CA tools, but that is now part of the overall package documentation. -What's left here is just what Doxygen generates from the source code -and a few Graphviz diagrams. - -At the moment the control for the stuff generated here is still -../Makefile, that may change at some point. - -We no longer generate the documentation here automatically, as it's -kind of large and we're not sure anybody else cares about it, so if -you want this manual you'll have to install Doxygen and build it -yourself. diff --git a/ca/doc/mainpage.py b/ca/doc/mainpage.py deleted file mode 100644 index 4570547b..00000000 --- a/ca/doc/mainpage.py +++ /dev/null @@ -1,71 +0,0 @@ -## @file -# @details -# Doxygen documentation source, expressed as Python comments to make Doxygen happy. -# -# $Id$ -# -# Copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. -# -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -## @mainpage RPKI Engine Reference Manual -# -# This collection of Python modules implements an RPKI CA engine. -# -# See http://trac.rpki.net/ for the RPKI tools package documentation. -# -# The documentation you're reading is generated automatically by -# Doxygen from comments and documentation in -# <a href="http://trac.rpki.net/browser/trunk">the code</a>. -# -# At one point this manual also included documentation for the CA -# tools, but that has been integrated into the overall package -# documentation. This manual is now just the CA tools internals. - -## @page sql-schemas SQL database schemas -# -# @li @subpage rpkid-sql "rpkid database schema" -# @li @subpage pubd-sql "pubd database schema" - -## @page rpkid-sql rpkid SQL schema -# -# @image html rpkid.png "Diagram of rpkid.sql" -# @image latex rpkid.eps "Diagram of rpkid.sql" height=\textheight -# -# @verbinclude rpkid.sql - -## @page pubd-sql pubd SQL Schema -# -# @image html pubd.png "Diagram of pubd.sql" -# @image latex pubd.eps "Diagram of pubd.sql" width=\textwidth -# -# @verbinclude pubd.sql - -# Local Variables: -# mode:python -# compile-command: "cd ../.. && ./config.status && cd rpkid && make docs" -# End: diff --git a/ca/doc/pubd-bpki.dot b/ca/doc/pubd-bpki.dot deleted file mode 100644 index 44ad8a90..00000000 --- a/ca/doc/pubd-bpki.dot +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// Color code: -// Black: Operating entity -// Red: Cross-certified client -// -// Shape code: -// Octagon: TA -// Diamond: CA -// Record: EE - -digraph bpki_pubd { - splines = true; - size = "14,14"; - node [ fontname = Times, fontsize = 9 ]; - - // Operating entity - node [ color = black, fontcolor = black, shape = record ]; - TA [ shape = octagon, label = "BPKI TA" ]; - pubd [ label = "pubd|{HTTPS server|CMS}" ]; - ctl [ label = "Control|{HTTPS client|CMS}" ]; - - // Clients - node [ color = red, fontcolor = red, shape = diamond ]; - Alice_CA; - Bob_CA; - node [ color = red, fontcolor = red, shape = record ]; - Alice_EE [ label = "Alice\nEE|{HTTPS client|CMS}" ]; - Bob_EE [ label = "Bob\nEE|{HTTPS client|CMS}" ]; - - edge [ color = black, style = dotted ]; - TA -> pubd; - TA -> ctl; - - edge [ color = black, style = solid ]; - TA -> Alice_CA; - TA -> Bob_CA; - - edge [ color = red, style = solid ]; - Alice_CA -> Alice_EE; - Bob_CA -> Bob_EE; -} diff --git a/ca/doc/rpkid-bpki.dot b/ca/doc/rpkid-bpki.dot deleted file mode 100644 index 651591cb..00000000 --- a/ca/doc/rpkid-bpki.dot +++ /dev/null @@ -1,76 +0,0 @@ -// $Id$ - -// Color code: -// Black: Hosting entity -// Blue: Hosted entity -// Red: Cross-certified peer -// -// Shape code: -// Octagon: TA -// Diamond: CA -// Record: EE - -digraph bpki_rpkid { - splines = true; - size = "14,14"; - node [ fontname = Times, fontsize = 9 ]; - - // Hosting entity - node [ color = black, shape = record ]; - TA [ shape = octagon, label = "BPKI TA" ]; - rpkid [ label = "rpkid|{HTTPS server|HTTPS left-right client|CMS left-right}" ]; - irdbd [ label = "irdbd|{HTTPS left-right server|CMS left-right}" ]; - irbe [ label = "IRBE|{HTTPS left-right client|CMS left-right}" ]; - - // Hosted entities - node [ color = blue, fontcolor = blue ]; - Alice_CA [ shape = diamond ]; - Alice_EE [ label = "Alice\nBSC EE|{HTTPS up-down client|CMS up-down}" ]; - Ellen_CA [ shape = diamond ]; - Ellen_EE [ label = "Ellen\nBSC EE|{HTTPS up-down client|CMS up-down}" ]; - - // Peers - node [ color = red, fontcolor = red, shape = diamond ]; - Bob_CA; - Carol_CA; - Dave_CA; - Frank_CA; - Ginny_CA; - Harry_CA; - node [ shape = record ]; - Bob_EE [ label = "Bob\nEE|{HTTPS up-down|CMS up-down}" ]; - Carol_EE [ label = "Carol\nEE|{HTTPS up-down|CMS up-down}" ]; - Dave_EE [ label = "Dave\nEE|{HTTPS up-down|CMS up-down}" ]; - Frank_EE [ label = "Frank\nEE|{HTTPS up-down|CMS up-down}" ]; - Ginny_EE [ label = "Ginny\nEE|{HTTPS up-down|CMS up-down}" ]; - Harry_EE [ label = "Bob\nEE|{HTTPS up-down|CMS up-down}" ]; - - edge [ color = black, style = solid ]; - TA -> Alice_CA; - TA -> Ellen_CA; - - edge [ color = black, style = dotted ]; - TA -> rpkid; - TA -> irdbd; - TA -> irbe; - - edge [ color = blue, style = solid ]; - Alice_CA -> Bob_CA; - Alice_CA -> Carol_CA; - Alice_CA -> Dave_CA; - Ellen_CA -> Frank_CA; - Ellen_CA -> Ginny_CA; - Ellen_CA -> Harry_CA; - - edge [ color = blue, style = dotted ]; - Alice_CA -> Alice_EE; - Ellen_CA -> Ellen_EE; - - edge [ color = red, style = solid ]; - Bob_CA -> Bob_EE; - Carol_CA -> Carol_EE; - Dave_CA -> Dave_EE; - Frank_CA -> Frank_EE; - Ginny_CA -> Ginny_EE; - Harry_CA -> Harry_EE; -} diff --git a/ca/tests/revoke.yaml b/ca/tests/revoke.yaml index 2edb8335..ae53f0d8 100644 --- a/ca/tests/revoke.yaml +++ b/ca/tests/revoke.yaml @@ -54,7 +54,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -67,7 +67,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 @@ -81,7 +81,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -92,7 +92,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -105,7 +105,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -118,7 +118,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -129,7 +129,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -142,7 +142,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -155,7 +155,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -166,7 +166,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -179,7 +179,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -192,7 +192,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -203,7 +203,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -216,7 +216,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -229,7 +229,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -240,7 +240,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -253,7 +253,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -266,7 +266,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -277,7 +277,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -290,7 +290,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -303,7 +303,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -314,7 +314,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -327,7 +327,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -340,7 +340,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -351,7 +351,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -364,7 +364,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -377,7 +377,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 @@ -388,7 +388,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -401,7 +401,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - name: R0 @@ -414,7 +414,7 @@ kids: cd rcynic-data; pax -rwl . ../$dir; find . -type f -name '*.cer' | sort | - xargs ../../../../utils/uri/uri -s + xargs ../../../../rp/utils/uri -s >../${dir%.data}.uris; sleep 1 - sleep 30 diff --git a/ca/tests/smoketest.1.yaml b/ca/tests/smoketest.1.yaml index 914aaae4..81bc887a 100644 --- a/ca/tests/smoketest.1.yaml +++ b/ca/tests/smoketest.1.yaml @@ -52,7 +52,7 @@ kids: --- - shell set -x; - rtr_origin='python ../../../rtr-origin/rtr-origin.py'; + rtr_origin='python ../../../rp/rpki-rtr/rtr-origin.py'; $rtr_origin --cronjob rcynic-data/authenticated && $rtr_origin --show --- @@ -70,7 +70,7 @@ kids: ipv4: 10.3.0.1/32, 10.0.0.44/32 --- - shell set -x; - rtr_origin='python ../../../rtr-origin/rtr-origin.py'; + rtr_origin='python ../../../rp/rpki-rtr/rtr-origin.py'; $rtr_origin --cronjob rcynic-data/authenticated && $rtr_origin --show --- diff --git a/ca/tests/smoketest.3.yaml b/ca/tests/smoketest.3.yaml index e6a10a12..41a88643 100644 --- a/ca/tests/smoketest.3.yaml +++ b/ca/tests/smoketest.3.yaml @@ -51,17 +51,17 @@ kids: ipv4: 10.3.0.0/23 --- #- shell find publication -type f -name '*.roa' -# -print -exec ../../../utils/print_roa/print_roa {} \; +# -print -exec ../../../rp/utils/print_roa {} \; #- shell find publication -type f -name '*.mft' -# -print -exec ../../../utils/print_manifest/print_manifest {} \; +# -print -exec ../../../rp/utils/print_manifest {} \; #--- #- shell find publication -type f -name '*.roa' -# -print -exec ../../../utils/print_roa/print_roa {} \; +# -print -exec ../../../rp/utils/print_roa {} \; #- shell find publication -type f -name '*.mft' -# -print -exec ../../../utils/print_manifest/print_manifest {} \; +# -print -exec ../../../rp/utils/print_manifest {} \; #--- - shell set -x; - rtr_origin=../../../rtr-origin/rtr-origin; + rtr_origin=../../../rp/rpki-rtr/rtr-origin; $rtr_origin --cronjob rcynic-data/authenticated && $rtr_origin --show --- @@ -76,6 +76,6 @@ kids: ipv6: 2002:0a00::/32-128 --- - shell set -x; - rtr_origin=../../../rtr-origin/rtr-origin; + rtr_origin=../../../rp/rpki-rtr/rtr-origin; $rtr_origin --cronjob rcynic-data/authenticated && $rtr_origin --show diff --git a/ca/tests/smoketest.7.yaml b/ca/tests/smoketest.7.yaml index fedd2fff..7c808552 100644 --- a/ca/tests/smoketest.7.yaml +++ b/ca/tests/smoketest.7.yaml @@ -70,8 +70,8 @@ roa_request: --- - shell set -x; find publication -type f -name '*.roa' - -print -exec ../../../utils/print_roa/print_roa {} \; + -print -exec ../../../rp/utils/print_roa {} \; ; - rtr_origin=../../../rtr-origin/rtr-origin; + rtr_origin=../../../rp/rpki-rtr/rtr-origin; $rtr_origin --cronjob rcynic-data/authenticated && $rtr_origin --show diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py index 28bedaa4..e5f5a754 100644 --- a/ca/tests/smoketest.py +++ b/ca/tests/smoketest.py @@ -115,14 +115,14 @@ prog_poke = cfg.get("prog_poke", "../testpoke.py") prog_rootd = cfg.get("prog_rootd", "../../rootd") prog_pubd = cfg.get("prog_pubd", "../../pubd") prog_rsyncd = cfg.get("prog_rsyncd", "rsync") -prog_rcynic = cfg.get("prog_rcynic", "../../../rcynic/rcynic") +prog_rcynic = cfg.get("prog_rcynic", "../../../rp/rcynic/rcynic") prog_openssl = cfg.get("prog_openssl", "../../../openssl/openssl/apps/openssl") -rcynic_stats = cfg.get("rcynic_stats", "echo ; ../../../rcynic/rcynic-text %s.xml ; echo" % rcynic_name) +rcynic_stats = cfg.get("rcynic_stats", "echo ; ../../../rp/rcynic/rcynic-text %s.xml ; echo" % rcynic_name) -rpki_sql_file = cfg.get("rpki_sql_file", "../rpkid.sql") +rpki_sql_file = cfg.get("rpki_sql_file", "../../schemas/sql/rpkid.sql") irdb_sql_file = cfg.get("irdb_sql_file", "old_irdbd.sql") -pub_sql_file = cfg.get("pub_sql_file", "../pubd.sql") +pub_sql_file = cfg.get("pub_sql_file", "../../schemas/sql/pubd.sql") startup_delay = int(cfg.get("startup_delay", "10")) diff --git a/ca/tests/yamltest-test-all.sh b/ca/tests/yamltest-test-all.sh index 8daea04e..4bd5c560 100644 --- a/ca/tests/yamltest-test-all.sh +++ b/ca/tests/yamltest-test-all.sh @@ -43,9 +43,9 @@ do do sleep 30 date - ../../rcynic/rcynic - ../../rcynic/rcynic-text rcynic.xml - ../../utils/scan_roas/scan_roas rcynic-data/authenticated + ../../rp/rcynic/rcynic + ../../rp/rcynic/rcynic-text rcynic.xml + ../../rp/utils/scan_roas rcynic-data/authenticated date echo "$title" done |