diff options
| author | Rob Austein <sra@hactrn.net> | 2014-09-25 04:13:23 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-09-25 04:13:23 +0000 |
| commit | 370b80a69e48dd36bdfd0922dcf65318d6db68f4 (patch) | |
| tree | 09cd5e3a49078fe32aacb18393135805752094a7 /rpki/rpkid_tasks.py | |
| parent | 86bf27d64be4125c9390e485825fa77adc325e0d (diff) | |
Convert remaining rpkid up-down code from SAX to etree.
svn path=/branches/tk705/; revision=5970
Diffstat (limited to 'rpki/rpkid_tasks.py')
| -rw-r--r-- | rpki/rpkid_tasks.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index 959d4223..5405834f 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -176,12 +176,12 @@ class PollParentTask(AbstractTask): def parent_loop(self, parent_iterator, parent): self.parent_iterator = parent_iterator self.parent = parent - rpki.up_down.list_pdu.query(parent, self.got_list, self.list_failed) + parent.up_down_list_query(self.got_list, self.list_failed) def got_list(self, r_msg): self.ca_map = dict((ca.parent_resource_class, ca) for ca in self.parent.cas) self.gctx.checkpoint() - rpki.async.iterator(r_msg.payload.classes, self.class_loop, self.class_done) + rpki.async.iterator(r_msg.getiterator(rpki.up_down.tag_class), self.class_loop, self.class_done) def list_failed(self, e): logger.exception("Couldn't get resource class list from parent %r, skipping", self.parent) @@ -191,7 +191,7 @@ class PollParentTask(AbstractTask): self.gctx.checkpoint() self.class_iterator = class_iterator try: - ca = self.ca_map.pop(rc.class_name) + ca = self.ca_map.pop(rc.get("class_name")) except KeyError: rpki.rpkid.ca_obj.create(self.parent, rc, class_iterator, self.class_create_failed) else: |