Merge ~ltrager/maas:disable_boot_architectures_postgres_triggers into maas:master

[Lee Trager]

Add disabled_boot_architectures Postgres trigger

[MAAS Lander (maas-lander)]

UNIT TESTS
-b disable_boot_architectures_postgres_triggers lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9903/console
COMMIT: c42f3b035f9b6c101dc43a6fce9494bd0b02b3b2

review: Needs Fixing

[Alberto Donato (ack)]

+1

small nit inline.

Also, could you switch to f-strings instead of %-formatting for added tests?

review: Approve

320341c... by Lee Trager on 2021-05-03

Merge branch 'master' into disable_boot_architectures_api

4c98984... by Lee Trager on 2021-05-03

Fix tests

0239dae... by Lee Trager on 2021-05-03

Fix merge mistake

f16c26b... by Lee Trager on 2021-05-03

Merge branch 'disable_boot_architectures_api' into disable_boot_architectures_postgres_triggers

1de2f6c... by Lee Trager on 2021-05-04

ack comment

2392827... by Lee Trager on 2021-05-04

Use f-strings

[MAAS Lander (maas-lander)]

UNIT TESTS
-b disable_boot_architectures_postgres_triggers lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1de2f6cd2938945e51acd3e9cf98fb3f2f6c2b1c

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b disable_boot_architectures_postgres_triggers lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9930/console
COMMIT: 2392827dbae305a3008e820837a440956510789c

review: Needs Fixing

