diff options
author | Rob Austein <sra@hactrn.net> | 2014-11-03 22:02:18 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2014-11-03 22:02:18 +0000 |
commit | 6ff4e63a4950f04cff6936ae81a2c6e6f2dfc1c4 (patch) | |
tree | 1b4c737e1ce3dabd8f94ae2093fd8e0221dfe9f6 /rpki | |
parent | 4406e161107e8f767646862d2b7e2f8938740225 (diff) |
Another SAX -> ETree fix.
svn path=/branches/tk705/; revision=6003
Diffstat (limited to 'rpki')
-rw-r--r-- | rpki/rpkic.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/rpki/rpkic.py b/rpki/rpkic.py index 8529026b..d324948f 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -47,6 +47,8 @@ import rpki.x509 import rpki.async import rpki.version +from lxml.etree import Element, SubElement + from rpki.cli import Cmd, parsecmd, cmdarg class BadPrefixSyntax(Exception): "Bad prefix syntax." @@ -640,16 +642,18 @@ class main(Cmd): Show published objects. """ - for pdu in self.zoo.call_rpkid( - rpki.left_right.list_published_objects_elt.make_pdu(self_handle = self.zoo.handle)): + q_msg = self.zoo._compose_left_right_query() + SubElement(q_msg, rpki.left_right.tag_list_published_objects, self_handle = self.zoo.handle) - track = rpki.x509.uri_dispatch(pdu.uri)(Base64 = pdu.obj).tracking_data(pdu.uri) - child = pdu.child_handle + for r_pdu in self.zoo.call_rpkid(q_msg): + uri = r_pdu.get("uri") + track = rpki.x509.uri_dispatch(uri)(Base64 = r_pdu.text).tracking_data(uri) + child_handle = r_pdu.get("child_handle") - if child is None: + if child_handle is None: print track else: - print track, child + print track, child_handle @parsecmd(argsubparsers) |