Merge lp:~shawn111/checkbox/image_info into lp:checkbox

[Shawn Wang]

providers:checkbox: add jobs of recovery_info

jobs: dell_recovery_info_attachment, dell_bto_xml_attachment
put jobs into whitelists

Those information come from recovery partition.

[Shawn Wang (shawn111)]

3732. is for buildstamp, it is related but not a new job

[Zygmunt Krynicki (zyga)]

-1, please use python3. We don't accept new python2 code anymore as python2 is being removed from the Desktop images.

review: Needs Fixing

[Zygmunt Krynicki (zyga)]

Also, please squash fixes:

add foo
fix typo in foo
ohh more typo
pep 8 fyx to foo script
add bar

History like this is useless. Please rewrite the history (using git rebase -i) to look like this:

add foo
add bar

[Zygmunt Krynicki (zyga)]

More inline comments below. Please ping me again after addressing all of the comments.

One more thing, to make it explicit: please define the version of Ubuntu that this script aims to support. This is important for things like udisks API and transition processes. Define your requirements and we'll see what to do about that.

Lastly. I'm somewhat tempted to move all of the DELL-specific stuff into a DELL provider though this can be done later.

[Daniel Manrique (roadmr)]

I replied to a couple of questions below and also made a suggestion on how to target this to Dell systems only. Note that the recovery_info stuff may be specific to Dell, but the buildstamp job is not, and it should be present on all OEM systems.

[lp:~shawn111/checkbox/image_info]

3741. By Maciej Kisielewski on 2015-04-29

"automatic merge of lp:~kissiel/checkbox/fix-1450052-barajas-provider-name/ by tarmac [r=zyga][bug=1450052][author=kissiel]"

3742. By Maciej Kisielewski on 2015-04-29

"automatic merge of lp:~kissiel/checkbox/fix-1450057-jobs-naming/ by tarmac [r=zyga][bug=1450057][author=kissiel]"

3743. By Maciej Kisielewski on 2015-04-29

"automatic merge of lp:~kissiel/checkbox/fix-1450048-categorise-qml-native-tests/ by tarmac [r=zyga][bug=1450048][author=kissiel]"

[Shawn Wang (shawn111)]

@Zyga,

I will rewrite by blkid to replace UDisks information.

[lp:~shawn111/checkbox/image_info]

3744. By Maciej Kisielewski on 2015-04-30

"automatic merge of lp:~kissiel/checkbox/fix-1450056/ by tarmac [r=zyga][bug=1450056][author=kissiel]"

3745. By Po-Hsu Lin on 2015-04-30

"automatic merge of lp:~cypressyew/checkbox/ci-systemd-compability/ by tarmac [r=zyga][bug=1450319][author=cypressyew]"

3746. By Launchpad Translations on behalf of checkbox-dev on 2015-05-01

Launchpad automatic translations update.

3747. By Sylvain Pineau on 2015-05-03

"automatic merge of lp:~sylvain-pineau/checkbox/html_exporter_fixes/ by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

3748. By Jeff Lane  on 2015-05-03

"automatic merge of lp:~bladernr/checkbox/revamp-network-test/ by tarmac [r=sylvain-pineau][bug=][author=bladernr]"

3749. By Sylvain Pineau on 2015-05-04

"Release_2015_Week19 [r=sylvain-pineau][bug=1331302,1341769,1347120,1382321,1383447,1387782,1387843,1388055,1388747,1389253,1399481,1400646,1403933,1406719,1410501,1428615,1451343][author=checkbox-dev]"

3750. By Sylvain Pineau on 2015-05-04

plainbox, version bump (0.22dev)

3751. By Po-Hsu Lin on 2015-05-04

"automatic merge of lp:~cypressyew/checkbox/fix-sru-cmd/ by tarmac [r=taihsiangho][bug=1450574][author=cypressyew]"

3752. By Maciej Kisielewski on 2015-05-05

"automatic merge of lp:~kissiel/checkbox/fix-1451541-local-jobs-cdts/ by tarmac [r=sylvain-pineau][bug=1451541][author=kissiel]"

3753. By Maciej Kisielewski on 2015-05-06

"automatic merge of lp:~kissiel/checkbox/fix-1450050-naming/ by tarmac [r=zyga][bug=1450050][author=kissiel]"

3754. By Maciej Kisielewski on 2015-05-06

