diff options
| author | Michael Elkins <melkins@tislabs.com> | 2011-10-09 15:09:32 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2011-10-09 15:09:32 +0000 |
| commit | 1a4d68fa8507eba269b28b4964fa3432a5755507 (patch) | |
| tree | 17c56cd42a729ba69a75db31d689799b826750dc | |
| parent | 1b0816c8a7a22639838c47cf3542b71dbcd09bd8 (diff) | |
update rcynic_xml_iterator to support new attributes for validation_status element in rcynic output format
svn path=/rpkid/rpki/rcynic.py; revision=4030
| -rw-r--r-- | rpkid/rpki/rcynic.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rpkid/rpki/rcynic.py b/rpkid/rpki/rcynic.py index 61ef2248..c29f5605 100644 --- a/rpkid/rpki/rcynic.py +++ b/rpkid/rpki/rcynic.py @@ -232,11 +232,12 @@ class rcynic_xml_iterator(object): timestamp = validation_status.get("timestamp") status = validation_status.get("status") uri = validation_status.text.strip() - ok = status == "validation_ok" + generation = validation_status.get("generation") + ok = status == "object_accepted" filename = os.path.join(self.authenticated_subdir if ok else self.unauthenticated_subdir, self.uri_to_filename(uri)) ext = os.path.splitext(filename)[1] if ext in file_name_classes: - yield file_name_classes[ext](filename = filename, uri = uri, ok = ok, status = status, timestamp = timestamp) + yield file_name_classes[ext](filename = filename, uri = uri, ok = ok, status = status, timestamp = timestamp, generation = generation) def label_iterator(xml_file): """ |