Merge ~mpontillo/maas:subnet-ip-listing-trigger--bug-1761281 into maas:master

[Mike Pontillo]

LP: #1761281 - Add triggers to update subnet websocket for IP address insert and delete.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b subnet-ip-listing-trigger--bug-1761281 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2608/console
COMMIT: 11a634aa02a589047c15ec00a2499a9765b87a57

review: Needs Fixing

2937530... by Mike Pontillo on 2018-04-25

Fix lint.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b subnet-ip-listing-trigger--bug-1761281 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 29375308ee460df55f757d78392ceafcf6b907a3

review: Approve

[Lee Trager (ltrager)]

LGTM!

review: Approve

diff --git a/src/maasserver/triggers/tests/test_init.py b/src/maasserver/triggers/tests/test_init.py
index 1079ef6..66b1c9a 100644
--- a/src/maasserver/triggers/tests/test_init.py
+++ b/src/maasserver/triggers/tests/test_init.py
@@ -238,6 +238,8 @@ class TestTriggersUsed(MAASServerTestCase):
         "staticipaddress_ipaddress_domain_insert_notify",
         "staticipaddress_ipaddress_domain_update_notify",
         "staticipaddress_ipaddress_machine_update_notify",
+        "staticipaddress_ipaddress_subnet_delete_notify",
+        "staticipaddress_ipaddress_subnet_insert_notify",
         "staticipaddress_ipaddress_subnet_update_notify",
         "staticroute_staticroute_create_notify",
         "staticroute_staticroute_delete_notify",
diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
index 5e69c2d..f7961a2 100644
--- a/src/maasserver/triggers/tests/test_websocket_listener.py
+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
@@ -2220,6 +2220,96 @@ class TestSubnetListener(
         finally:
             yield listener.stopService()
 
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_with_update_on_ip_address_insert(self):
+        yield deferToDatabase(register_websocket_triggers)
+        node = yield deferToDatabase(
+            self.create_node,
+            {'node_type': NODE_TYPE.MACHINE, 'interface': True})
+        interface = yield deferToDatabase(
+            self.get_node_boot_interface, node.system_id)
+        subnet = yield deferToDatabase(self.create_subnet)
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register('subnet', lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.create_staticipaddress, {
+                    "alloc_type": IPADDRESS_TYPE.AUTO,
+                    "interface": interface,
+                    "subnet": subnet,
+                    "ip": "",
+                })
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % subnet.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_with_update_on_ip_address_update(self):
+        yield deferToDatabase(register_websocket_triggers)
+        node = yield deferToDatabase(
+            self.create_node,
+            {'node_type': NODE_TYPE.MACHINE, 'interface': True})
+        interface = yield deferToDatabase(
+            self.get_node_boot_interface, node.system_id)
+        subnet = yield deferToDatabase(self.create_subnet)
+        selected_ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
+        ipaddress = yield deferToDatabase(
+            self.create_staticipaddress, {
+                "alloc_type": IPADDRESS_TYPE.AUTO,
+                "interface": interface,
+                "subnet": subnet,
+                "ip": "",
+                })
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register('subnet', lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_staticipaddress, ipaddress.id,
+                {"ip": selected_ip})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % subnet.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_with_update_on_ip_address_delete(self):
+        yield deferToDatabase(register_websocket_triggers)
+        node = yield deferToDatabase(
+            self.create_node,
+            {'node_type': NODE_TYPE.MACHINE, 'interface': True})
+        interface = yield deferToDatabase(
+            self.get_node_boot_interface, node.system_id)
+        subnet = yield deferToDatabase(self.create_subnet)
+        ipaddress = yield deferToDatabase(
+            self.create_staticipaddress, {
+                "alloc_type": IPADDRESS_TYPE.AUTO,
+                "interface": interface,
+                "subnet": subnet,
+                "ip": "",
+                })
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register('subnet', lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.delete_staticipaddress, ipaddress.id)
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % subnet.id), dv.value)
+        finally:
+            yield listener.stopService()
+
 
 class TestSpaceListener(
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
diff --git a/src/maasserver/triggers/websocket.py b/src/maasserver/triggers/websocket.py
index ec87ae9..e489202 100644
--- a/src/maasserver/triggers/websocket.py
+++ b/src/maasserver/triggers/websocket.py
@@ -709,6 +709,14 @@ STATIC_IP_ADDRESS_NODE_NOTIFY = dedent("""\
 STATIC_IP_ADDRESS_SUBNET_NOTIFY = dedent("""\
     CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
     BEGIN
+      IF TG_OP = 'INSERT' THEN
+        PERFORM pg_notify('subnet_update',CAST(NEW.subnet_id AS text));
+        RETURN NEW;
+      END IF;
+      IF TG_OP = 'DELETE' THEN
+        PERFORM pg_notify('subnet_update',CAST(OLD.subnet_id AS text));
+        RETURN OLD;
+      END IF;
       IF OLD.subnet_id != NEW.subnet_id THEN
         IF OLD.subnet_id IS NOT NULL THEN
           PERFORM pg_notify('subnet_update',CAST(OLD.subnet_id AS text));
@@ -1416,9 +1424,13 @@ def register_websocket_triggers():
     # IP address subnet notifications
     register_procedure(
         STATIC_IP_ADDRESS_SUBNET_NOTIFY % 'ipaddress_subnet_update_notify')
-    register_trigger(
-        "maasserver_staticipaddress",
-        "ipaddress_subnet_update_notify", "update")
+    register_procedure(
+        STATIC_IP_ADDRESS_SUBNET_NOTIFY % 'ipaddress_subnet_insert_notify')
+    register_procedure(
+        STATIC_IP_ADDRESS_SUBNET_NOTIFY % 'ipaddress_subnet_delete_notify')
+    register_triggers(
+        "maasserver_staticipaddress", "ipaddress_subnet",
+        events=EVENTS_IUD)
 
     # IP address domain notifications
     register_procedure(