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

[LaMont Jones]

Database triggers were missing for dnsresource_ip_addresses and interface_ip_addresses m2m tables.

Database triggers were missing for dnsresource_ip_addresses and interface_ip_addresses m2m tables.

[Mike Pontillo (mpontillo)]

Looks good to me.

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/domain_details.js'
--- src/maasserver/static/js/angular/controllers/domain_details.js	2016-04-29 08:04:27 +0000
+++ src/maasserver/static/js/angular/controllers/domain_details.js	2016-06-02 16:07:14 +0000
@@ -44,7 +44,10 @@
 
         // Return true if this is the default domain.
         $scope.isDefaultDomain = function() {
-            return $scope.domain.id === 0;
+            if(angular.isObject($scope.domain)) {
+                return $scope.domain.id === 0;
+            }
+            return false;
         };
 
         // Called to check if the space can be deleted.

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2016-06-02 14:44:04 +0000
+++ src/maasserver/testing/factory.py	2016-06-02 16:07:14 +0000
@@ -720,7 +720,8 @@
 
     def make_StaticIPAddress(self, ip=UNDEFINED,
                              alloc_type=IPADDRESS_TYPE.AUTO, interface=None,
-                             user=None, subnet=None, **kwargs):
+                             user=None, subnet=None, dnsresource=None,
+                             **kwargs):
         """Create and return a StaticIPAddress model object.
 
         If a non-None `interface` is passed, connect this IP address to the
@@ -748,6 +749,9 @@
         if interface is not None:
             interface.ip_addresses.add(ipaddress)
             interface.save()
+        if dnsresource is not None:
+            dnsresource.ip_addresses.add(ipaddress)
+            dnsresource.save()
         if hostname is not None:
             if not isinstance(hostname, (tuple, list)):
                 hostname = [hostname]

=== modified file 'src/maasserver/triggers/testing.py'
--- src/maasserver/triggers/testing.py	2016-04-29 10:33:55 +0000
+++ src/maasserver/triggers/testing.py	2016-06-02 16:07:14 +0000
@@ -178,6 +178,10 @@
         dnsresource.delete()
 
     @transactional
+    def get_first_staticipaddress(self, obj):
+        return obj.ip_addresses.first()
+
+    @transactional
     def create_dnsdata(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-05-26 07:09:10 +0000
+++ src/maasserver/triggers/tests/test_websocket_listener.py	2016-06-02 16:07:14 +0000
@@ -1398,6 +1398,73 @@
 
     @wait_for_reactor
     @inlineCallbacks
+    def test__calls_handler_with_update_on_node_ip_address_addition(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)
+
+        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.create_staticipaddress, {
+                    "alloc_type": IPADDRESS_TYPE.STICKY,
+                    "interface": interface,
+                    "subnet": subnet,
+                    "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_with_update_on_node_ip_address_removal(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)
+        selected_ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
+        ipaddress = yield deferToDatabase(
+            self.create_staticipaddress, {
+                "alloc_type": IPADDRESS_TYPE.STICKY,
+                "interface": interface,
+                "subnet": subnet,
+                "ip": selected_ip,
+                })
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register("domain", 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' % 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)
@@ -1415,6 +1482,53 @@
 
     @wait_for_reactor
     @inlineCallbacks
+    def test__calls_handler_on_dnsresource_address_addition(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, "no_ip_addresses": True})
+        subnet = yield deferToDatabase(self.create_subnet)
+        listener.register("domain", lambda *args: dv.set(args))
+
+        yield listener.startService()
+        selected_ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
+        try:
+            yield deferToDatabase(
+                self.create_staticipaddress, {
+                    "alloc_type": IPADDRESS_TYPE.STICKY,
+                    "dnsresource": dnsrr,
+                    "subnet": subnet,
+                    "ip": selected_ip,
+                    })
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % domain.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for(360000)
+    @inlineCallbacks
+    def test__calls_handler_on_dnsresource_address_removal(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))
+        staticip = yield deferToDatabase(self.get_first_staticipaddress, dnsrr)
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_staticipaddress, staticip.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_dnsresource_update_notification(self):
         domain = yield deferToDatabase(self.create_domain)
         yield deferToDatabase(register_websocket_triggers)

=== modified file 'src/maasserver/triggers/websocket.py'
--- src/maasserver/triggers/websocket.py	2016-05-24 07:30:16 +0000
+++ src/maasserver/triggers/websocket.py	2016-06-02 16:07:14 +0000
@@ -132,6 +132,26 @@
 
 
 # Procedure that is called when a static ip address is linked or unlinked to
+# an Interface. Sends a notify message for domain_update
+INTERFACE_IP_ADDRESS_DOMAIN_NOTIFY = dedent("""\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    DECLARE
+      domain RECORD;
+    BEGIN
+      SELECT maasserver_domain.id INTO domain
+      FROM maasserver_node, maasserver_interface, maasserver_domain
+      WHERE maasserver_node.id = maasserver_interface.node_id
+      AND maasserver_domain.id = maasserver_node.domain_id
+      AND maasserver_interface.id = %s;
+
+      PERFORM pg_notify('domain_update',CAST(domain.id AS text));
+      RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """)
+
+
+# Procedure that is called when a static ip address is linked or unlinked to
 # an Interface. Sends a notify message for machine_update or device_update
 # depending on if the node type is node.
 INTERFACE_IP_ADDRESS_NODE_NOTIFY = dedent("""\