diff --git a/src/maasserver/triggers/system.py b/src/maasserver/triggers/system.py
index ea1a074..eda198a 100644
--- a/src/maasserver/triggers/system.py
+++ b/src/maasserver/triggers/system.py
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """
@@ -456,7 +456,8 @@ DHCP_SUBNET_UPDATE = dedent(
         (OLD.gateway_ip IS NOT NULL AND NEW.gateway_ip IS NULL) OR
         host(OLD.gateway_ip) != host(NEW.gateway_ip) OR
         OLD.dns_servers != NEW.dns_servers OR
-        OLD.allow_dns != NEW.allow_dns THEN
+        OLD.allow_dns != NEW.allow_dns OR
+        OLD.disabled_boot_architectures != NEW.disabled_boot_architectures THEN
         -- Network has changed update alert DHCP if enabled.
         SELECT * INTO vlan
         FROM maasserver_vlan WHERE id = NEW.vlan_id;
diff --git a/src/maasserver/triggers/tests/test_system_listener.py b/src/maasserver/triggers/tests/test_system_listener.py
index 6189c4c..a74d339 100644
--- a/src/maasserver/triggers/tests/test_system_listener.py
+++ b/src/maasserver/triggers/tests/test_system_listener.py
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Use the `PostgresListenerService` to test all of the triggers from for
@@ -47,6 +47,7 @@ from maasserver.triggers.testing import (
 )
 from maasserver.utils.orm import transactional
 from maasserver.utils.threads import deferToDatabase
+from provisioningserver.boot import BootMethodRegistry
 from provisioningserver.utils.twisted import DeferredValue
 
 wait_for_reactor = wait_for(30)  # 30 seconds.
@@ -1852,6 +1853,151 @@ class TestDHCPSubnetListener(
 
     @wait_for_reactor
     @inlineCallbacks
+    def test_sends_message_for_vlan_when_disabled_boot_arches_changes(self):
+        yield deferToDatabase(register_system_triggers)
+        primary_rack = yield deferToDatabase(self.create_rack_controller)
+        secondary_rack = yield deferToDatabase(self.create_rack_controller)
+        vlan = yield deferToDatabase(
+            self.create_vlan,
+            {
+                "dhcp_on": True,
+                "primary_rack": primary_rack,
+                "secondary_rack": secondary_rack,
+            },
+        )
+        subnet = yield deferToDatabase(self.create_subnet, {"vlan": vlan})
+
+        primary_dv = DeferredValue()
+        secondary_dv = DeferredValue()
+        listener = self.make_listener_without_delay()
+        listener.register(
+            f"sys_dhcp_{primary_rack.id}", lambda *args: primary_dv.set(args)
+        )
+        listener.register(
+            f"sys_dhcp_{secondary_rack.id}",
+            lambda *args: secondary_dv.set(args),
+        )
+        yield listener.startService()
+        disabled_arches = random.sample(
+            [
+                boot_method.name
+                for _, boot_method in BootMethodRegistry
+                if boot_method.arch_octet or boot_method.path_prefix_http
+            ],
+            3,
+        )
+        try:
+            yield deferToDatabase(
+                self.update_subnet,
+                subnet.id,
+                {"disabled_boot_architectures": disabled_arches},
+            )
+            yield primary_dv.get(timeout=2)
+            yield secondary_dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_sends_message_for_vlan_when_disabled_boot_arches_is_set(self):
+        yield deferToDatabase(register_system_triggers)
+        primary_rack = yield deferToDatabase(self.create_rack_controller)
+        secondary_rack = yield deferToDatabase(self.create_rack_controller)
+        vlan = yield deferToDatabase(
+            self.create_vlan,
+            {
+                "dhcp_on": True,
+                "primary_rack": primary_rack,
+                "secondary_rack": secondary_rack,
+            },
+        )
+        subnet = yield deferToDatabase(self.create_subnet, {"vlan": vlan})
+        # Make sure its empty. This test that it handles being set.
+        yield deferToDatabase(
+            self.update_subnet, subnet.id, {"disabled_boot_architectures": []}
+        )
+
+        primary_dv = DeferredValue()
+        secondary_dv = DeferredValue()
+        listener = self.make_listener_without_delay()
+        listener.register(
+            f"sys_dhcp_{primary_rack.id}", lambda *args: primary_dv.set(args)
+        )
+        listener.register(
+            "sys_dhcp_%s" % secondary_rack.id,
+            lambda *args: secondary_dv.set(args),
+        )
+        yield listener.startService()
+        disabled_arches = random.sample(
+            [
+                boot_method.name
+                for _, boot_method in BootMethodRegistry
+                if boot_method.arch_octet or boot_method.path_prefix_http
+            ],
+            3,
+        )
+        try:
+            yield deferToDatabase(
+                self.update_subnet,
+                subnet.id,
+                {"disabled_boot_architectures": disabled_arches},
+            )
+            yield primary_dv.get(timeout=2)
+            yield secondary_dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_sends_message_for_vlan_when_disabled_boot_arches_is_cleared(self):
+        yield deferToDatabase(register_system_triggers)
+        primary_rack = yield deferToDatabase(self.create_rack_controller)
+        secondary_rack = yield deferToDatabase(self.create_rack_controller)
+        vlan = yield deferToDatabase(
+            self.create_vlan,
+            {
+                "dhcp_on": True,
+                "primary_rack": primary_rack,
+                "secondary_rack": secondary_rack,
+            },
+        )
+        disabled_arches = random.sample(
+            [
+                boot_method.name
+                for _, boot_method in BootMethodRegistry
+                if boot_method.arch_octet or boot_method.path_prefix_http
+            ],
+            3,
+        )
+        subnet = yield deferToDatabase(
+            self.create_subnet,
+            {"vlan": vlan, "disabled_boot_architectures": disabled_arches},
+        )
+
+        primary_dv = DeferredValue()
+        secondary_dv = DeferredValue()
+        listener = self.make_listener_without_delay()
+        listener.register(
+            f"sys_dhcp_{primary_rack.id}", lambda *args: primary_dv.set(args)
+        )
+        listener.register(
+            f"sys_dhcp_{secondary_rack.id}",
+            lambda *args: secondary_dv.set(args),
+        )
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_subnet,
+                subnet.id,
+                {"disabled_boot_architectures": []},
+            )
+            yield primary_dv.get(timeout=2)
+            yield secondary_dv.get(timeout=2)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
     def test_sends_message_for_vlan_when_subnet_deleted(self):
         yield deferToDatabase(register_system_triggers)
         primary_rack = yield deferToDatabase(self.create_rack_controller)