Merge ~pwlars/plainbox-provider-resource:dmi-present into plainbox-provider-resource:master

[Paul Larson]

Here's a slightly different approach to detecting if the dmi data is present. This way we don't add extraneous entries to the dmi data that gets collected. I'm trying to test this on dragonboard, but no luck so far because I'm having some weird lxml/gcc problem when snapcraft tries to build it locally.

[Jonathan Cave (jocave)]

I prefer this approach. IMO, it keeps the original resource output sane.

review: Approve

diff --git a/bin/dmi_resource b/bin/dmi_resource
index ac2879b..4dfbb99 100755
--- a/bin/dmi_resource
+++ b/bin/dmi_resource
@@ -30,7 +30,7 @@ COMMAND = "dmidecode"
 class DmiResult:
 
     attributes = ("path", "category", "product", "vendor", "serial",
-        "version", "size", "form",)
+                  "version", "size", "form",)
 
     def addDmiDevice(self, device):
         for attribute in self.attributes:
@@ -42,19 +42,11 @@ class DmiResult:
 
 
 def main():
+    stream = os.popen(COMMAND)
+    dmi = DmidecodeParser(stream)
 
-    if os.path.exists('/sys/devices/virtual/dmi'):
-        print("supported: True")
-        print()
-
-        stream = os.popen(COMMAND)
-        dmi = DmidecodeParser(stream)
-
-        result = DmiResult()
-        dmi.run(result)
-    else:
-        print("supported: False")
-        print()
+    result = DmiResult()
+    dmi.run(result)
     return 0
 
 
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index f9834eb..89240d7 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -144,11 +144,24 @@ _description:
  transformations applied are basic changes to make the format compatible with
  RFC822 syntax required by PlainBox.
 
+id: dmi_present
+estimated_duration: 0.02
+plugin: resource
+user: root
+command:
+  if [ -d /sys/devices/virtual/dmi ]
+  then
+      echo "state: supported"
+  else
+      echo "state: unsupported"
+  fi
+_summary: Resource to detect if dmi data is present
+
 id: dmi
 estimated_duration: 0.59
 plugin: resource
 requires:
-  cpuinfo.platform in ("i386", "x86_64")
+  dmi_present.state == 'supported'
 user: root
 command: dmi_resource
 _summary: Collect information about hardware devices (DMI)