Merge ~mpontillo/maas:fix-duplicate-node-event-log--bug-1804551 into maas:master

[Mike Pontillo]

LP: #1804551 - Fix case where an IP is linked to multiple interfaces when logging events

424aac8... by Mike Pontillo on 2018-11-22

Format imports.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

diff --git a/src/maasserver/rpc/events.py b/src/maasserver/rpc/events.py
index b41e8fb..4eef69c 100644
--- a/src/maasserver/rpc/events.py
+++ b/src/maasserver/rpc/events.py
@@ -107,10 +107,9 @@ def send_event_ip_address(ip_address, type_name, description, timestamp):
     except EventType.DoesNotExist:
         raise NoSuchEventType.from_name(type_name)
 
-    try:
-        node = Node.objects.get(
-            interface__ip_addresses__ip=ip_address)
-    except Node.DoesNotExist:
+    node = Node.objects.filter(
+        interface__ip_addresses__ip=ip_address).first()
+    if node is None:
         # The node doesn't exist, but we don't raise an exception - it's
         # entirely possible the cluster has started sending events for a node
         # that we don't know about yet. This is most likely to happen when a
diff --git a/src/maasserver/rpc/tests/test_events.py b/src/maasserver/rpc/tests/test_events.py
index 5229f03..796fa66 100644
--- a/src/maasserver/rpc/tests/test_events.py
+++ b/src/maasserver/rpc/tests/test_events.py
@@ -9,6 +9,7 @@ __all__ = []
 import datetime
 import logging
 
+from maasserver.enum import INTERFACE_TYPE
 from maasserver.models.event import Event
 from maasserver.models.eventtype import EventType
 from maasserver.rpc import events
@@ -125,3 +126,24 @@ class TestSendEventIPAddress(MAASServerTestCase):
         Event.objects.get(
             node=node, type=event_type, description=description,
             created=timestamp)
+
+    def test__creates_event_for_node_with_bridge_interface(self):
+        event_type = factory.make_EventType()
+        node = factory.make_Node(interface=True)
+        eth0 = node.get_boot_interface()
+        # Create a bridge with the same MAC as the boot interface.
+        factory.make_Interface(
+            INTERFACE_TYPE.BRIDGE, node=node, mac_address=eth0.mac_address,
+            parents=[node.get_boot_interface()])
+        description = factory.make_name('description')
+        timestamp = datetime.datetime.utcnow()
+        ip = factory.make_StaticIPAddress()
+        for interface in node.interface_set.all():
+            ip.interface_set.add(interface)
+        events.send_event_ip_address(
+            ip.ip, event_type.name,
+            description, timestamp)
+        # Doesn't raise a DoesNotExist error.
+        Event.objects.get(
+            node=node, type=event_type, description=description,
+            created=timestamp)