"automatic merge of lp:~kissiel/checkbox/fix-1450054-progress-bar/ by tarmac [r=zyga][bug=1450054][author=kissiel]"

3755. By Sylvain Pineau on 2015-05-06

"Release_2015_Week19 [r=sylvain-pineau][bug=1331302,1341769,1347120,1382321,1383447,1387782,1387843,1388055,1388747,1389253,1399481,1400646,1403933,1406719,1410501,1428615,1451343,1451541][author=checkbox-dev]"

3756. By Maciej Kisielewski on 2015-05-06

"automatic merge of lp:~kissiel/checkbox/fix-1450047-video-test-on-vivid/ by tarmac [r=zyga][bug=1450047][author=kissiel]"

3757. By Maciej Kisielewski on 2015-05-06

"automatic merge of lp:~kissiel/checkbox/fix-1450061-cbt-release-updates/ by tarmac [r=zyga][bug=1450061][author=kissiel]"

3758. By Maciej Kisielewski on 2015-05-06

"automatic merge of lp:~kissiel/checkbox/checkbox-touch-release/ by tarmac [r=][bug=][author=kissiel]"

3759. By Daniel Manrique on 2015-05-07

"checkbox-support:parsers:submission: add modalias info to package elements
 [r=zyga][bug=][author=roadmr]"

3760. By Po-Hsu Lin on 2015-05-08

"automatic merge of lp:~cypressyew/checkbox/systemd-server/ by tarmac [r=sylvain-pineau][bug=1450319][author=cypressyew]"

3761. By Maciej Kisielewski on 2015-05-08

"automatic merge of lp:~kissiel/checkbox/fix-1450165-autopilot-crash-on-header-actions/ by tarmac [r=zyga][bug=1450165][author=kissiel]"

3762. By Maciej Kisielewski on 2015-05-08

"automatic merge of lp:~kissiel/checkbox/fix-1452782-report-export/ by tarmac [r=zyga][bug=1452782][author=kissiel]"

3763. By Sylvain Pineau on 2015-05-10

"Release_2015_Week19 [r=sylvain-pineau][bug=1331302,1341769,1347120,1382321,1383447,1387782,1387843,1388055,1388747,1389253,1399481,1400646,1403933,1406719,1410501,1428615,1451343,1451541][author=checkbox-dev]"

3764. By Launchpad Translations on behalf of checkbox-dev on 2015-05-11

Launchpad automatic translations update.

3765. By Maciej Kisielewski on 2015-05-11

"automatic merge of lp:~kissiel/checkbox/checkbox-touch-release/ by tarmac [r=kissiel][bug=][author=kissiel]"

3766. By Maciej Kisielewski on 2015-05-12

"automatic merge of lp:~kissiel/checkbox/autopilot-fixes/ by tarmac [r=zyga][bug=][author=kissiel]"

3767. By Maciej Kisielewski on 2015-05-12

"automatic merge of lp:~kissiel/checkbox/fix-1453070-print-header-name/ by tarmac [r=zyga][bug=][author=kissiel]"

3768. By Maciej Kisielewski on 2015-05-12

"automatic merge of lp:~kissiel/checkbox/password-dialog/ by tarmac [r=zyga][bug=][author=kissiel]"

3769. By Zygmunt Krynicki on 2015-05-12

"automatic merge of lp:~zyga/checkbox/haptics-test/ by tarmac [r=kissiel][bug=][author=zyga]"

3770. By Maciej Kisielewski on 2015-05-12

"automatic merge of lp:~kissiel/checkbox/fix-1453067-steps-missing/ by tarmac [r=zyga][bug=1453067][author=kissiel]"

3771. By Po-Hsu Lin on 2015-05-12

"automatic merge of lp:~cypressyew/checkbox/status-fix/ by tarmac [r=zyga][bug=1453015][author=cypressyew]"

3772. By Daniel Manrique on 2015-05-13

"checkbox-support:parsers:submission: Add parsing of modprobe_attachment.

This includes the simple parser as well as the changes to
SubmissionParser and the TestRun class to actually invoke the subparser
when needed and gather the data. [r=zyga][bug=][author=roadmr]"

3773. By Po-Hsu Lin on 2015-05-13

"automatic merge of lp:~cypressyew/checkbox/fix-hibernate-test/ by tarmac [r=zyga][bug=1454524][author=cypressyew]"

[Zygmunt Krynicki (zyga)]

