Merge lp:~mpontillo/maas/fix-space-ui-updates--bug-1682663 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Add trigger to notify subnets when their parent VLAN changes.

Note: this was a regression due to the change from L3 spaces to L2 spaces in MAAS 2.2.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~mpontillo/maas/fix-space-ui-updates--bug-1682663 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [512 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [457 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/multiverse amd64 Packages [8,916 B]
Fetched 1,284 kB in 0s (2,244 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql psmisc pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is al...

=== modified file 'src/maasserver/triggers/tests/test_init.py'
--- src/maasserver/triggers/tests/test_init.py	2017-04-11 18:13:02 +0000
+++ src/maasserver/triggers/tests/test_init.py	2017-04-17 17:05:21 +0000
@@ -243,6 +243,7 @@
         "vlan_vlan_create_notify",
         "vlan_vlan_delete_notify",
         "vlan_vlan_machine_update_notify",
+        "vlan_vlan_subnet_update_notify",
         "vlan_vlan_update_notify",
         "zone_zone_create_notify",
         "zone_zone_delete_notify",
 
=== modified file 'src/maasserver/triggers/tests/test_websocket_listener.py'
--- src/maasserver/triggers/tests/test_websocket_listener.py	2017-04-11 01:29:40 +0000
+++ src/maasserver/triggers/tests/test_websocket_listener.py	2017-04-17 17:05:21 +0000
@@ -1909,6 +1909,26 @@
 
     @wait_for_reactor
     @inlineCallbacks
+    def test__calls_handler_on_update_notification_for_vlan(self):
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("subnet", lambda *args: dv.set(args))
+        subnet = yield deferToDatabase(self.create_subnet)
+
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_vlan,
+                subnet.vlan.id,
+                {'name': factory.make_name('name')})
+            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_on_delete_notification(self):
         yield deferToDatabase(register_websocket_triggers)
         listener = self.make_listener_without_delay()
 
=== modified file 'src/maasserver/triggers/websocket.py'
--- src/maasserver/triggers/websocket.py	2017-04-11 01:29:40 +0000
+++ src/maasserver/triggers/websocket.py	2017-04-17 17:05:21 +0000
@@ -677,6 +677,25 @@
     """)
 
 
+# Procedure that is called when vlan is updated.
+VLAN_SUBNET_NOTIFY = dedent("""\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    DECLARE
+        subnet RECORD;
+    BEGIN
+      FOR subnet IN (
+        SELECT DISTINCT maasserver_subnet.id AS id
+        FROM maasserver_subnet, maasserver_vlan
+        WHERE maasserver_vlan.id = %s)
+      LOOP
+        PERFORM pg_notify('subnet_update',CAST(subnet.id AS text));
+      END LOOP;
+      RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """)
+
+
 # Procedure that is called when an IP address is updated to update the related
 # node.
 STATIC_IP_ADDRESS_NODE_NOTIFY = dedent("""\
@@ -1368,6 +1387,13 @@
         "maasserver_vlan",
         "vlan_machine_update_notify", "update")
 
+    # VLAN subnet notifications
+    register_procedure(
+        VLAN_SUBNET_NOTIFY % ('vlan_subnet_update_notify', 'NEW.id'))
+    register_trigger(
+        "maasserver_vlan",
+        "vlan_subnet_update_notify", "update")
+
     # IP address node notifications
     register_procedure(
         STATIC_IP_ADDRESS_NODE_NOTIFY % (