Merge ~pieq/bugit/+git/qabro:fix-1782528-additional-info into bugit:master

[Pierre Equoy]

- Adds kernel version to the "Additional information" section (lp:1822938)
- Shows pre-filled "Additional information" in the default description to give user a chance to review before submitting
- Add Manifest (if available) to the "Additional information" section for easier identification when submitting Desktop OEM bugs (lp:1782528)

The changes have been tested as a snap on:
- 18.04 desktop
- 18.04 desktop (OEM image)
- UC16

[Nara Huang (narahuang)]

+1 Looks good to me!

review: Approve

diff --git a/qabro/__init__.py b/qabro/__init__.py
index 0ebdaca..815374c 100644
--- a/qabro/__init__.py
+++ b/qabro/__init__.py
@@ -8,6 +8,8 @@ from qabro.bug_assistant import BugAssistant, BugReport
 from qabro.ui import ReportScreen
 
 
+logger = logging.getLogger(__name__)
+
 def main():
     if os.geteuid() == 0:
         sys.exit("This tool cannot be run as super user.")
diff --git a/qabro/__version__.py b/qabro/__version__.py
index c6c3764..19e4adc 100644
--- a/qabro/__version__.py
+++ b/qabro/__version__.py
@@ -1,5 +1,5 @@
 __title__ = 'qabro'
-__version__ = '0.9'
+__version__ = '0.10dev'
 __description__ = 'Tool to generate a Launchpad bug report and attach useful logs (using sosreport and the like).'
 __author__ = 'Pierre Equoy'
 __author_email__ = '[e-mail]'
diff --git a/qabro/bug_assistant.py b/qabro/bug_assistant.py
index 05a06b6..c14bd13 100644
--- a/qabro/bug_assistant.py
+++ b/qabro/bug_assistant.py
@@ -1,6 +1,8 @@
 import getpass
+import json
 import os
 import re
+import shutil
 import subprocess
 import sys
 import tarfile
@@ -118,11 +120,6 @@ class BugAssistant:
                                  .format(assignee_name))
                 raise BugAssistantError(error_message)
 
-        print('Getting standard bug information...')
-        std_info = AttachmentAssistant.get_standard_info()
-        std_info_str = '\n'.join(['{}: {}'.format(elt, std_info[elt])
-                                  for elt in std_info])
-        description = self.lp_description + "\n\n-----\n\n" + std_info_str
         if not self.bug:
             print('Creating Launchpad bug report...')
             self.bug = launchpad.bugs.createBug(title=self.lp_title,
@@ -319,15 +316,23 @@ class AttachmentAssistant:
         else:
             print("$PATH missing. Cannot run acpidump!")
 
-    @classmethod
-    def get_standard_info(cls):
+    @staticmethod
+    def get_standard_info():
         """Gather standard information that should be present in all bugs."""
         standard_info = {}
 
         buildstamp = '/etc/buildstamp'
         if os.path.isfile(buildstamp):
             standard_info['Image'] = subprocess.check_output(
-                ['tail', '-n', '1', buildstamp]).decode(sys.stdout.encoding)
+                ['tail', '-n', '1', buildstamp]).decode(sys.stdout.encoding).strip()
+
+        if shutil.which("ubuntu-report"):
+            print("Retrieving Manifest information...")
+            report = subprocess.check_output(["ubuntu-report", "show"])
+            reportjson = json.loads(report)
+            manifest = reportjson.get("OEM").get("DCD")
+            if manifest:
+                standard_info["Manifest"] = manifest
 
         p = os.getenv('PATH')
 
@@ -344,17 +349,21 @@ class AttachmentAssistant:
             standard_info[dmi_value] = subprocess.check_output(
                 command + [dmi_value]).decode(sys.stdout.encoding).strip()
 
-        standard_info['CPU'] = cls.get_cpu_info()
+        standard_info['CPU'] = AttachmentAssistant.get_cpu_info()
 
         lspci_output = (subprocess.check_output(['lspci'])
                         .decode(sys.stdout.encoding)
                         .splitlines())
         standard_info['GPU'] = '\n'.join([line for line in lspci_output
                                           if 'VGA' in line])
+
+        standard_info["kernel-version"] = (subprocess.check_output(["uname", "-r"])
+                                           .decode(sys.stdout.encoding)
+                                           .strip())
         return standard_info
 
-    @classmethod
-    def get_cpu_info(cls):
+    @staticmethod
+    def get_cpu_info():
         """Parse /proc/cpuinfo and return cpu model information."""
         cpus = []
         cpuinfo = {}
diff --git a/qabro/ui.py b/qabro/ui.py
index 3767d1b..26f6bba 100644
--- a/qabro/ui.py
+++ b/qabro/ui.py
@@ -1,7 +1,7 @@
 import sys
 import urwid
 
-from qabro.bug_assistant import BugReport
+from qabro.bug_assistant import AttachmentAssistant, BugReport
 from qabro.__version__ import __version__ as qversion, __title__ as qtitle
 
 
@@ -46,13 +46,18 @@ class ReportScreen:
                  "Performance": "oem-performance",
                  "Other problem": "oem-other"}
 
-    default_description = ("Summary:\n\n"
-                           "Steps to reproduce:\n\n"
-                           "Expected result:\n\n"
-                           "Actual result:\n\n"
-                           "Failure rate:")
+    default_description = ("[Summary]\n\n"
+                           "[Steps to reproduce]\n\n"
+                           "[Expected result]\n\n"
+                           "[Actual result]\n\n"
+                           "[Failure rate]\n\n")
 
     def __init__(self):
+        # Adding standard info (CPU, BIOS, GPU, etc.)  to the description
+        std_info = AttachmentAssistant.get_standard_info()
+        std_info_str = '\n'.join(['{}: {}'.format(elt, std_info[elt]) for elt in std_info])
+        self.default_description += "[Additional information]\n" + std_info_str
+
         self._title = urwid.LineBox(urwid.Edit(), 'Bug Title')
         self._description = urwid.LineBox(urwid.Edit(edit_text=self.default_description,
                                           multiline=True),