Looks really nice, just a few minor tweaks below. Please flake8 the whole file and try to add tests for the essential functions. Other than that, +1

[lp:~shawn111/checkbox/image_info]

3774. By Daniel Manrique on 2015-05-13

"checkbox-support:parsers:submission: Add parsing of kernel_cmdline_attachment.

This includes the kernel commandline parser as well as the changes to SubmissionParser and the TestRun class to actually invoke the subparser when needed and gather the data, data files and tests. [r=zyga][bug=1454577][author=roadmr]"

3775. By Daniel Manrique on 2015-05-13

"checkbox-support:parsers:submission: Add parsing of PCI subsystem ID.

This is simply obtaining the subsystem ID from the first device as output
by lspci -x (which we have in the lspci_standard_config_attachment). This is
used to uniquely identify some systems.

This includes the simple parser as well as the changes to SubmissionParser and
the TestRun class to actually invoke the subparser when needed and gather the
data.

Also includes unit tests for the parser, integration test for the
SubmissionParser with XML data file, and an entry point so the parser can be
invoked with plainbox dev parse. [r=zyga][bug=][author=roadmr]"

3776. By Po-Hsu Lin on 2015-05-14

"automatic merge of lp:~cypressyew/checkbox/generator-typo-fix/ by tarmac [r=zyga][bug=1454969][author=cypressyew]"

3777. By Zygmunt Krynicki on 2015-05-14

"automatic merge of lp:~zyga/checkbox/fix-win32/ by tarmac [r=kissiel][bug=][author=zyga]"

3778. By Shawn Wang on 2015-05-14

"automatic merge of lp:~shawn111/checkbox/hexr-dkms/ by tarmac [r=zyga][bug=1454577][author=shawn111]"

3779. By Daniel Manrique on 2015-05-14

"providers: Fix dkms_info_attachment. Remove the device_package_info_attachment. [r=zyga][bug=1455197][author=roadmr]"

3780. By Zygmunt Krynicki on 2015-05-15

"automatic merge of lp:~zyga/checkbox/new-pod-features/ by tarmac [r=kissiel][bug=][author=zyga]"

3781. By Sylvain Pineau on 2015-05-18

"automatic merge of lp:~sylvain-pineau/checkbox/fix-1450620/ by tarmac [r=zyga][bug=1450620][author=sylvain-pineau]"

3782. By Po-Hsu Lin on 2015-05-18

"automatic merge of lp:~cypressyew/checkbox/display-rename/ by tarmac [r=zyga][bug=1456022][author=cypressyew]"

3783. By Daniel Manrique on 2015-05-18

"automatic merge of lp:~roadmr/checkbox/dkms_info_subparser/ by tarmac [r=zyga][bug=][author=roadmr]"

3784. By Zygmunt Krynicki on 2015-05-18

"automatic merge of lp:~zyga/checkbox/better-check-config/ by tarmac [r=sylvain-pineau][bug=][author=zyga]"

3785. By Zygmunt Krynicki on 2015-05-18

"automatic merge of lp:~zyga/checkbox/fix-1456142/ by tarmac [r=sylvain-pineau,kissiel][bug=1456142][author=zyga]"

3786. By Sylvain Pineau on 2015-05-18

"automatic merge of lp:~sylvain-pineau/checkbox/fix-1456176/ by tarmac [r=zyga][bug=][author=sylvain-pineau]"

3787. By Zygmunt Krynicki on 2015-05-18

"automatic merge of lp:~zyga/checkbox/xml-jinja/ by tarmac [r=zyga,sylvain-pineau][bug=][author=zyga]"

3788. By Launchpad Translations on behalf of checkbox-dev on 2015-05-19

Launchpad automatic translations update.

3789. By Po-Hsu Lin on 2015-05-19

"automatic merge of lp:~cypressyew/checkbox/add-before-s3-graphic-tests/ by tarmac [r=sylvain-pineau][bug=1456010][author=cypressyew]"

3790. By Po-Hsu Lin on 2015-05-19

"automatic merge of lp:~cypressyew/checkbox/14.04.3-testplan/ by tarmac [r=sylvain-pineau][bug=1454977][author=cypressyew]"

[Shawn Wang (shawn111)]

@Zyga,

I added some unittest and fix flake8 issues.
Thanks.

However, I didn't really do all the tests.
I bypassed some tests of stdout.

[Zygmunt Krynicki (zyga)]

Hey.

