Merge lp:~roadmr/checkbox/image-info-parsers into lp:checkbox

[Daniel Manrique]

checkbox-support:parsers: adds parsing of bto.xml, recovery_info and buildstamp attachments.

Adds 3 new parsers dealing with the image and recovery info attachments.

 - Bto.xml parser
 - recovery_info attachment parser
 - buildstamp parser

Each of these comprises 2 commits: one adding the subparser with plainbox dev parse support and unit tests, and another integrating it with the submission parser, including integration tests with that and modifications to the TestRun class so "plainbox dev parse submission" does the right thing.

I rolled these into one merge request since they're somewhat related but I can also split into separate MRs.

[Zygmunt Krynicki (zyga)]

Sorry for starving this. I will review this today.

[Zygmunt Krynicki (zyga)]

This looks good but I have two general comments below. Please have a look. Perhaps we could do a one-off camelCase -> under_score patch next?

review: Approve

=== added file 'checkbox-support/checkbox_support/parsers/image_info.py'
--- checkbox-support/checkbox_support/parsers/image_info.py	1970-01-01 00:00:00 +0000
+++ checkbox-support/checkbox_support/parsers/image_info.py	2015-05-25 19:30:44 +0000
@@ -0,0 +1,194 @@
+# This file is part of Checkbox.
+#
+# Copyright 2011-2015 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Parsers for OEM image information.
+
+There are 3 possible attachments containing data relevant to OEM images::
+
+    * /etc/buildstamp
+    * recovery_info_attachment
+    * dell_bto_xml_attachment
+
+A class is provided to parse each of these.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import io
+from xml.dom import minidom
+from xml.parsers.expat import ExpatError
+
+
+class ImageInfoResult():
+
+    """
+    A simple class to hold image information results.
+
+    It has methods for all the parser classes in this module so it can be
+    easily reused.
+
+    """
+
+    def __init__(self):
+        self.image_info = {}
+
+    def addBuildstampInfo(self, data):
+        """Add the given buildstamp."""
+        self.image_info['buildstamp'] = data
+
+    def addImageVersionInfo(self, key, data):
+        """Add image version data under the given key."""
+        self.image_info[key] = data
+
+
+class BtoInfoResult():
+
+    """A simple class to hold BTO information results."""
+
+    def __init__(self):
+        self.bto_info = {}
+
+    def addBtoInfo(self, key, data):
+        """Add bto data under the given key."""
+        self.bto_info[key] = data
+
+
+class BuildstampParser():
+
+    """
+    Parser for the info/buildstamp attachment.
+
+    Buildstamp is quite unstructured, so the parser is very simple, it will
+    just verify that the attachment contains exactly 2 lines and call the
+    addBuildstamp method of the resutl class with the entire content of the
+    second line.
+    """
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def run(self, result):
+        """Parse stream and set the buildstamp in the result."""
+        buildstamp = ""
+        for index, line in enumerate(self.stream):
+            if index == 1:
+                buildstamp = line
+            if index >= 2 and line.strip() != '':
+                # It contains more than 2 non-blank
+                # lines, so exit right now,
+                # this attachment looks bogus.
+                return
+        if buildstamp.strip():
+            result.addBuildstampInfo(buildstamp.strip())
+
+
+class RecoveryInfoParser():
+
+    """
+    Parser for recovery_info.
+
+    Recovery_info can contain two keys: image_version and bto_version.
+
+    """
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def run(self, result):
+        """Parse stream and set the version attributes in the result."""
+        for line in self.stream:
+            try:
+                key, value = line.split(":", 1)
+            except (ValueError, AttributeError):
+                # Just skip this line
+                pass
+            else:
+                key = key.strip()
+                value = value.strip()
+                if key in ("image_version", "bto_version") and value:
+                    result.addImageVersionInfo(key, value)
+
+
+class BtoParser():
+
+    """Parser for Dell bto.xml data file."""
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def run(self, result):
+        """
+        Parse stream and set bto attributes in the result.
+
+        Possible BTO attributes are (the result.addBtoInfo method will be
+        called with each key/value)::
+
+            * iso - a single string with the name of the installed ISO
+            * generator - a single string
+            * bootstrap - a single string
+            * ubiquity - a single string
+            * base - a single string, presumably name of ISO on which this
+              project is based
+            * fish. A list of strings with fish packages (they're .debs)
+        """
+        try:
+            bto_dom = minidom.parse(self.stream)
+        except ExpatError:
+            # Bogus data, give up silently
+            return
+        for key in ['iso', 'generator', 'bootstrap',
+                    'ubiquity', 'base', 'driver']:
+            elems = bto_dom.getElementsByTagName(key)
+            items = [item.firstChild.data for item in elems
+                     if hasattr(item.firstChild, 'data')]
+            if len(items) == 1:
+                result.addBtoInfo(key, items[0])
+            elif len(items) > 1:
+                result.addBtoInfo(key, items)
+
+
+def parse_buildstamp_attachment_output(output):
+    """Parse info/buildstamp attachment output."""
+    stream = io.StringIO(output)
+    parser = BuildstampParser(stream)
+    result = ImageInfoResult()
+    parser.run(result)
+    return result.image_info['buildstamp']
+
+
+def parse_bto_attachment_output(output):
+    """Parse bto.xml attachment output."""
+    stream = io.StringIO(output)
+    parser = BtoParser(stream)
+    result = BtoInfoResult()
+    parser.run(result)
+    return result.bto_info
+
+
+def parse_recovery_info_attachment_output(output):
+    """Parse recovery_info attachment output."""
+    stream = io.StringIO(output)
+    parser = RecoveryInfoParser(stream)
+    result = ImageInfoResult()
+    parser.run(result)
+
+    return {k: result.image_info[k]
+            for k in result.image_info.keys()
+            if k in ("bto_version", "image_version")}

