diff options
| author | Rob Austein <sra@hactrn.net> | 2014-07-18 17:08:13 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-07-18 17:08:13 +0000 |
| commit | 0c945963b240cbc0b4155ead94205e9a6956fbf1 (patch) | |
| tree | af08c2d0efc296584fb5d424bd402c425b8308e7 /ca/tests | |
| parent | e2b9b042765d3e42bf9166d3f7980949a38a70b9 (diff) | |
| parent | 4d78736439f3cf313d7f05ee59dbae3822dfbf40 (diff) | |
Pull changes from trunk.
svn path=/branches/tk705/; revision=5903
Diffstat (limited to 'ca/tests')
| -rw-r--r-- | ca/tests/yamlconf.py | 6 | ||||
| -rw-r--r-- | ca/tests/yamltest.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py index acc56497..1b339a89 100644 --- a/ca/tests/yamlconf.py +++ b/ca/tests/yamlconf.py @@ -357,8 +357,10 @@ class allocation(object): path = self.path(fn) if not quiet: print "Writing", path - xmlns = "{http://www.hactrn.net/uris/rpki/router-certificate/}" - xml = lxml.etree.Element(xmlns + "router_certificate_requests", version = "1") + xmlns = rpki.relaxng.router_certificate.xmlns + xml = lxml.etree.Element(xmlns + "router_certificate_requests", + version = rpki.relaxng.router_certificate.version, + nsmap = rpki.relaxng.router_certificate.nsmap) for r in self.router_certs: x = lxml.etree.SubElement(xml, xmlns + "router_certificate_request", router_id = str(r.router_id), diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index a97e2554..0d427cf3 100644 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -432,8 +432,10 @@ class allocation(object): if not args.skip_config: path = self.path(fn) print "Writing", path - xmlns = "{http://www.hactrn.net/uris/rpki/router-certificate/}" - xml = lxml.etree.Element(xmlns + "router_certificate_requests", version = "1") + xmlns = rpki.relaxng.router_certificate.xmlns + xml = lxml.etree.Element(xmlns + "router_certificate_requests", + version = rpki.relaxng.router_certificate.version, + nsmap = rpki.relaxng.router_certificate.nsmap) for r in self.router_certs: x = lxml.etree.SubElement(xml, xmlns + "router_certificate_request", router_id = str(r.router_id), |