There are some tools that can capture stdout for you. We have some in
plainbox and I believe there are tools like that now in python
standard library. Ping me on IRC if you want to discuss this further.
I'll check out the code later today.

On Tue, May 19, 2015 at 3:17 PM, Shawn Wang <email address hidden> wrote:
> @Zyga,
>
> I added some unittest and fix flake8 issues.
> Thanks.
>
> However, I didn't really do all the tests.
> I bypassed some tests of stdout.
> --
> https://code.launchpad.net/~shawn111/checkbox/image_info/+merge/257761
> You are reviewing the proposed merge of lp:~shawn111/checkbox/image_info into lp:checkbox.

[lp:~shawn111/checkbox/image_info]

3791. By Zygmunt Krynicki on 2015-05-19

"automatic merge of lp:~zyga/checkbox/fix-1456560/ by tarmac [r=sylvain-pineau][bug=1456560][author=zyga]"

3792. By Daniel Manrique on 2015-05-19

"checkbox-support:parsers:submission: Adds modinfo_attachment parsing.

This includes the changes to the SubmissionParser and result class themselves, testing data file and "integration" tests, changes to the existing ModinfoParser and addition of new MultipleModinfoParser (with tests), and some PEP257 fixes to legacy code.
 [r=roadmr,zyga][bug=][author=roadmr]"

[Sylvain Pineau (sylvain-pineau)]

Could you please also add the two new jobs to the following testplan units:

plainbox-provider-certification-client/units/client-cert-14-04-3.pxu
plainbox-provider-certification-client/units/client-cert-14-04.pxu

+1 minor inline typo

review: Needs Fixing

[lp:~shawn111/checkbox/image_info]

3793. By Po-Hsu Lin on 2015-05-19

"automatic merge of lp:~cypressyew/checkbox/add-tb-monitor-generator/ by tarmac [r=sylvain-pineau][bug=1456462][author=cypressyew]"

3794. By Maciej Kisielewski on 2015-05-19

"automatic merge of lp:~kissiel/checkbox/fix-1455033-sensors-on-desktop/ by tarmac [r=zyga][bug=1455033][author=kissiel]"

3795. By Zygmunt Krynicki on 2015-05-19

"automatic merge of lp:~zyga/checkbox/html-template-refresh/ by tarmac [r=sylvain-pineau][bug=][author=zyga]"

3796. By Sylvain Pineau on 2015-05-20

providers:certification-client: Fix a typo in the 14.04.3 testplan

audio/genereator_.* -> audio/generator_.*

[Zygmunt Krynicki (zyga)]

Hey

Have a look below:

- the root handling has to be fixed before landing this
- misc easy stuff as well (should take a second)

Testing:
 - please write tests for the blkid parser
 - collect blkid output from several systems, see if you're missing anything

Thanks

review: Needs Fixing

[lp:~shawn111/checkbox/image_info]

3797. By Shawn Wang on 2015-05-20

providers:checkbox: add recovery_info to provide image info

recovery_info is a guacamole Command.
use blkid to list partition information
provide
1. Show recovery version.
2. Check recovery type.
3. Print out the file in recovery partition

3798. By Shawn Wang on 2015-05-20

providers: Added the recovery_info_attachment to whitelists

[Zygmunt Krynicki (zyga)]

+1

There are a few minor things but I'll sort them out with a post-merge proposal

review: Approve

=== modified file 'providers/plainbox-provider-certification-client/units/client-cert-14-04-3.pxu'
--- providers/plainbox-provider-certification-client/units/client-cert-14-04-3.pxu	2015-05-20 06:58:13 +0000
+++ providers/plainbox-provider-certification-client/units/client-cert-14-04-3.pxu	2015-05-20 10:15:25 +0000
@@ -418,6 +418,8 @@
     sysctl_attachment
     sysfs_attachment
     udev_attachment
+    recovery_info_attachment
+    dell_bto_xml_attachment
     lsmod_attachment
     dkms_info_attachment
     acpi_sleep_attachment

=== modified file 'providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu'
--- providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu	2015-05-18 10:56:27 +0000
+++ providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu	2015-05-20 10:15:25 +0000
@@ -402,6 +402,8 @@
     sysctl_attachment
     sysfs_attachment
     udev_attachment