@@ -708,6 +728,25 @@
     """)
 
 
+# Procedure that is called when a static ip address is linked or unlinked to
+# an Interface. Sends a notify message for domain_update
+DNSRESOURCE_IP_ADDRESS_DOMAIN_NOTIFY = dedent("""\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    DECLARE
+      domain RECORD;
+    BEGIN
+      SELECT maasserver_domain.id INTO domain
+      FROM maasserver_dnsresource, maasserver_domain
+      WHERE maasserver_domain.id = maasserver_dnsresource.domain_id
+      AND maasserver_dnsresource.id = %s;
+
+      PERFORM pg_notify('domain_update',CAST(domain.id AS text));
+      RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """)
+
+
 def render_notification_procedure(proc_name, event_name, cast):
     return dedent("""\
         CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
@@ -1114,6 +1153,20 @@
     register_trigger(
         "maasserver_domain", "domain_delete_notify", "delete")
 
+    # MAC static ip address table, update to linked domain via dnsresource
+    register_procedure(
+        DNSRESOURCE_IP_ADDRESS_DOMAIN_NOTIFY % (
+            'rrset_sipaddress_link_notify', 'NEW.dnsresource_id'))
+    register_procedure(
+        DNSRESOURCE_IP_ADDRESS_DOMAIN_NOTIFY % (
+            'rrset_sipaddress_unlink_notify', 'OLD.dnsresource_id'))
+    register_trigger(
+        "maasserver_dnsresource_ip_addresses",
+        "rrset_sipaddress_link_notify", "insert")
+    register_trigger(
+        "maasserver_dnsresource_ip_addresses",
+        "rrset_sipaddress_unlink_notify", "delete")
+
     # Zone table
     register_procedure(
         render_notification_procedure(
@@ -1247,6 +1300,20 @@
         "maasserver_interface_ip_addresses",
         "nd_sipaddress_unlink_notify", "delete")
 
+    # MAC static ip address table, update to linked domain via node.
+    register_procedure(
+        INTERFACE_IP_ADDRESS_DOMAIN_NOTIFY % (
+            'nd_sipaddress_dns_link_notify', 'NEW.interface_id'))
+    register_procedure(
+        INTERFACE_IP_ADDRESS_DOMAIN_NOTIFY % (
+            'nd_sipaddress_dns_unlink_notify', 'OLD.interface_id'))
+    register_trigger(
+        "maasserver_interface_ip_addresses",
+        "nd_sipaddress_dns_link_notify", "insert")
+    register_trigger(
+        "maasserver_interface_ip_addresses",
+        "nd_sipaddress_dns_unlink_notify", "delete")
+
     # Node result table, update to linked node.
     register_procedure(
         render_node_related_notification_procedure(