aboutsummaryrefslogtreecommitdiff
path: root/rpkid/testbed.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-07-04 20:13:22 +0000
committerRob Austein <sra@hactrn.net>2009-07-04 20:13:22 +0000
commit6462e03109be39a7e6e82ba5c49874d4652b5810 (patch)
treea1154f496b34145a4ac0797505f6619727af3fb2 /rpkid/testbed.py
parent6baa092a44b6ae9d1ffddc8fc6928c9bbb368124 (diff)
Clean up and consolidate traceback. Add methods to hide (some of the)
mucking about with msg.type variables. Include query PDU tags in reply <report_error/> PDUs. svn path=/rpkid/irbe-setup.py; revision=2571
Diffstat (limited to 'rpkid/testbed.py')
-rw-r--r--rpkid/testbed.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index c2be102c..698f986e 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -758,8 +758,7 @@ class allocation(object):
assert isinstance(pdus, (list, tuple))
assert self.rpki_port is not None
- msg = rpki.left_right.msg(pdus)
- msg.type = "query"
+ msg = rpki.left_right.msg.query(pdus)
cms, xml = rpki.left_right.cms_msg.wrap(msg, self.irbe_key, self.irbe_cert,
pretty_print = True)
rpki.log.debug(xml)
@@ -1146,8 +1145,7 @@ def call_pubd(pdus, cb):
response.
"""
rpki.log.info("Calling pubd")
- msg = rpki.publication.msg(pdus)
- msg.type = "query"
+ msg = rpki.publication.msg.query(pdus)
cms, xml = rpki.publication.cms_msg.wrap(msg, pubd_irbe_key, pubd_irbe_cert,
pretty_print = True)
rpki.log.debug(xml)