Merge ~kissiel/checkbox-support:raids-are-disks-too into checkbox-support:master

[Maciej Kisielewski]

Ensure that RAIDs are properly listed by the device resource job

[Jonathan Cave (jocave)]

Once my head got past the two "container" strings, LGTM!

review: Approve

diff --git a/checkbox_support/parsers/udevadm.py b/checkbox_support/parsers/udevadm.py
index b85ee93..11ae6ec 100644
--- a/checkbox_support/parsers/udevadm.py
+++ b/checkbox_support/parsers/udevadm.py
@@ -829,6 +829,10 @@ class UdevadmDevice(object):
         elif '/dev/md' in self._environment.get('DEVNAME', ''):
             if "MD_NAME" in self._environment:
                 return self._environment.get("MD_NAME")
+            # if there's MD_LEVEL in the env and it's not a container it's an
+            # actual RAID disk
+            elif self._environment.get("MD_LEVEL", "container") != "container":
+                return self._environment.get("MD_DEVNAME")
         elif self.major == "94":
             # See http://pad.lv/1559189
             return "IBM s390 Virtual Disk"