detect: Adding test code for lldp parsing

As the output could be weird, let's add some code to handle the
testability of it

Author: Erwan Velu

src/detect.py

@@ -35,6 +35,7 @@
 import sys
 import xml.etree.ElementTree as ET
 import re
+import detect_utils
 
 SIOCGIFNETMASK = 0x891b
 
@@ -498,28 +499,7 @@ def find_element(xml, xml_spec, sys_subtype,
                     find_element(elt, 'serial', 'serial', name.text, 'network',
                                  transform=string.lower)
 
-                lines = output_lines("lldptool -t -n -i %s" % name.text)
-                content = ""
-                header = ""
-                sub_header = ""
-                for line in lines:
-                    if line.startswith('\t'):
-                        content = line.strip().strip('\n').strip('\t').replace("/", "_")
-                    else:
-                        header = line
-                        header = line.strip().strip('\n').strip('\t').replace("/", "_").replace(" TLV", "")
-                        content = ""
-                        sub_header = ""
-                    if header and content:
-                        if ":" in content:
-                            left, right = content.split(": ")
-                            # If we never had this sub_header for this header
-                            # let's add one
-                            if (left != sub_header):
-                                sub_header = left
-                                header = header + "/" + sub_header
-                            content = right
-                        hw_lst.append(('lldp', name.text, header, content))
+                detect_utils.get_lld_status(hw_lst, name.text)
 
         for elt in xml.findall(".//node[@class='processor']"):
             name = elt.find('physid')

src/detect_utils.py

@@ -0,0 +1,31 @@
+import detect
+
+
+def parse_lldtool(hw_lst, interface_name, lines):
+    content = ""
+    header = ""
+    sub_header = ""
+    for line in lines:
+        if line.startswith('\t'):
+            content = line.strip().strip('\n').strip('\t').replace("/", "_")
+        else:
+            header = line
+            header = line.strip().strip('\n').strip('\t').replace("/", "_").replace(" TLV", "")
+            content = ""
+            sub_header = ""
+        if header and content:
+            if ":" in content:
+                left, right = content.split(": ")
+                # If we never had this sub_header for this header
+                # let's add one
+                if (left != sub_header):
+                    sub_header = left
+                    header = header + "/" + sub_header
+                content = right
+            hw_lst.append(('lldp', interface_name, header, content))
+
+    return hw_lst
+
+
+def get_lld_status(hw_lst, interface_name):
+    return parse_lldtool(hw_lst, interface_name, detect.output_lines("lldptool -t -n -i %s" % interface_name))

src/test_detect.py

@@ -21,6 +21,7 @@
 import unittest
 
 import detect
+import detect_utils
 
 
 class Keeper:
@@ -59,6 +60,7 @@ def _save_functions(self, nbproc, nbphys):
         self.saved_ntoa = socket.inet_ntoa
         self.saved_ioctl = fcntl.ioctl
         self.saved_get_uuid = detect.get_uuid
+        self.saved_lld_status = detect_utils.get_lld_status
 
         def fake(x):
             return (0, nbproc)
@@ -72,6 +74,9 @@ def fake_ioctl(arg, arg2, arg3):
         def fake_get_uuid():
             return '83462C81-52BA-11CB-870F'
 
+        def fake_lld_status(arg, arg1):
+            return []
+
         detect.cmd = fake
         keeper = Keeper('detect.output_lines',
                         [('vmx', ) for idx in range(nbphys)] +
@@ -84,13 +89,16 @@ def fake_get_uuid():
         socket.inet_ntoa = fake_ntoa
         fcntl.ioctl = fake_ioctl
         detect.get_uuid = fake_get_uuid
+        detect_utils.get_lld_status = fake_lld_status
 
     def _restore_functions(self):
         detect.cmd = self.save
         detect.output_lines = self.output_lines
         socket.inet_ntoa = self.saved_ntoa
         fcntl.ioctl = self.saved_ioctl
         detect.get_uuid = self.saved_get_uuid
+        detect_utils.get_lld_status = self.saved_lld_status
+
 
     def test_detect_system_3(self):
         l = []