Merge lp:~lamont/maas/bug-1647703-2.1 into lp:maas/2.1

[LaMont Jones]

Update the websocket node when the domain name changes.

Update the websocket node when the domain name changes.

[LaMont Jones (lamont)]

Trivial backport.

review: Approve

=== modified file 'src/maasserver/triggers/tests/test_websocket_listener.py'
--- src/maasserver/triggers/tests/test_websocket_listener.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/triggers/tests/test_websocket_listener.py	2016-12-07 15:52:40 +0000
@@ -162,6 +162,27 @@
         finally:
             yield listener.stopService()
 
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_domain_name_change(self):
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        domain = yield deferToDatabase(self.create_domain, {})
+        params = self.params.copy()
+        params['domain'] = domain
+        yield deferToDatabase(self.create_node, params)
+        listener.register(self.listener, lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_domain,
+                domain.id,
+                {'name': factory.make_name('name')})
+            yield dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
 
 class TestDeviceWithParentListener(
         MAASTransactionServerTestCase, TransactionalHelpersMixin):

=== modified file 'src/maasserver/triggers/websocket.py'
--- src/maasserver/triggers/websocket.py	2016-10-19 05:59:50 +0000
+++ src/maasserver/triggers/websocket.py	2016-12-07 15:52:40 +0000
@@ -795,6 +795,41 @@
     """)
 
 
+# Procedure that is called when a domain is updated.  Sends a notify message
+# for node_update.
+DOMAIN_NODE_NOTIFY = dedent("""\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    DECLARE
+      node RECORD;
+      pnode RECORD;
+    BEGIN
+      IF OLD.name != NEW.name THEN
+        SELECT system_id, node_type, parent_id INTO node
+        FROM maasserver_node
+        WHERE maasserver_node.domain_id = NEW.id;
+
+        IF node.system_id IS NOT NULL THEN
+          IF node.node_type = %d THEN
+            PERFORM pg_notify('machine_update',CAST(node.system_id AS text));
+          ELSIF node.node_type IN (%d, %d, %d) THEN
+            PERFORM pg_notify(
+              'controller_update',CAST(node.system_id AS text));
+          ELSIF node.parent_id IS NOT NULL THEN
+            SELECT system_id INTO pnode
+            FROM maasserver_node
+            WHERE id = node.parent_id;
+            PERFORM pg_notify('machine_update',CAST(pnode.system_id AS text));
+          ELSE
+            PERFORM pg_notify('device_update',CAST(node.system_id AS text));
+          END IF;
+        END IF;
+      END IF;
+      RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """)
+
+
 def render_notification_procedure(proc_name, event_name, cast):
     return dedent("""\
         CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
@@ -1254,6 +1289,11 @@
 
     # Domain table
     register_procedure(
+        DOMAIN_NODE_NOTIFY % (
+            'domain_node_update_notify',
+            NODE_TYPE.MACHINE, NODE_TYPE.RACK_CONTROLLER,
+            NODE_TYPE.REGION_CONTROLLER, NODE_TYPE.REGION_AND_RACK_CONTROLLER))
+    register_procedure(
         render_notification_procedure(
             'domain_create_notify', 'domain_create', 'NEW.id'))
     register_procedure(
@@ -1263,6 +1303,8 @@
         render_notification_procedure(
             'domain_delete_notify', 'domain_delete', 'OLD.id'))
     register_trigger(
+        "maasserver_domain", "domain_node_update_notify", "update")
+    register_trigger(
         "maasserver_domain", "domain_create_notify", "insert")
     register_trigger(
         "maasserver_domain", "domain_update_notify", "update")