Fix #719: convert macaddr in all sorts of forms to std format

Signed-off-by: Dinesh Dutt <[email protected]>

Author: ddutt

suzieq/shared/utils.py

@@ -460,11 +460,26 @@ def convert_macaddr_format_to_colon(macaddr: str) -> str:
 
     """
     if isinstance(macaddr, str):
-        if re.match(r'[0-9a-zA-Z]{4}.[0-9a-zA-Z]{4}.[0-9a-zA-Z]{4}', macaddr):
+        macaddr = macaddr.lower()
+        if re.match(r'[0-9a-f]{4}\.[0-9a-f]{4}\.[0-9a-f]{4}', macaddr):
             return (':'.join([f'{x[:2]}:{x[2:]}'
-                              for x in macaddr.split('.')])).lower()
-        else:
-            return macaddr.lower()
+                              for x in macaddr.split('.')]))
+        if re.match(r'[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}-'
+                    r'[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}',
+                    macaddr):
+            return macaddr.replace('-', ':')
+        if re.match(r'[0-9a-f]{4}:[0-9a-f]{4}:[0-9a-f]{4}', macaddr):
+            return (':'.join([f'{x[:2]}:{x[2:]}'
+                              for x in macaddr.split(':')]))
+        if re.match(r'[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}', macaddr):
+            return (':'.join([f'{x[:2]}:{x[2:]}'
+                              for x in macaddr.split('-')]))
+        if ':' not in macaddr and re.match(r'[0-9a-f]{12}', macaddr):
+            newmac = ''
+            for i in range(0, 12, 2):
+                newmac += f'{macaddr[i:i+2]}:'
+            newmac = newmac[:-1]  # remove the trailing ':'
+            return newmac
 
     return '00:00:00:00:00:00'
 

tests/unit/test_mac_convert.py

@@ -0,0 +1,25 @@
+from suzieq.shared.utils import convert_macaddr_format_to_colon
+
+
+def test_mac_convert():
+    '''Test all formats of MAC formats being converted to std format'''
+    result = '50:9a:4c:36:a1:df'
+    nullmac = '00:00:00:00:00:00'
+
+    assert convert_macaddr_format_to_colon('509A:4C36:A1DF') == result, \
+        'failed to convert 509A:4C36:A1DF'
+
+    assert convert_macaddr_format_to_colon('509A.4C36.A1DF') == result, \
+        'failed to convert 509A.4C36.A1DF'
+
+    assert convert_macaddr_format_to_colon('509A-4C36-A1DF') == result, \
+        'failed to convert 509A.4C36.A1DF'
+
+    assert convert_macaddr_format_to_colon('509A4C36A1DF') == result, \
+        'failed to convert 509A4C36A1DF'
+
+    assert convert_macaddr_format_to_colon('50-9A-4C-36-A1-DF') == result, \
+        'failed to convert 50-9A-4C-36-A1-DF'
+
+    assert convert_macaddr_format_to_colon('50-9Z-4C-36-A1-DF') == nullmac, \
+        'Incorrect conversion of 50-9Z-4C-36-A1-DF'