+    recovery_info_attachment
+    dell_bto_xml_attachment
     lsmod_attachment
     acpi_sleep_attachment
     info/hdparm

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert-regression.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-cert-regression.whitelist	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-cert-regression.whitelist	2015-05-20 10:15:25 +0000
@@ -129,6 +129,8 @@
 sysctl_attachment
 sysfs_attachment
 udev_attachment
+recovery_info_attachment
+dell_bto_xml_attachment
 lsmod_attachment
 dkms_info_attachment
 acpi_sleep_attachment

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist	2015-05-18 10:56:27 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist	2015-05-20 10:15:25 +0000
@@ -419,6 +419,8 @@
 sysctl_attachment
 sysfs_attachment
 udev_attachment
+recovery_info_attachment
+dell_bto_xml_attachment
 lsmod_attachment
 dkms_info_attachment
 acpi_sleep_attachment

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest-14-04.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-selftest-14-04.whitelist	2015-05-18 06:25:15 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-selftest-14-04.whitelist	2015-05-20 10:15:25 +0000
@@ -359,6 +359,8 @@
 sysctl_attachment
 sysfs_attachment
 udev_attachment
+recovery_info_attachment
+dell_bto_xml_attachment
 lsmod_attachment
 dkms_info_attachment
 acpi_sleep_attachment

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist	2015-05-18 06:25:15 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist	2015-05-20 10:15:25 +0000
@@ -359,6 +359,8 @@
 sysctl_attachment
 sysfs_attachment
 udev_attachment
+recovery_info_attachment
+dell_bto_xml_attachment
 lsmod_attachment
 dkms_info_attachment
 acpi_sleep_attachment