=== modified file 'checkbox-support/checkbox_support/parsers/submission.py'
--- checkbox-support/checkbox_support/parsers/submission.py	2015-05-25 13:19:47 +0000
+++ checkbox-support/checkbox_support/parsers/submission.py	2015-05-25 19:30:44 +0000
@@ -48,6 +48,9 @@
 from checkbox_support.parsers.pci_config import PciSubsystemIdParser
 from checkbox_support.parsers.dkms_info import DkmsInfoParser
 from checkbox_support.parsers.modinfo import MultipleModinfoParser
+from checkbox_support.parsers.image_info import (BtoParser,
+                                                 BuildstampParser,
+                                                 RecoveryInfoParser)
 
 logger = logging.getLogger("checkbox_support.parsers.submission")
 
@@ -179,6 +182,36 @@
             "module": module,
             "attributes": data})
 
+    def addBuildstampInfo(self, buildstamp):
+        self.messages.append({
+            "type": "set-buildstamp",
+            "buildstamp": buildstamp})
+        logger.debug("Setting buildstamp: %s", buildstamp)
+
+    def addImageVersionInfo(self, kind, version):
+        my_type = "set-image-version"
+        if not self.messages or self.messages[-1]["type"] != my_type:
+            self.messages.append({
+                "type": my_type,
+                "image-version": {}})
+
+        message = self.messages[-1]
+        logger.debug("ADDING image version:")
+        logger.debug("%s %s", kind, version)
+        message["image-version"][kind] = version
+
+    def addBtoInfo(self, key, data):
+        my_type = "add-bto-info"
+        if not self.messages or self.messages[-1]["type"] != my_type:
+            self.messages.append({
+                "type": my_type,
+                "bto-info": {}})
+
+        message = self.messages[-1]
+        logger.debug("ADDING BTO info:")
+        logger.debug("%s %s", key, data)
+        message["bto-info"][key] = data
+
     def setKernelCmdline(self, kernel_cmdline):
         self.messages.append({
             "type": "set-kernel-cmdline",
@@ -589,6 +622,9 @@
         register(("test_run", "modprobe",), self.addModprobeInfo)
         register(("test_run", "dkms_info",), self.addDkmsInfo)
         register(("test_run", "modinfo",), self.addModuleInfo)
+        register(("test_run", "bto_info",), self.addBtoInfo)
+        register(("test_run", "buildstamp_info",), self.setBuildstampInfo)
+        register(("test_run", "image_version_info",), self.addImageVersionInfo)
 
         # Register handlers to set information once
         register(("architecture",), self.setArchitecture, count=1)
@@ -649,6 +685,9 @@
             "lspci_standard_config": self.parsePciSubsystemId,
             "dkms_info": self.parseDkmsInfo,
             r"modinfo_attachment": self.parseModinfo,
+            "dell_bto_xml_attachment": self.parseBtoInfo,
+            "recovery_info_attachment": self.parseImageVersionInfo,
+            "info/buildstamp": self.parseBuildstampInfo,
             }
         for context, parser in context_parsers.items():
             if re.search(context, command):
@@ -723,6 +762,20 @@
         self.dispatcher.publishEvent("modinfo", modinfo)
         return DeferredParser(self.dispatcher, "modinfo_result")
 
+    def parseBtoInfo(self, bto_info):
+        self.dispatcher.publishEvent("bto_info", bto_info)
+        return DeferredParser(self.dispatcher, "bto_info_result")
+
+    def parseBuildstampInfo(self, buildstamp_info):
+        self.dispatcher.publishEvent("buildstamp_info", buildstamp_info)
+        return DeferredParser(self.dispatcher, "buildstamp_info_result")
+
+    def parseImageVersionInfo(self, image_version_info):
+        self.dispatcher.publishEvent("image_version_info",
+                                     image_version_info)
+        return DeferredParser(self.dispatcher,
+                              "image_version_info_result")
+
     def parsePciSubsystemId(self, lspci_data):
         self.dispatcher.publishEvent("lspci_data", lspci_data)
         return DeferredParser(self.dispatcher, "pci_subsystem_id_result")
@@ -735,6 +788,18 @@
         parser = MultipleModinfoParser(modinfo)
         parser.run(test_run)
 
+    def setBuildstampInfo(self, test_run, buildstamp_info):
+        parser = BuildstampParser(buildstamp_info)
+        parser.run(test_run)
+
+    def addBtoInfo(self, test_run, bto_info):
+        parser = BtoParser(bto_info)
+        parser.run(test_run)
+
+    def addImageVersionInfo(self, test_run, image_version_info):
+        parser = RecoveryInfoParser(image_version_info)
+        parser.run(test_run)
+
     def addIdentifier(self, identifier):
         try:
             self.identifiers.append(identifier)

=== added file 'checkbox-support/checkbox_support/parsers/tests/fixtures/submission_info_image_info.xml'
--- checkbox-support/checkbox_support/parsers/tests/fixtures/submission_info_image_info.xml	1970-01-01 00:00:00 +0000
+++ checkbox-support/checkbox_support/parsers/tests/fixtures/submission_info_image_info.xml	2015-05-25 19:30:44 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<system version="1.0">
+    <context>
+        <info command="info/buildstamp">kakaduplum Tue, 12 May 2015 06:46:55 +0000
+            somerville-trusty-amd64-osp1-20150512-0
+        </info>
+        <info command="recovery_info_attachment">image_version: somerville-trusty-amd64-osp1-20150512-0
+            bto_version: A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso
+        </info>
+        <info command="dell_bto_xml_attachment">&lt;?xml version="1.0" encoding="utf-8"?&gt;&lt;bto&gt;
+            &lt;date&gt;2015-05-21&lt;/date&gt;
+            &lt;versions&gt;
+            &lt;os/&gt;
+            &lt;iso&gt;A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso&lt;/iso&gt;
+            &lt;generator&gt;1.24.3~somerville11&lt;/generator&gt;
+            &lt;bootstrap&gt;1.36~somerville3&lt;/bootstrap&gt;
+            &lt;ubiquity&gt;2.18.8.8kittyhawk1somerville3&lt;/ubiquity&gt;
+            &lt;/versions&gt;
+            &lt;base&gt;somerville-trusty-amd64-osp1-iso-20150512-0.iso&lt;/base&gt;
+            &lt;fid&gt;
+            &lt;git_tag/&gt;
+            &lt;deb_archive/&gt;
+            &lt;/fid&gt;
+            &lt;fish&gt;
+            &lt;driver md5="ed884782d541974e2a887d6523778656"&gt;libcuda1-346_346.59-0ubuntu1somerville1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="f536d125300b29ccd4d17f585fc9a20d"&gt;nvidia-libopencl1-346_346.59-0ubuntu1somerville1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="d339d194d242043f18ba9df6bc2b2589"&gt;bbswitch-dkms_0.7-2ubuntu1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="9b00de6e7dbc41e7bc62305655c0b7a1"&gt;config-prime-select-intel-all_0.6_all.deb&lt;/driver&gt;
+            &lt;driver md5="b4354596045ca3ec27e96627d5895e18"&gt;nvidia-prime_0.6.2_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="17fcea6133304d332f27acfb0312594e"&gt;screen-resolution-extra_0.17.1_all.deb&lt;/driver&gt;
+            &lt;driver md5="f047ea4d70eb539f8153080103873345"&gt;nvidia-346-uvm_346.59-0ubuntu1somerville1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="91bb933c7e246a61d5f52115cf42c58b"&gt;nvidia-346_346.59-0ubuntu1somerville1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="1d56f62ad2dd5db429db4bfb65416041"&gt;nvidia-settings_346.47-0somerville1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="be80560b798fba58998f32bfecbd208e"&gt;nvidia-opencl-icd-346_346.59-0ubuntu1somerville1_amd64.deb&lt;/driver&gt;
+            &lt;driver md5="3d1fa1561aa23361c3a270a0fa99a0ba"&gt;libvdpau1_1.1-0somerville1_amd64.deb&lt;/driver&gt;
+            &lt;/fish&gt;
+            &lt;logs&gt;
+            &lt;syslog&gt;May 21 16:29:23 ubuntu rsyslogd: [origin software=&amp;quot;rsyslogd&amp;quot; swVersion=&amp;quot;7.4.4&amp;quot; x-pid=&amp;quot;3119&amp;quot; x-info=&amp;quot;http://www.rsyslog.com&amp;quot;] start
+            May 21 16:30:41 ubuntu ubiquity[4393]: log-output -t ubiquity efibootmgr -c -d /dev/sda -p 1 -l \EFI\ubuntu\shimx64.efi -L ubuntu
+            May 21 16:30:41 ubuntu ubiquity[4393]: log-output -t ubiquity umount /mnt/efi
+            &lt;/syslog&gt;
+            &lt;debug&gt;Ubiquity 2.18.8.8kittyhawk1somerville3
+            May 21 16:30:05 ubiquity: ['log-output', '-t', 'ubiquity', '--pass-stdout', '/usr/share/ubiquity/dell-bootstrap'] exited with code 0
+            &lt;/debug&gt;
+            &lt;/logs&gt;
+            &lt;/bto&gt;</info>
+    </context>
+    <summary>
+        <architecture value="amd64"/>
+    </summary>
+</system>

=== added file 'checkbox-support/checkbox_support/parsers/tests/test_image_info.py'
--- checkbox-support/checkbox_support/parsers/tests/test_image_info.py	1970-01-01 00:00:00 +0000
+++ checkbox-support/checkbox_support/parsers/tests/test_image_info.py	2015-05-25 19:30:44 +0000
@@ -0,0 +1,247 @@
+# This file is part of Checkbox.
+#
+# Copyright 2015 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the image_info parsers."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from io import StringIO
+from unittest import TestCase
+
+from checkbox_support.parsers.image_info import (
+    BuildstampParser,
+    RecoveryInfoParser,
+    BtoParser,
+    BtoInfoResult,
+    ImageInfoResult)
+
+
+class TestBuildstampParser(TestCase):
+
+    """Tests for Buildstamp parser class."""
+
+    def _bogus_test(self, string):
+        """
+        Helper to test for bogus data.
+
+        It checks that the given string does NOT produce a valid buildstamp.
+        """
+        stream = StringIO(string)
+        self.parser = BuildstampParser(stream)
+        result = ImageInfoResult()
+        self.parser.run(result)
+        self.assertNotIn("buildstamp", result.image_info)
+
+    def test_one_line(self):
+        """A one-line attachment is bogus, no result."""
+        self._bogus_test("bogus\n")
+
+    def test_two_lines_bogus(self):
+        """A two-line attachment (empty second line) is bogus, no result."""
+        self._bogus_test("bogus\n\n")
+
+    def test_three_lines(self):
+        """A three-line attachment is bogus, no result."""
+        self._bogus_test("bogus\nwith-tree\nlines")
+
+    def test_many_lines_empty_line(self):
+        """Attachment with some empty lines is mostly good, get a result."""
+        stream = StringIO("bogus\nwith-tree\n\n\n")
+        self.parser = BuildstampParser(stream)
+        result = ImageInfoResult()
+        self.parser.run(result)
+        self.assertIn("buildstamp", result.image_info)
+
+    def test_two_lines_good(self):
+        """A three-line attachment is good, check expected value."""
+        stream = StringIO("kakaduplum Tue, 12 May 2015 06:46:55 +0000\n"
+                          "somerville-trusty-amd64-osp1-20150512-0")
+        self.parser = BuildstampParser(stream)
+        result = ImageInfoResult()
+        self.parser.run(result)
+        self.assertIn("buildstamp", result.image_info)
+        self.assertEqual("somerville-trusty-amd64-osp1-20150512-0",
+                         result.image_info["buildstamp"])
+
+
+class TestRecoveryInfoParser(TestCase):
+
+    """Tests for Recovery Info parser class."""
+
+    def _result_for(self, string):
+        """Helper to run string through the parser and return result."""
+        stream = StringIO(string)
+        self.parser = RecoveryInfoParser(stream)
+        result = ImageInfoResult()
+        self.parser.run(result)
+        return result
+
+    def test_bad_data(self):
+        """A bad attachment is bogus, no result."""
+        result = self._result_for("bogus\nlorem\nreally bad\n")
+        self.assertNotIn("image_version", result.image_info)
+        self.assertNotIn("bto_version", result.image_info)
+
+    def test_tricky_data(self):
+        """A validly-formatted attachment with wrong keys. No result."""
+        result = self._result_for("key: value\nkey2: value2")
+        self.assertNotIn("image_version", result.image_info)
+        self.assertNotIn("bto_version", result.image_info)
+
+    def test_empty_data(self):
+        """Attachment with good keys but no data. No result."""
+        result = self._result_for("image_version: \nbto_version:   \n")
+        self.assertNotIn("image_version", result.image_info)
+        self.assertNotIn("bto_version", result.image_info)
+
+    def test_good_data(self):
+        """A good and complete attachment, check expected value."""
+        result = self._result_for(
+            "image_version: somerville-trusty-amd64-osp1-20150512-0\n"
+            "bto_version: "
+            "A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso")
+        self.assertIn("image_version", result.image_info)
+        self.assertEqual("somerville-trusty-amd64-osp1-20150512-0",
+                         result.image_info["image_version"])
+        self.assertIn("bto_version", result.image_info)
+        self.assertEqual(
+            "A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso",
+            result.image_info["bto_version"])
+
+    def test_good_partial_data_image(self):
+        """A good attachment with only image_version, check expected value."""
+        result = self._result_for(
+            "image_version: somerville-trusty-amd64-osp1-20150512-0\n"
+            "bogus: chogus.iso")
+        self.assertIn("image_version", result.image_info)
+        self.assertEqual("somerville-trusty-amd64-osp1-20150512-0",
+                         result.image_info["image_version"])
+        self.assertNotIn("bto_version", result.image_info)
+
+    def test_good_partial_data_bto(self):
+        """A good attachment with only bto_version, check expected value."""
+        result = self._result_for(
+            "bogus: bogon\n"
+            "bto_version: "
+            "A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso")
+        self.assertNotIn("image_version", result.image_info)
+        self.assertIn("bto_version", result.image_info)
+        self.assertEqual(
+            "A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso",
+            result.image_info["bto_version"])
+
+
+BTO1 = """\
+<?xml version="1.0" encoding="utf-8"?><bto>
+  <date>2015-05-21</date>
+  <versions>
+    <os/>
+    <iso>A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso</iso>
+    <generator>1.24.3~somerville11</generator>
+    <bootstrap>1.36~somerville3</bootstrap>
+    <ubiquity>2.18.8.8kittyhawk1somerville3</ubiquity>
+  </versions>
+  <base>somerville-trusty-amd64-osp1-iso-20150512-0.iso</base>
+  <fid>
+    <git_tag/>
+    <deb_archive/>
+  </fid>
+  <fish>
+    <driver md5="ed884782d541974e2a887d6523778656">libcuda1-346_346.59-0ubuntu1somerville1_amd64.deb</driver>
+    <driver md5="f536d125300b29ccd4d17f585fc9a20d">nvidia-libopencl1-346_346.59-0ubuntu1somerville1_amd64.deb</driver>
+  </fish>
+  <logs>
+    <syslog>blah</syslog>
+  </logs>
+</bto>
+"""
+
+BTO2 = """\
+<?xml version="1.0" encoding="utf-8"?><bto>
+  <date>2015-05-21</date>
+  <versions>
+    <os/>
+  </versions>
+  <foo>
+    <bar>baz</bar>
+  </foo>
+</bto>
+"""
+
+BTO3 = """\
+<?xml version="1.0" encoding="utf-8"?><bto>
+  <date>2015-05-21</date>
+  <versions>
+    <os/>
+    <iso></iso>
+    <generator>1.24.3~somerville11</generator>
+  </versions>
+  <base/>
+  <fish>
+    <driver/>
+    <driver md5="f536d125300b29ccd4d17f585fc9a20d">boo.deb</driver>
+    <driver md5="f536d125300b29ccd4d17f585fc9a20a">choo.deb</driver>
+  </fish>
+</bto>
+"""
+
+
+class TestBtoParser(TestCase):
+
+    """Tests for BTO data parser class."""
+
+    def _result_for(self, string):
+        """Helper to run string through the parser and return result."""
+        stream = StringIO(string)
+        self.parser = BtoParser(stream)
+        result = BtoInfoResult()
+        self.parser.run(result)
+        return result
+
+    def test_bad_data(self):
+        """A bad attachment is bogus, no result."""
+        result = self._result_for("bogus\nlorem\nreally bad\n")
+        self.assertEqual({}, result.bto_info)
+
+    def test_bogus_xml(self):
+        """A xml with values we don't want is bogus, no result."""
+        result = self._result_for(BTO2)
+        self.assertEqual({}, result.bto_info)
+
+    def test_tricky_xml(self):
+        """A xml with mix of keys we want and empty values, partial result."""
+        result = self._result_for(BTO3)
+        self.assertDictEqual(
+            {'generator': '1.24.3~somerville11',
+             'driver': ['boo.deb', 'choo.deb']},
+            result.bto_info)
+
+    def test_good_data(self):
+        """A good and complete xml, check expected value."""
+        result = self._result_for(BTO1)
+        expected_dict = {
+            'base': 'somerville-trusty-amd64-osp1-iso-20150512-0.iso',
+            'bootstrap': '1.36~somerville3',
+            'driver': [
+                'libcuda1-346_346.59-0ubuntu1somerville1_amd64.deb',
+                'nvidia-libopencl1-346_346.59-0ubuntu1somerville1_amd64.deb'],
+            'generator': '1.24.3~somerville11',
+            'iso': 'A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso',
+            'ubiquity': '2.18.8.8kittyhawk1somerville3'}
+        self.assertDictEqual(expected_dict, result.bto_info)

=== modified file 'checkbox-support/checkbox_support/parsers/tests/test_submission.py'
--- checkbox-support/checkbox_support/parsers/tests/test_submission.py	2015-05-22 19:24:34 +0000
+++ checkbox-support/checkbox_support/parsers/tests/test_submission.py	2015-05-25 19:30:44 +0000
@@ -68,6 +68,16 @@
         self.result.setdefault('dkms_info', {})
         self.result['dkms_info'][pkg] = details
 
+    def addBuildstampInfo(self, data):
+        self.result['buildstamp'] = data
+
+    def addImageVersionInfo(self, key, data):
+        self.result[key] = data
+
+    def addBtoInfo(self, key, data):
+        self.result.setdefault('bto_info', {})
+        self.result['bto_info'][key] = data
+
     def addAttachment(self, **attachment):
         self.result.setdefault("attachments", [])
         self.result["attachments"].append(attachment)
@@ -348,6 +358,57 @@
         self.assertEqual(['crypto-ctr', 'ctr', 'crypto-rfc3686', 'rfc3686'],
                          result['modinfo']['ctr']['alias'])
 
+    def test_buildstamp(self):
+        """
+        test buildstamp attachment.
+
+        Buildstamp is in the image_info element if there was a buildstamp
+        attachment.
+        """
+        result = self.getResult("submission_info_image_info.xml")
+        self.assertTrue("buildstamp" in result)
+        self.assertEqual('somerville-trusty-amd64-osp1-20150512-0',
+                         result['buildstamp'])
+
+    def test_image_info(self):
+        """
+        test image_info attachment.
+
+        We should have image versions in the image_info element if there was a
+        recovery_info attachment.
+        """
+        result = self.getResult("submission_info_image_info.xml")
+        self.assertTrue("image_version" in result)
+        self.assertEqual('somerville-trusty-amd64-osp1-20150512-0',
+                         result['image_version'])
+        self.assertTrue("bto_version" in result)
+        self.assertEqual(
+            'A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso',
+            result['bto_version'])
+
+    def test_bto_info(self):
+        """bto data if there was a bto.xml attachment."""
+        result = self.getResult("submission_info_image_info.xml")
+        self.assertTrue("bto_info" in result)
+        self.assertDictEqual(
+            {'base': 'somerville-trusty-amd64-osp1-iso-20150512-0.iso',
+             'bootstrap': '1.36~somerville3',
+             'driver': ['libcuda1-346_346.59-0ubuntu1somerville1_amd64.deb',
+                        'nvidia-libopencl1-346_346.59-0ubuntu1somerville1_amd64.deb',
+                        'bbswitch-dkms_0.7-2ubuntu1_amd64.deb',
+                        'config-prime-select-intel-all_0.6_all.deb',
+                        'nvidia-prime_0.6.2_amd64.deb',
+                        'screen-resolution-extra_0.17.1_all.deb',
+                        'nvidia-346-uvm_346.59-0ubuntu1somerville1_amd64.deb',
+                        'nvidia-346_346.59-0ubuntu1somerville1_amd64.deb',
+                        'nvidia-settings_346.47-0somerville1_amd64.deb',
+                        'nvidia-opencl-icd-346_346.59-0ubuntu1somerville1_amd64.deb',
+                        'libvdpau1_1.1-0somerville1_amd64.deb'],
+             'generator': '1.24.3~somerville11',
+             'iso': 'A00_dell-bto-trusty-miramar-15-17-X01-iso-20150521-0.iso',
+             'ubiquity': '2.18.8.8kittyhawk1somerville3'},
+            result['bto_info'])
+
     def test_test_results(self):
         """Test results are in the questions element."""
         result = self.getResult("submission_questions.xml")

=== modified file 'checkbox-support/setup.py'
--- checkbox-support/setup.py	2015-05-19 13:50:42 +0000
+++ checkbox-support/setup.py	2015-05-25 19:30:44 +0000
@@ -62,6 +62,9 @@
             "pci-subsys-id=checkbox_support.parsers.pci_config:parse_pci_subsys_id",
             "dkms-info=checkbox_support.parsers.dkms_info:parse_dkms_info",
             "modinfo=checkbox_support.parsers.modinfo:parse_modinfo_attachment_output",
+            "buildstamp=checkbox_support.parsers.image_info:parse_buildstamp_attachment_output",
+            "recovery-info=checkbox_support.parsers.image_info:parse_recovery_info_attachment_output",
+            "bto=checkbox_support.parsers.image_info:parse_bto_attachment_output",
         ],
     },
 )