Merge ~blake-rouse/maas:fix-1817894 into maas:master

[Blake Rouse]

LP: #1817894 - Fix PXE mechanism where PXE interface shares a MAC address with a bridge or bond.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 55cd113..602ff68 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -348,7 +348,8 @@ def get_config(
             machine.bios_boot_method = bios_boot_method
 
         try:
-            machine.boot_interface = machine.interface_set.get(mac_address=mac)
+            machine.boot_interface = machine.interface_set.get(
+                type=INTERFACE_TYPE.PHYSICAL, mac_address=mac)
         except ObjectDoesNotExist:
             # MAC is unknown or wasn't sent. Determine the boot_interface using
             # the boot_cluster_ip.
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index fcb3558..8ff0a11 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -701,6 +701,23 @@ class TestGetConfig(MAASServerTestCase):
             query_count=22)
         self.assertEqual(nic, reload_object(node).boot_interface)
 
+    def test__sets_boot_interface_handles_virtual_nics_same_mac(self):
+        rack_controller = factory.make_RackController()
+        local_ip = factory.make_ip_address()
+        remote_ip = factory.make_ip_address()
+        node = self.make_node()
+        nic = node.get_boot_interface()
+        # Create a bridge that has the same mac address as the parent nic.
+        factory.make_Interface(
+            INTERFACE_TYPE.BRIDGE, parents=[nic], mac_address=nic.mac_address)
+        node.boot_interface = None
+        node.save()
+        mac = nic.mac_address
+        get_config(
+            rack_controller.system_id, local_ip, remote_ip, mac=mac,
+            query_count=22)
+        self.assertEqual(nic, reload_object(node).boot_interface)
+
     def test__updates_boot_interface_when_changed(self):
         rack_controller = factory.make_RackController()
         local_ip = factory.make_ip_address()