=== added file 'providers/plainbox-provider-checkbox/bin/recovery_info'
--- providers/plainbox-provider-checkbox/bin/recovery_info	1970-01-01 00:00:00 +0000
+++ providers/plainbox-provider-checkbox/bin/recovery_info	2015-05-20 10:15:25 +0000
@@ -0,0 +1,389 @@
+#!/usr/bin/env python3
+# Copyright 2015 Canonical Ltd.
+# Written by:
+#   Shawn Wang <[e-mail]>
+#
+# This program 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.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Show the recovery partition information for the preinstalled OS."""
+
+import os
+import subprocess
+import sys
+import tempfile
+import unittest
+import xml.dom.minidom as minidom
+
+from guacamole import Command
+
+try:
+    from unittest import mock
+except ImportError:
+    from plainbox.vendor import mock
+
+RECOVERY_LABELS = {"HP_TOOLS": "HP",
+                   "PQSERVICE": "UBUNTU",
+                   "BACKUP": "TEST",
+                   "INSTALL": "DELL",
+                   "OS": "DELL",
+                   "RECOVERY": "DELL"}
+
+RECOVERY_PACKAGES = ["dell-recovery", "ubuntu-recovery", "zip"]
+
+
+class MountedPartition(object):
+
+    """
+    Mount Manager to mount partition on tempdir.
+
+    e.g.
+    with MountedPartition("/dev/sda1") as tmp:
+        print("This is the mount point: {}".format(tmp))
+        do_stuff()
+    """
+
+    def __init__(self, part):
+        """
+        Prepare the mntdir point.
+
+        :param part: string of the partition device file, like /dev/sda2
+        """
+        self.part = part
+        self.mntdir = tempfile.mkdtemp()
+
+    def __enter__(self):
+        """
+        __enter__ method for python's with statement.
+
+        Mount the partition device to the mntdir.
+        """
+        cmd = ["mount", self.part, self.mntdir]
+        subprocess.check_output(cmd, universal_newlines=True)
+        return self.mntdir
+
+    def __exit__(self, type, value, traceback):
+        """
+        __exit__ method for python's with statement.
+
+        Unmount and remove the mntdir.
+        """
+        subprocess.check_output(["umount", self.mntdir],
+                                universal_newlines=True)
+        os.rmdir(self.mntdir)
+
+
+class MountedPartitionTests(unittest.TestCase):
+
+    """Unittest of MountedPartition."""
+
+    @mock.patch('subprocess.check_output')
+    def test_with_of_MountedPartition(self, mock_subprocess_check_output):
+        """Test mount point."""
+        test_dir = ""
+        with MountedPartition("/dev/test") as tmp:
+            test_dir = tmp
+            self.assertTrue(os.path.exists(test_dir))
+            mock_subprocess_check_output.assert_has_calls(
+                [mock.call(['mount', '/dev/test', test_dir],
+                           universal_newlines=True)])
+        self.assertFalse(os.path.exists(test_dir))
+        mock_subprocess_check_output.assert_has_calls(
+            [mock.call(['umount', test_dir],
+                       universal_newlines=True)])
+
+
+class RecoveryVersion(Command):
+
+    """
+    subcommand of RecoveryInfo.
+
+    print out the version information.
+
+    image_version: xxx
+    bto_version: REV_xxx.iso (dell only)
+    """
+
+    def invoked(self, ctx):
+        """
+        Guacamole method called when the command is invoked.
+
+        /etc/buildstamp is a image information file,
+        it created by the oem image builder.
+
+        oilpalm Fri, 20 Jun 2014 04:02:07 +0000
+        somerville-trusty-amd64-20140620-0
+
+        If /etc/buildstamp exist, print out the second line (image iso name).
+
+        For Dell-recovery partition, /etc/buildstamp shows base image info.
+        If recovery_partition/bto.xml,
+        print out the bto_version (read from xml file).
+        """
+        if os.path.isfile("/etc/buildstamp"):
+            with open('/etc/buildstamp', 'rt', encoding='UTF-8') as stream:
+                data = stream.readlines()
+                print("image_version: {}".format(data[1].strip()))
+
+        with MountedPartition(ctx.recovery_partition) as mntdir:
+            fname = "{}/bto.xml".format(mntdir)
+            if os.path.isfile(fname):
+                o = minidom.parse("{}/bto.xml".format(mntdir))
+                bto_version = o.getElementsByTagName("iso")[0].firstChild.data
+                print("bto_version: {}".format(bto_version))
+
+
+class RecoveryFile(Command):
+
+    """
+    subcommand of RecoveryInfo.
+
+    print out the file in recovery partition.
+    """
+
+    def register_arguments(self, parser):
+        """
+        Guacamole method used by the argparse ingredient.
+
+        :param parser:
+            Argument parser (from :mod:`argparse`) specific to this command.
+        """
+        parser.add_argument('file', help='File name of print out the content')
+
+    def invoked(self, ctx):
+        """
+        Guacamole method used by the command ingredient.
+
+        :param ctx:
+            The guacamole context object. Context provides access to all
+            features of guacamole. The argparse ingredient adds the ``args``
+            attribute to it. That attribute contains the result of parsing
+            command line arguments.
+        :returns:
+            The return code of the command. Guacamole translates ``None`` to a
+            successful exit status (return code zero).
+        """
+        if ctx.args.file is None:
+            return 1
+        with MountedPartition(ctx.recovery_partition) as mntdir:
+            fname = "{}/{}".format(mntdir, ctx.args.file)
+            try:
+                with open(fname, 'rt', encoding='UTF-8') as f:
+                    print(f.read())
+            except Exception as e:
+                sys.stderr.write(
+                    "File({}) is not found, {}\n".format(ctx.args.file, e.msg))
+                return 1
+
+
+class RecoveryCheckType(Command):
+
+    """
+    subcommand of RecoveryInfo.
+
+    Check the recovery type if not matched return 1
+    """
+
+    def register_arguments(self, parser):
+        """
+        Guacamole method used by the argparse ingredient.
+
+        :param parser:
+            Argument parser (from :mod:`argparse`) specific to this command.
+        """
+        parser.add_argument('type',
+                            help="""\
+Check current recovery type, like DELL.
+If current recovery type is DELL, return value is 0.
+If current recovery type is not DELL, return value is 1.
+""")
+
+    def invoked(self, ctx):
+        """
+        Guacamole method used by the command ingredient.
+
+        :param ctx:
+            The guacamole context object. Context provides access to all
+            features of guacamole. The argparse ingredient adds the ``args``
+            attribute to it. That attribute contains the result of parsing
+            command line arguments.
+        :returns:
+            The return code of the command. Guacamole translates ``None`` to a
+            successful exit status (return code zero).
+        """
+        if ctx.recovery_type != ctx.args.type.upper():
+            sys.stderr.write(
+                "{} and {}".format(ctx.recovery_type,
+                                   ctx.args.type.upper()))
+            sys.stderr.write(ctx.args.type.upper())
+            return 1
+
+
+class RecoveryInfo(Command):
+
+    """
+    RecoveryInfo command.
+
+    If system is not a preinstalled OS, the command return 1.
+    """
+
+    sub_commands = (
+        ('version', RecoveryVersion),
+        ('file', RecoveryFile),
+        ('checktype', RecoveryCheckType),
+    )
+
+    @staticmethod
+    def get_recovery_package():
+        """
+        Test with RECOVERY_PACKAGES.
+
+        to check recovery application is installed or not
+
+        :return:
+            string of package_version or None
+        """
+        for pkg in RECOVERY_PACKAGES:
+            output = subprocess.check_output(["apt-cache", "policy", pkg],
+                                             universal_newlines=True)
+            for line in output.split("\n"):
+                if line.startswith("  Installed:"):
+                    ver = line.split(": ")[1]
+                    return "{}_{}".format(pkg, ver.strip())
+        return None
+
+    @staticmethod
+    def get_recovery_partition():
+        """
+        Look for the recovery partition.
+
+         1. Check recovery package is installed or not.
+         2. Use blkid to get partition tables
+         3. Recovery partition type is ntfs or vfat
+         4. RECOVERY_LABELS to see if any partition match
+
+        :return:
+            (recovery_type, recovery_partition) or None
+        """
+        if RecoveryInfo.get_recovery_package() is None:
+            return None
+
+        output = subprocess.check_output(["blkid"], universal_newlines=True)
+        data = output.strip()
+
+        if data == "":
+            raise OSError("Please run by root. "
+                          "Although blkid can runs without root, "
+                          "it only works after root runs blkid.")
+
+        for section in data.split("\n"):
+            blk = {}
+            blk['dev'], line = section.split(': ')
+            line = line.strip() + " "
+
+            for part in line.split('" '):
+                item = part.split("=\"")
+                if item[0] == 'LABEL':
+                    blk['label'] = item[1].upper()
+                if item[0] == 'TYPE':
+                    blk['fs'] = item[1]
+            if 'label' not in blk:
+                continue
+
+            if not (blk['fs'] == "vfat" or
+                    blk['fs'] == "ntfs"):
+                continue
+            for label in RECOVERY_LABELS:
+                if blk['label'] == label:
+                    return (RECOVERY_LABELS[label], blk['dev'])
+        return None
+
+    def invoked(self, ctx):
+        """
+        Guacamole method used by the command ingredient.
+
+        :param ctx:
+            The guacamole context object. Context provides access to all
+            features of guacamole. The argparse ingredient adds the ``args``
+            attribute to it. That attribute contains the result of parsing
+            command line arguments.
+        :returns:
+            The return code of the command. Guacamole translates ``None`` to a
+            successful exit status (return code zero).
+        """
+        partition = RecoveryInfo.get_recovery_partition()
+
+        if partition is None:
+            sys.stderr.write("Recovery partition not found\n")
+            return 1
+
+        (recovery_type, recovery_partition) = partition
+        ctx.recovery_partition = recovery_partition
+        ctx.recovery_type = recovery_type
+
+
+class RecoveryInfoGuacamoleCommendTests(unittest.TestCase):
+
+    """Unittest of RecoveryInfo."""
+
+    @mock.patch('subprocess.check_output')
+    def testRecoveryInfo_get_recovery_package(self,
+                                              mock_subprocess_check_output):
+        """Unittest of RecoveryInfo.get_recovery_package()."""
+        mock_subprocess_check_output.return_value = """\
+dell-recovery:
+  Installed: 1.11
+  Candidate: 1.11
+  Version table:
+     1.11
+        500 https://archive/cesg-mirror/ test/public amd64 Packages
+"""
+        self.assertEqual(RecoveryInfo.get_recovery_package(),
+                         "dell-recovery_1.11")
+
+    @mock.patch('__main__.RecoveryInfo.get_recovery_package')
+    @mock.patch('subprocess.check_output')
+    def testRecoveryInfo_get_recovery_partition(self,
+                                                mock_subprocess_check_output,
+                                                mock_get_recovery_package):
+        """Unittest of RecoveryInfo.get_recovery_partition()."""
+        mock_get_recovery_package.return_value = "dell-recovery_1.11"
+        mock_subprocess_check_output.return_value = """\
+/dev/sda1: LABEL="Test" UUID="xxxxx" TYPE="vfat" PARTUUID="00070b83-01"
+/dev/sda2: UUID="xxxxx" TYPE="vfat" PARTUUID="00070b83-02"
+/dev/sda3: LABEL="Recovery" UUID="xxxxx" TYPE="vfat" PARTUUID="00070b83-06"
+"""
+        self.assertEqual(RecoveryInfo.get_recovery_partition(),
+                         ("DELL", "/dev/sda3"))
+
+    @mock.patch('__main__.RecoveryInfo.get_recovery_package')
+    @mock.patch('__main__.RecoveryInfo.get_recovery_partition')
+    def testRecoveryInfo_guacamole(self,
+                                   mock_get_recovery_partition,
+                                   mock_get_recovery_package):
+        """Unittest of command with argv."""
+        mock_get_recovery_partition.return_value = ("DELL", "/dev/sda3")
+        mock_get_recovery_package.return_value = "dell-recovery_1.11"
+
+        self.assertEqual(RecoveryInfo().main(argv=None, exit=False), 0)
+        self.assertEqual(
+            RecoveryInfo().main(argv=["checktype", "HP"], exit=False), 1)
+        self.assertEqual(
+            RecoveryInfo().main(argv=["checktype", "DELL"], exit=False), 0)
+
+
+if __name__ == '__main__':
+    if '--test' in sys.argv:
+        sys.argv.remove('--test')
+        unittest.main()
+    else:
+        RecoveryInfo().main()

