Merge ~sylvain-pineau/checkbox-support:wwan_category into checkbox-support:master

[Sylvain Pineau]

This MR introduces the WWAN category, to avoid grouping under NETWORK ethernet devices and wwan.

Nota: NETWORK is definitely not ideal as a category name but I prefer to keep it as is.

[Sylvain Pineau (sylvain-pineau)]

tested on desktop and snappy systems, both having a WWAN device.

review: Approve

diff --git a/checkbox_support/parsers/tests/test_udevadm.py b/checkbox_support/parsers/tests/test_udevadm.py
index 1597696..12a8d57 100644
--- a/checkbox_support/parsers/tests/test_udevadm.py
+++ b/checkbox_support/parsers/tests/test_udevadm.py
@@ -551,7 +551,7 @@ E: UDEV_LOG=3
                             ("82579LM Gigabit Network Connection",
                              "NETWORK", "pci", 0x8086, 0x1502),
                             ("H5321 gw",
-                             "NETWORK", "usb", 0x0bdb, 0x1926)
+                             "WWAN", "usb", 0x0bdb, 0x1926)
                             ]
         self.assertEqual(len(devices), 103)
         # Check that the Thinkpad hotkeys are not a CAPTURE device
@@ -563,7 +563,7 @@ E: UDEV_LOG=3
         self.assertEqual(
             devices[54].vendor,
             "Ericsson Business Mobile Networks BV")
-        self.assertEqual(devices[54].category, "NETWORK")
+        self.assertEqual(devices[54].category, "WWAN")
         self.assertEqual(self.count(devices, "VIDEO"), 1)
         self.assertEqual(self.count(devices, "AUDIO"), 9)
         # Logitech Illuminated keyboard + T430S keyboard + KVM
@@ -578,7 +578,8 @@ E: UDEV_LOG=3
         self.assertEqual(self.count(devices, "DISK"), 1)
         self.assertEqual(self.count(devices, "RAID"), 0)
         self.assertEqual(self.count(devices, "BLUETOOTH"), 1)
-        self.assertEqual(self.count(devices, "NETWORK"), 2)
+        self.assertEqual(self.count(devices, "NETWORK"), 1)
+        self.assertEqual(self.count(devices, "WWAN"), 1)
         self.assertEqual(self.count(devices, "CAPTURE"), 2)
         self.assertEqual(self.count(devices, "WIRELESS"), 1)
         self.verify_devices(devices, expected_devices)
diff --git a/checkbox_support/parsers/udevadm.py b/checkbox_support/parsers/udevadm.py
index 8bde51c..6c493dd 100644
--- a/checkbox_support/parsers/udevadm.py
+++ b/checkbox_support/parsers/udevadm.py
@@ -205,6 +205,8 @@ class UdevadmDevice(object):
                 devtype = self._environment["DEVTYPE"]
                 if devtype in ("wlan", "wimax"):
                     return "WIRELESS"
+                elif devtype == "wwan":
+                    return "WWAN"
             # Ralink and realtek SDIO wireless
             if "INTERFACE" in self._environment:
                 if (self.driver and
@@ -820,7 +822,7 @@ class UdevadmDevice(object):
     def interface(self):
         if self._interface is not None:
             return self._interface
-        if self.category in ("NETWORK", "WIRELESS"):
+        if self.category in ("NETWORK", "WIRELESS", "WWAN"):
             if "INTERFACE" in self._environment:
                 return self._environment["INTERFACE"]
             else:
@@ -831,7 +833,7 @@ class UdevadmDevice(object):
     def mac(self):
         if self._mac is not None:
             return self._mac
-        if self.category in ("NETWORK", "WIRELESS"):
+        if self.category in ("NETWORK", "WIRELESS", "WWAN"):
             if "ID_NET_NAME_MAC" in self._environment:
                 mac = self._environment["ID_NET_NAME_MAC"][3:]
                 return ':'.join([mac[i:i+2] for i in range(0, len(mac), 2)])
@@ -1044,10 +1046,10 @@ class UdevadmParser(object):
             stack.append(device)
 
         for device in list(self.devices.values()):
-            if device.category in ("NETWORK", "WIRELESS", "OTHER"):
+            if device.category in ("NETWORK", "WIRELESS", "WWAN", "OTHER"):
                 dev_interface = [
                     d for d in self.devices.values()
-                    if d.category in ("NETWORK", "WIRELESS") and
+                    if d.category in ("NETWORK", "WIRELESS", "WWAN") and
                     device._raw_path != d._raw_path and
                     device._raw_path + '/' in d._raw_path
                 ]