Merge lp:~lamont/maas/bug-1562106 into lp:~maas-committers/maas/trunk

[LaMont Jones]

Typo in the trigger for staticip address updates and insert/deletes.

Typo in the trigger for staticip address updates and insert/deletes.

[Andres Rodriguez (andreserl)]

lgtm! What about tests ? aren't there tests for this?

review: Approve

[Blake Rouse (blake-rouse)]

Tests?

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Wow that was a lot of missing tests. Looks good now. Thanks for adding all the tests.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1562106 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [116 kB]
Hit:2 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main Sources [1,107 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,517 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main amd64 Packages [1,435 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main Translation-en [731 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,249 kB]
Get:10 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,188 kB]
Fetched 22.3 MB in 3s (6,214 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential 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 libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage 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-mock python3-netaddr python3-netifaces 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-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu4).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P4-5).
bind9utils is already the newest version (1:9.10.3.dfsg.P4-5).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubu...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1562106 into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [116 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,517 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,249 kB]
Fetched 14.9 MB in 2s (4,983 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential 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 libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage 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-mock python3-netaddr python3-netifaces 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-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu4).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P4-5).
bind9utils is already the newest version (1:9.10.3.dfsg.P4-5).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.29ubuntu1).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P4-5).
firefox is already the newest version (45.0.1+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
isc-dhcp-common is already the newest ...

=== modified file 'src/maasserver/triggers/tests/helper.py'
--- src/maasserver/triggers/tests/helper.py	2016-03-25 14:52:23 +0000
+++ src/maasserver/triggers/tests/helper.py	2016-03-29 17:03:39 +0000
@@ -16,6 +16,9 @@
 from maasserver.models.blockdevice import BlockDevice
 from maasserver.models.cacheset import CacheSet
 from maasserver.models.dhcpsnippet import DHCPSnippet
+from maasserver.models.dnsdata import DNSData
+from maasserver.models.dnsresource import DNSResource
+from maasserver.models.domain import Domain
 from maasserver.models.event import Event
 from maasserver.models.fabric import Fabric
 from maasserver.models.filesystem import Filesystem
@@ -134,6 +137,51 @@
         return node.get_boot_interface()
 
     @transactional
+    def create_domain(self, params=None):
+        if params is None:
+            params = {}
+        return factory.make_Domain(**params)
+
+    @transactional
+    def update_domain(self, id, params):
+        return apply_update_to_model(Domain, id, params)
+
+    @transactional
+    def delete_domain(self, id):
+        domain = Domain.objects.get(id=id)
+        domain.delete()
+
+    @transactional
+    def create_dnsresource(self, params=None):
+        if params is None:
+            params = {}
+        return factory.make_DNSResource(**params)
+
+    @transactional
+    def update_dnsresource(self, id, params):
+        return apply_update_to_model(DNSResource, id, params)
+
+    @transactional
+    def delete_dnsresource(self, id):
+        dnsresource = DNSResource.objects.get(id=id)
+        dnsresource.delete()
+
+    @transactional
+    def create_dnsdata(self, params=None):
+        if params is None:
+            params = {}
+        return factory.make_DNSData(**params)
+
+    @transactional
+    def update_dnsdata(self, id, params):
+        return apply_update_to_model(DNSData, id, params)
+
+    @transactional
+    def delete_dnsdata(self, id):
+        dnsdata = DNSData.objects.get(id=id)
+        dnsdata.delete()
+
+    @transactional
     def create_fabric(self, params=None):
         if params is None:
             params = {}

=== modified file 'src/maasserver/triggers/tests/test_websocket_listener.py'
--- src/maasserver/triggers/tests/test_websocket_listener.py	2016-03-25 14:52:23 +0000
+++ src/maasserver/triggers/tests/test_websocket_listener.py	2016-03-29 17:03:39 +0000
@@ -1281,6 +1281,215 @@
             yield listener.stopService()
 
 
+class TestDomainListener(
+        MAASTransactionServerTestCase, TransactionalHelpersMixin):
+    """End-to-end test of both the listeners code and the cluster
+    triggers code."""
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_create_notification(self):
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            domain = yield deferToDatabase(self.create_domain)
+            yield dv.get(timeout=2)
+            self.assertEqual(('create', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_update_notification(self):
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        domain = yield deferToDatabase(self.create_domain)
+
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_domain,
+                domain.id,
+                {'name': factory.make_name('name')})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.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()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        domain = yield deferToDatabase(self.create_domain)
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_domain, domain.id)
+            yield dv.get(timeout=2)
+            self.assertEqual(('delete', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_with_update_on_ip_address_update(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        params = {
+            'node_type': NODE_TYPE.MACHINE,
+            'domain': domain,
+        }
+        node = yield deferToDatabase(self.create_node, params)
+        interface = yield deferToDatabase(
+            self.create_interface, {
+                "node": node})
+        subnet = yield deferToDatabase(self.create_subnet)
+        ipaddress = yield deferToDatabase(
+            self.create_staticipaddress, {
+                "alloc_type": IPADDRESS_TYPE.AUTO,
+                "interface": interface,
+                "subnet": subnet,
+                "ip": "",
+                })
+
+        selected_ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_staticipaddress, ipaddress.id, {
+                    "alloc_type": IPADDRESS_TYPE.STICKY,
+                    "ip": selected_ip})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_dnsresource_create_notification(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.create_dnsresource, {"domain": domain})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_dnsresource_update_notification(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        dnsrr = yield deferToDatabase(
+            self.create_dnsresource, {"domain": domain})
+        listener.register("domain", lambda *args: dv.set(args))
+
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_dnsresource,
+                dnsrr.id,
+                {'name': factory.make_name('name')})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    #@wait_for_reactor
+    @wait_for(360000)
+    @inlineCallbacks
+    def test__calls_handler_on_dnsresource_delete_notification(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        dnsrr = yield deferToDatabase(self.create_dnsresource, {
+            'domain': domain})
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_dnsresource, dnsrr.id)
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_dnsdata_create_notification(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.create_dnsdata, {"domain": domain})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_dnsdata_update_notification(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        dnsdata = yield deferToDatabase(
+            self.create_dnsdata, {"domain": domain})
+        listener.register("domain", lambda *args: dv.set(args))
+
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_dnsdata,
+                dnsdata.id, {
+                    'ttl': random.randint(100, 199)})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_dnsdata_delete_notification(self):
+        domain = yield deferToDatabase(self.create_domain)
+        yield deferToDatabase(register_websocket_triggers)
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("domain", lambda *args: dv.set(args))
+        dnsdata = yield deferToDatabase(self.create_dnsdata, {
+            "domain": domain})
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_dnsdata, dnsdata.id)
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+
 class TestSubnetListener(
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
     """End-to-end test of both the listeners code and the cluster

=== modified file 'src/maasserver/triggers/websocket.py'
--- src/maasserver/triggers/websocket.py	2016-03-25 14:52:23 +0000
+++ src/maasserver/triggers/websocket.py	2016-03-29 17:03:39 +0000
@@ -600,7 +600,9 @@
     DECLARE
       dom RECORD;
     BEGIN
-      IF OLD.ip != NEW.ip THEN
+      IF ((OLD.ip IS NULL and NEW.ip IS NOT NULL) OR
+            (OLD.ip IS NOT NULL and NEW.ip IS NULL) OR
+            OLD.ip != NEW.ip) THEN
         FOR dom IN (
           SELECT DISTINCT ON (domain.id)
             domain.id
@@ -610,7 +612,7 @@
             JOIN maasserver_interface AS interface ON
               iia.interface_id = interface.id
             JOIN maasserver_node AS node ON
-              node.boot_interface_id = interface.id) ON
+              node.id = interface.node_id) ON
             iia.staticipaddress_id = staticipaddress.id
           LEFT JOIN (
             maasserver_dnsresource_ip_addresses AS dia
@@ -621,7 +623,7 @@
             domain.id = node.domain_id OR domain.id = dnsresource.domain_id
           WHERE staticipaddress.id = OLD.id OR staticipaddress.id = NEW.id)
         LOOP
-          PERFORM pg_notify('domain_update',CAST(dom.domain_id AS text));
+          PERFORM pg_notify('domain_update',CAST(dom.id AS text));
         END LOOP;
       END IF;
       RETURN NEW;
@@ -645,7 +647,7 @@
           JOIN maasserver_interface AS interface ON
             iia.interface_id = interface.id
           JOIN maasserver_node AS node ON
-            node.boot_interface_id = interface.id) ON
+            node.id = interface.node_id) ON
           iia.staticipaddress_id = staticipaddress.id
         LEFT JOIN (
           maasserver_dnsresource_ip_addresses AS dia
@@ -656,7 +658,7 @@
           domain.id = node.domain_id OR domain.id = dnsresource.domain_id
         WHERE staticipaddress.id = %s)
       LOOP
-        PERFORM pg_notify('domain_update',CAST(dom.domain_id AS text));
+        PERFORM pg_notify('domain_update',CAST(dom.id AS text));
       END LOOP;
       RETURN NEW;
     END;
@@ -667,14 +669,12 @@
 DNSDATA_DOMAIN_NOTIFY = dedent("""\
     CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
     DECLARE
-        domain RECORD;
+        dom RECORD;
     BEGIN
-      SELECT DISTINCT ON (domain_id) domain_id INTO domain
-      FROM maasserver_dnsdata AS dnsdata
-      JOIN maasserver_dnsresource AS dnsresource ON
-        dnsresource.id = dnsdata.dnsresource_id
-      WHERE dnsdata.dnsresource_id = %s;
-      PERFORM pg_notify('domain_update',CAST(domain.domain_id AS text));
+      SELECT DISTINCT ON (domain_id) domain_id INTO dom
+      FROM maasserver_dnsresource AS dnsresource
+      WHERE dnsresource.id = %s;
+      PERFORM pg_notify('domain_update',CAST(dom.domain_id AS text));
       RETURN NEW;
     END;
     $$ LANGUAGE plpgsql;
@@ -1004,8 +1004,7 @@
     register_procedure(
         DNSDATA_DOMAIN_NOTIFY % (
             'dnsdata_domain_update_notify',
-            'NEW.dnsresource_id OR '
-            'dnsdata.dnsresource_id = OLD.dnsresource_id'))
+            'OLD.dnsresource_id OR dnsresource.id = NEW.dnsresource_id'))
     register_procedure(
         DNSDATA_DOMAIN_NOTIFY % (
             'dnsdata_domain_delete_notify', 'OLD.dnsresource_id'))