util: Break out helper for mac address validation

Author: crobinso

tests/clonetest.py

@@ -42,13 +42,13 @@
 clonexml_dir = os.path.join(os.getcwd(), "tests/clone-xml")
 clone_files = []
 
-for f in os.listdir(clonexml_dir):
+for tmpf in os.listdir(clonexml_dir):
     black_list = [ "managed-storage", "cross-pool", "force", "skip",
                    "fullpool"]
-    if f.endswith("-out.xml"):
-        f = f[0:(len(f) - len("-out.xml"))]
-        if f not in clone_files and f not in black_list:
-            clone_files.append(f)
+    if tmpf.endswith("-out.xml"):
+        tmpf = tmpf[0:(len(tmpf) - len("-out.xml"))]
+        if tmpf not in clone_files and tmpf not in black_list:
+            clone_files.append(tmpf)
 
 conn = tests.open_testdriver()
 

virtinst/VirtualNetworkInterface.py

@@ -17,10 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
-import re
 import logging
 import libvirt
-import __builtin__
 
 import _util
 import VirtualDevice
@@ -82,17 +80,7 @@ def set_type(self, val):
     def get_macaddr(self):
         return self._macaddr
     def set_macaddr(self, val):
-        if val is None:
-            self._macaddr = None
-            return
-
-        if __builtin__.type(val) is not str:
-            raise ValueError, _("MAC address must be a string.")
-
-        form = re.match("^([0-9a-fA-F]{1,2}:){5}[0-9a-fA-F]{1,2}$", val)
-        if form is None:
-            raise ValueError(_("MAC address must be of the format "
-                               "AA:BB:CC:DD:EE:FF"))
+        _util.validate_macaddr(val)
         self._macaddr = val
     macaddr = property(get_macaddr, set_macaddr)
 

virtinst/_util.py

@@ -153,6 +153,17 @@ def validate_name(name_type, val):
         raise ValueError, _("%s name can only contain alphanumeric, '_', '.', "
                             "or '-' characters") % name_type
 
+def validate_macaddr(val):
+    if val is None:
+        return
+
+    if type(val) is not str:
+        raise ValueError, _("MAC address must be a string.")
+
+    form = re.match("^([0-9a-fA-F]{1,2}:){5}[0-9a-fA-F]{1,2}$", val)
+    if form is None:
+        raise ValueError(_("MAC address must be of the format "
+                           "AA:BB:CC:DD:EE:FF"))
 def xml_append(orig, new):
     """
     Little function that helps generate consistent xml