=== modified file 'providers/plainbox-provider-checkbox/jobs/info.txt.in'
--- providers/plainbox-provider-checkbox/jobs/info.txt.in	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-checkbox/jobs/info.txt.in	2015-05-20 10:15:25 +0000
@@ -276,6 +276,54 @@
 _summary: Attach /etc/buildstamp
 command: [ -s /etc/buildstamp ] && cat /etc/buildstamp
 
+plugin: shell
+id: info/detect_recovery
+requires: package.name == 'dell-recovery' or package.name == 'ubuntu-recovery'
+user: root
+estimated_duration: 0.2
+_summary: Check existence of recovery partition
+_description: Check existence of recovery partition
+command: recovery_info --check-recovery-partition
+
+plugin: shell
+id: info/detect_dell_recovery
+depends: info/detect_recovery
+requires: package.name == 'dell-recovery'
+user: root
+estimated_duration: 0.2
+_summary: Check the recovery type is dell or not
+_description: Check the recovery type is dell or not
+command: recovery_info --check-recovery-type DELL
+
+plugin: attachment
+id: recovery_info_attachment
+depends: info/detect_recovery
+requires: package.name == 'dell-recovery' or package.name == 'ubuntu-recovery'
+user: root
+estimated_duration: 0.2
+_summary: Attach the recovery partition versions
+_description:
+ Attach the recovery partition version
+ image_version is the preinstalled OS image version
+ bto_version is only for dell_recovery
+ Example:
+ image_version: somerville-trusty-amd64-20140620-0
+ bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
+command: recovery_info --show-version
+
+plugin: attachment
+id: dell_bto_xml_attachment
+depends: info/detect_dell_recovery
+requires: package.name == 'dell-recovery'
+estimated_duration: 0.5
+_summary: Attach the bto.xml in Dell recovery partition
+_description:
+ bto.xml is basically a Fish manifest
+ The information include:
+  - fish packages
+  - dell recovery stage 2 boot log
+command: recovery_info --readfile bto.xml
+
 plugin: attachment
 id: info/kvm_output
 estimated_duration: 0.1

=== modified file 'providers/plainbox-provider-checkbox/whitelists/autotesting.whitelist'
--- providers/plainbox-provider-checkbox/whitelists/autotesting.whitelist	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-checkbox/whitelists/autotesting.whitelist	2015-05-20 10:15:25 +0000
@@ -25,6 +25,8 @@
 sysctl_attachment
 sysfs_attachment
 udev_attachment
+recovery_info_attachment
+dell_bto_xml_attachment
 lsmod_attachment
 dkms_info_attachment
 #Automated Test-verification Jobs

=== modified file 'providers/plainbox-provider-checkbox/whitelists/hwsubmit.whitelist'
--- providers/plainbox-provider-checkbox/whitelists/hwsubmit.whitelist	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-checkbox/whitelists/hwsubmit.whitelist	2015-05-20 10:15:25 +0000
@@ -16,6 +16,8 @@
 dmi_attachment
 dmidecode_attachment
 kernel_cmdline_attachment
+recovery_info_attachment
+dell_bto_xml_attachment
 lsmod_attachment
 dkms_info_attachment
 lspci_attachment