diff options
Diffstat (limited to 'ca/tests')
| -rw-r--r-- | ca/tests/smoketest.py | 4 | ||||
| -rw-r--r-- | ca/tests/xml-parse-test.py | 8 | ||||
| -rw-r--r-- | ca/tests/yamltest.py | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py index fb121525..f52ce984 100644 --- a/ca/tests/smoketest.py +++ b/ca/tests/smoketest.py @@ -1018,7 +1018,7 @@ class allocation(object): bsc_handle = "b", repository_handle = "r", sia_base = s.sia_base, - bpki_cms_cert = rootd_cert, + bpki_cert = rootd_cert, sender_name = s.name, recipient_name = "rootd", peer_contact_uri = "http://localhost:%s/" % rootd_port)) @@ -1030,7 +1030,7 @@ class allocation(object): bsc_handle = "b", repository_handle = "r", sia_base = s.sia_base, - bpki_cms_cert = s.cross_certify(s.parent.name + "-SELF"), + bpki_cert = s.cross_certify(s.parent.name + "-SELF"), sender_name = s.name, recipient_name = s.parent.name, peer_contact_uri = "http://localhost:%s/up-down/%s/%s" % (s.parent.get_rpki_port(), diff --git a/ca/tests/xml-parse-test.py b/ca/tests/xml-parse-test.py index ac276eb4..90c80775 100644 --- a/ca/tests/xml-parse-test.py +++ b/ca/tests/xml-parse-test.py @@ -83,11 +83,11 @@ def lr_tester(elt_in, elt_out, msg): (obj.signing_cert_crl, "Signing certificate CRL"))) # (obj.pkcs10_request, "PKCS #10 request") if isinstance(obj, rpki.left_right.parent_elt): - pprint(((obj.bpki_cms_cert, "CMS certificate"), - (obj.bpki_cms_glue, "CMS glue"))) + pprint(((obj.bpki_cert, "BPKI certificate"), + (obj.bpki_glue, "BPKI glue"))) if isinstance(obj, (rpki.left_right.child_elt, rpki.left_right.repository_elt)): - pprint(((obj.bpki_cert, "Certificate"), - (obj.bpki_glue, "Glue"))) + pprint(((obj.bpki_cert, "BPKI certificate"), + (obj.bpki_glue, "BPKI glue"))) def pp_tester(elt_in, elt_out, msg): assert isinstance(msg, rpki.publication.msg) diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index 44b7b6bf..a279b530 100644 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -208,6 +208,7 @@ class allocation(object): pubd_port = -1 rsync_port = -1 rootd_port = -1 + rrdp_port = -1 rpkic_counter = 0L @classmethod @@ -274,6 +275,7 @@ class allocation(object): if self.runs_pubd: self.pubd_port = self.allocate_port() self.rsync_port = self.allocate_port() + self.rrdp_port = self.allocate_port() if self.is_root: self.rootd_port = self.allocate_port() @@ -502,6 +504,7 @@ class allocation(object): pubd_server_host = "localhost", pubd_server_port = str(self.pubd.pubd_port), publication_rsync_server = "localhost:%s" % self.pubd.rsync_port, + publication_rrdp_notification_uri = "http://localhost:%s/rrdp/notify.xml" % self.pubd.rrdp_port, bpki_servers_directory = self.path(), publication_base_directory = self.path("publication"), rrdp_publication_base_directory = self.path("rrdp-publication"), @@ -698,8 +701,9 @@ def create_root_certificate(db_root): root_uri = "rsync://localhost:%d/rpki/%s-root/root" % (db_root.pubd.rsync_port, db_root.name) - from rpki.publication import rrdp_sia_uri_kludge - root_sia = (root_uri + "/", root_uri + "/root.mft", None, rrdp_sia_uri_kludge) + rrdp_uri = "http://localhost:%s/rrdp/notify.xml" % db.root.pubd.rrdp_port + + root_sia = (root_uri + "/", root_uri + "/root.mft", None, rrdp_uri) root_cert = rpki.x509.X509.self_certify( keypair = root_key, |