Add is_conflict_net to NIC class.

Author: crobinso

virtinst/CloneManager.py

@@ -223,13 +223,12 @@ def setup_original(self):
         #
         for i in self._clone_mac:
             ret, msg = self._check_mac(i)
-            if ret == 0:
-                continue
-            elif ret == 1 or ret == 2:
-                raise RuntimeError, msg
-            elif ret == 3:
-                print >> sys.stderr, msg
-                logging.warning(msg)
+            if msg is not None:
+                if ret:
+                    raise RuntimeError, msg
+                else:
+                    print >> sys.stderr, msg
+                    logging.warning(msg)
 
         logging.debug("setup_original out")
 
@@ -285,7 +284,7 @@ def setup_clone(self):
                 while 1:
                     mac = util.randomMAC()
                     ret, msg = self._check_mac(mac)
-                    if ret != 0:
+                    if msg is not None:
                         continue
                     else:
                         break
@@ -338,45 +337,10 @@ def _check_file(self, conn, disk, size):
 
     #
     # check used mac func
-    # 0 : OK
-    # 1 : NG Conflict with the physical NIC
-    # 2 : NG Used by another guest
-    # 3 : NG Used by another inactive guest
     #
     def _check_mac(self, mac):
-
-        msg0=""
-        msg1=_("The MAC address you entered conflicts with the physical NIC.")
-        msg2=_("The MAC address you entered is already in use by another guest!")
-        msg3=_("The MAC address you entered is already in use by another inactive guest!")
-
-        # get Running Domains
-        ids = self._hyper_conn.listDomainsID();
-
-        vms = []
-        for id in ids:
-            vm = self._hyper_conn.lookupByID(id)
-            vms.append(vm)
-        # get inactive Domains
-        inactive_vm = []
-        names = self._hyper_conn.listDefinedDomains()
-
-        for name in names:
-            vm = self._hyper_conn.lookupByName(name)
-            inactive_vm.append(vm)
-
-        # get the Host's NIC MACaddress
-        hostdevs = util.get_host_network_devices()
-
-        if self._count_mac(vms, mac) > 0:
-            return (2, msg2)
-        for (dummy, dummy, dummy, dummy, host_macaddr) in hostdevs:
-            if mac.upper() == host_macaddr.upper():
-               return (1, msg1)
-        if self._count_mac(inactive_vm, mac) > 0:
-            return (3, msg3)
-
-        return (0, msg0)
+        nic = Guest.VirtualNetworkInterface(macaddr=mac)
+        return nic.is_conflict_net(self._hyper_conn)
 
     #
     # get count macaddr

virtinst/Guest.py

@@ -273,41 +273,66 @@ def __init__(self, macaddr = None, type="bridge", bridge = None, network=None):
         else:
             raise ValueError, _("Unknown network type %s") % (type,)
 
-    def setup(self, conn):
+    def is_conflict_net(self, conn):
+        """is_conflict_net: determines if mac conflicts with others in system
+
+           returns a two element tuple: 
+               first element is True if fatal collision occured
+               second element is a string description of the collision.
+           Non fatal collisions (mac addr collides with inactive guest) will
+           return (False, "description of collision")"""
         # get Running Domains
         ids = conn.listDomainsID();
         vms = []
         for id in ids:
-            vm = conn.lookupByID(id)
-            vms.append(vm)
+            try:
+                vm = conn.lookupByID(id)
+                vms.append(vm)
+            except libvirt.libvirtError:
+                # guest probably in process of dieing
+                logging.warn("conflict_net: Failed to lookup domain id %d" % id)
         # get inactive Domains
         inactive_vm = []
         names = conn.listDefinedDomains()
         for name in names:
-            vm = conn.lookupByName(name)
-            inactive_vm.append(vm)
+            try:
+                vm = conn.lookupByName(name)
+                inactive_vm.append(vm)
+            except:
+                # guest probably in process of dieing
+                logging.warn("conflict_net: Failed to lookup domain %d" % name)
 
         # get the Host's NIC MACaddress
         hostdevs = util.get_host_network_devices()
 
+        if self.countMACaddr(vms) > 0:
+            return (True, _("The MAC address you entered is already in use by another virtual machine!"))
+        for (dummy, dummy, dummy, dummy, host_macaddr) in hostdevs:
+            if self.macaddr.upper() == host_macaddr.upper():
+                return (True, _("The MAC address you entered conflicts with the physical NIC."))
+        if self.countMACaddr(inactive_vm) > 0:
+            return (False, _("The MAC address you entered is already in use by another inactive virtual machine!"))
+        return (False, None)
+
+    def setup(self, conn):
+
         # check conflict MAC address
         if self.macaddr is None:
             while 1:
                 self.macaddr = util.randomMAC()
-                if self.countMACaddr(vms) > 0:
+                if self.is_conflict_net(conn)[1] is not None:
                     continue
                 else:
                     break
         else:
-            if self.countMACaddr(vms) > 0:
-                raise RuntimeError, _("The MAC address you entered is already in use by another virtual machine!")
-            for (dummy, dummy, dummy, dummy, host_macaddr) in hostdevs:
-                if self.macaddr.upper() == host_macaddr.upper():
-                    raise RuntimeError, _("The MAC address you entered conflicts with the physical NIC.")
-            if self.countMACaddr(inactive_vm) > 0:
-                msg = _("The MAC address you entered is already in use by another inactive virtual machine!")
-                print >> sys.stderr, msg
-                logging.warning(msg)
+            ret, msg = self.is_conflict_net(conn)
+            if msg is not None:
+                # Error message found
+                if ret is False:
+                    # Not fatal
+                    logging.warning(msg)
+                else:
+                    raise RuntimeError(msg)
 
         if not self.bridge and self.type == "bridge":
             self.bridge = util.default_bridge()