Merge ~cgrabowski/maas:ability_to_nest_a_dhcp_snippet_in_a_pool into maas:master

[Christian Grabowski]

add ability to create DHCP snippets within a pool.

Adds the ability to create DHCP snippets within a pool.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ability_to_nest_a_dhcp_snippet_in_a_pool lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

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

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ability_to_nest_a_dhcp_snippet_in_a_pool lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

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

review: Needs Fixing

2a9f1f9... by Christian Grabowski on 2021-05-06

use a more test-fixture-friendly dhcp snippet

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ability_to_nest_a_dhcp_snippet_in_a_pool lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9981/console
COMMIT: 2a9f1f907c4a68c6f903332994141908050fc372

review: Needs Fixing

b7a04b2... by Christian Grabowski on 2021-05-07

use double quote in interpolated string

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ability_to_nest_a_dhcp_snippet_in_a_pool lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b7a04b201119a7919c21150eddc221455f922ceb

review: Approve

[Björn Tillenius (bjornt)]

nice fix. I have a few comments/questions inline, but nothing major.

review: Needs Information

183f742... by Christian Grabowski on 2021-05-07

make pool dhcp_snippets param non-optional in making pools

cbb350e... by Christian Grabowski on 2021-05-07

filter on instance.subnet, not instance.subnet.id in form

051b4ea... by Christian Grabowski on 2021-05-07

add units asserting invalid arguments throw validation error

[MAAS Lander (maas-lander)]

UNIT TESTS
-b ability_to_nest_a_dhcp_snippet_in_a_pool lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 051b4eabe55599c62413c6b2b9f6a6c8b4d3c4e3

review: Approve

[Christian Grabowski (cgrabowski)]

Replied to a few comments, otherwise, just made the suggested changes.

[Björn Tillenius (bjornt)]

Thanks. The changes look good, but there's still an issue with the RPC protocol changes you made.

review: Needs Information

[Björn Tillenius (bjornt)]

As discussed on MM, I was confused, and the RPC changes are indeed needed.

review: Approve

diff --git a/src/maasserver/api/dhcpsnippets.py b/src/maasserver/api/dhcpsnippets.py
index 71f3494..ed4fcb9 100644
--- a/src/maasserver/api/dhcpsnippets.py
+++ b/src/maasserver/api/dhcpsnippets.py
@@ -262,6 +262,9 @@ class DHCPSnippetsHandler(OperationsHandler):
         @param (string) "subnet" [required=false] The subnet this snippet
         applies to. Cannot be used with node or global_snippet.
 
+        @param (string) "iprange" [required=false] The iprange within a subnet
+        this snippet applies to. Must also provide a subnet value.
+
         @param (boolean) "global_snippet" [required=false] Whether or not this
         snippet is to be applied globally. Cannot be used with node or subnet.
 
diff --git a/src/maasserver/dhcp.py b/src/maasserver/dhcp.py
index 2622632..2d61705 100644
--- a/src/maasserver/dhcp.py
+++ b/src/maasserver/dhcp.py
@@ -396,13 +396,14 @@ def make_hosts_for_subnets(subnets, nodes_dhcp_snippets: list = None):
     return hosts
 
 
-def make_pools_for_subnet(subnet, failover_peer=None):
+def make_pools_for_subnet(subnet, dhcp_snippets, failover_peer=None):
     """Return list of pools to create in the DHCP config for `subnet`."""
     pools = []
     for ip_range in subnet.get_dynamic_ranges().order_by("id"):
         pool = {
             "ip_range_low": ip_range.start_ip,
             "ip_range_high": ip_range.end_ip,
+            "dhcp_snippets": dhcp_snippets.get(ip_range.id, []),
         }
         if failover_peer is not None:
             pool["failover_peer"] = failover_peer
@@ -430,6 +431,7 @@ def make_subnet_config(
     """
     ip_network = subnet.get_ipnetwork()
     dns_servers = []
+    ipranges_dhcp_snippets = dict()
     if subnet.allow_dns and default_dns_servers:
         # If the MAAS DNS server is enabled make sure that is used first.
         if subnet.gateway_ip:
@@ -446,6 +448,20 @@ def make_subnet_config(
         dns_servers += [IPAddress(server) for server in subnet.dns_servers]
     if subnets_dhcp_snippets is None:
         subnets_dhcp_snippets = []
+    else:
+        subnet_only_dhcp_snippets = []
+        for snippet in subnets_dhcp_snippets:
+            if snippet.iprange is not None:
+                iprange_dhcp_snippets = ipranges_dhcp_snippets.get(
+                    snippet.iprange.id, []
+                )
+                iprange_dhcp_snippets.append(make_dhcp_snippet(snippet))
+                ipranges_dhcp_snippets[
+                    snippet.iprange.id
+                ] = iprange_dhcp_snippets
+            else:
+                subnet_only_dhcp_snippets.append(snippet)
+        subnets_dhcp_snippets = subnet_only_dhcp_snippets
 
     subnet_config = {
         "subnet": str(ip_network.network),
@@ -456,7 +472,11 @@ def make_subnet_config(
         "dns_servers": dns_servers,
         "ntp_servers": get_ntp_servers(ntp_servers, subnet, peer_rack),
         "domain_name": default_domain.name,
-        "pools": make_pools_for_subnet(subnet, failover_peer),
+        "pools": make_pools_for_subnet(
+            subnet,
+            ipranges_dhcp_snippets,
+            failover_peer,
+        ),
         "dhcp_snippets": [
             make_dhcp_snippet(dhcp_snippet)
             for dhcp_snippet in subnets_dhcp_snippets
diff --git a/src/maasserver/forms/dhcpsnippet.py b/src/maasserver/forms/dhcpsnippet.py
index fc4d74b..12f14b2 100644
--- a/src/maasserver/forms/dhcpsnippet.py
+++ b/src/maasserver/forms/dhcpsnippet.py
@@ -14,7 +14,7 @@ from maasserver.fields import (
     VersionedTextFileField,
 )
 from maasserver.forms import MAASModelForm
-from maasserver.models import DHCPSnippet, Node, Subnet
+from maasserver.models import DHCPSnippet, IPRange, Node, Subnet
 from maasserver.utils.forms import set_form_error
 from provisioningserver.events import EVENT_TYPES
 
@@ -57,6 +57,14 @@ class DHCPSnippetForm(MAASModelForm):
         help_text="The subnet which the DHCP snippet is for.",
     )
 
+    iprange = SpecifierOrModelChoiceField(
+        label="IP Range",
+        queryset=IPRange.objects.all(),
+        required=False,
+        initial=None,
+        help_text="The iprange which the DHCP snippet is for.",
+    )
+
     global_snippet = forms.BooleanField(
         label="Global DHCP Snippet",
         required=False,
@@ -75,6 +83,7 @@ class DHCPSnippetForm(MAASModelForm):
             "enabled",
             "node",
             "subnet",
+            "iprange",
             "global_snippet",
         )
 
@@ -88,6 +97,10 @@ class DHCPSnippetForm(MAASModelForm):
             self.fields["value"].initial = self.instance.value
         if instance is not None and instance.node is not None:
             self.initial["node"] = self.instance.node.system_id
+        if instance is not None and instance.subnet is not None:
+            self.fields["iprange"].queryset = IPRange.objects.filter(
+                subnet=instance.subnet
+            )
 
     def clean(self):
         cleaned_data = super().clean()
diff --git a/src/maasserver/forms/tests/test_dhcpsnippet.py b/src/maasserver/forms/tests/test_dhcpsnippet.py
index 2000f04..693e104 100644
--- a/src/maasserver/forms/tests/test_dhcpsnippet.py
+++ b/src/maasserver/forms/tests/test_dhcpsnippet.py
@@ -129,6 +129,76 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertEqual(enabled, dhcp_snippet.enabled)
         self.assertEqual(subnet, dhcp_snippet.subnet)
 
+    def test_create_dhcp_snippet_with_iprange(self):
+        subnet = factory.make_ipv4_Subnet_with_IPRanges()
+        iprange = subnet.get_dynamic_ranges().first()
+        iprange.save()
+        name = factory.make_name("name")
+        value = factory.make_string()
+        description = factory.make_string()
+        enabled = factory.pick_bool()
+        form = DHCPSnippetForm(
+            data={
+                "name": name,
+                "value": value,
+                "description": description,
+                "enabled": enabled,
+                "subnet": subnet.id,
+                "iprange": iprange.id,
+            }
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+        endpoint = factory.pick_choice(ENDPOINT_CHOICES)
+        request = HttpRequest()
+        request.user = factory.make_User()
+        dhcp_snippet = form.save(endpoint, request)
+        self.assertEqual(name, dhcp_snippet.name)
+        self.assertEqual(value, dhcp_snippet.value.data)
+        self.assertEqual(description, dhcp_snippet.description)
+        self.assertEqual(enabled, dhcp_snippet.enabled)
+        self.assertEqual(subnet, dhcp_snippet.subnet)
+        self.assertEqual(iprange, dhcp_snippet.iprange)
+
+    def test_create_dhcp_snippet_with_iprange_requires_subnet(self):
+        subnet = factory.make_ipv4_Subnet_with_IPRanges()
+        iprange = subnet.get_dynamic_ranges().first()
+        iprange.save()
+        name = factory.make_name("name")
+        value = factory.make_string()
+        description = factory.make_string()
+        enabled = factory.pick_bool()
+        form = DHCPSnippetForm(
+            data={
+                "name": name,
+                "value": value,
+                "dscription": description,
+                "enabled": enabled,
+                "iprange": iprange.id,
+            }
+        )
+        self.assertFalse(form.is_valid(), form.errors)
+
+    def test_create_dhcp_snippet_with_iprange_requires_parent_subnet(self):
+        subnet = factory.make_ipv4_Subnet_with_IPRanges()
+        subnet2 = factory.make_Subnet()
+        iprange = subnet.get_dynamic_ranges().first()
+        iprange.save()
+        name = factory.make_name("name")
+        value = factory.make_string()
+        description = factory.make_string()
+        enabled = factory.pick_bool()
+        form = DHCPSnippetForm(
+            data={
+                "name": name,
+                "value": value,
+                "dscription": description,
+                "enabled": enabled,
+                "subnet": subnet2.id,
+                "iprange": iprange.id,
+            }
+        )
+        self.assertFalse(form.is_valid(), form.errors)
+
     def test_cannt_create_dhcp_snippet_with_node_and_subnet(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
diff --git a/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py b/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py
new file mode 100644
index 0000000..f5bba86
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.12 on 2021-05-06 19:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("maasserver", "0238_disable_boot_architectures"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dhcpsnippet",
+            name="iprange",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="maasserver.IPRange",
+            ),
+        ),
+    ]
diff --git a/src/maasserver/models/dhcpsnippet.py b/src/maasserver/models/dhcpsnippet.py
index 61346d3..7a401d7 100644
--- a/src/maasserver/models/dhcpsnippet.py
+++ b/src/maasserver/models/dhcpsnippet.py
@@ -14,6 +14,7 @@ from django.db.models import (
 )
 
 from maasserver.models.cleansave import CleanSave
+from maasserver.models.iprange import IPRange
 from maasserver.models.node import Node
 from maasserver.models.subnet import Subnet
 from maasserver.models.timestampedmodel import TimestampedModel
@@ -85,6 +86,8 @@ class DHCPSnippet(CleanSave, TimestampedModel):
 
     subnet = ForeignKey(Subnet, null=True, blank=True, on_delete=CASCADE)
 
+    iprange = ForeignKey(IPRange, null=True, blank=True, on_delete=CASCADE)
+
     objects = DHCPSnippetManager()
 
     def __str__(self):
@@ -97,3 +100,15 @@ class DHCPSnippet(CleanSave, TimestampedModel):
                 "A DHCP snippet cannot be enabled on a node and subnet at the "
                 "same time."
             )
+        if self.iprange is not None and self.subnet is None:
+            raise ValidationError(
+                "A DHCP snippet cannot be enabled on an iprange without"
+                "a parent subnet"
+            )
+        elif (
+            self.iprange is not None
+            and self.iprange.subnet_id != self.subnet.id
+        ):
+            raise ValidationError(
+                "A DHCP snippet's IP Range must be within the" "parent subnet"
+            )
diff --git a/src/maasserver/models/tests/test_dhcpsnippet.py b/src/maasserver/models/tests/test_dhcpsnippet.py
index 35cbb91..acefc80 100644
--- a/src/maasserver/models/tests/test_dhcpsnippet.py
+++ b/src/maasserver/models/tests/test_dhcpsnippet.py
@@ -55,6 +55,24 @@ class TestDHCPSnippet(MAASServerTestCase):
         self.assertEqual(enabled, dhcp_snippet.enabled)
         self.assertEqual(subnet, dhcp_snippet.subnet)
 
+    def test_factory_make_DHCPSnippet_sets_iprange(self):
+        name = factory.make_name("dhcp_snippet")
+        value = VersionedTextFile.objects.create(data=factory.make_string())
+        description = factory.make_string()
+        enabled = factory.pick_bool()
+        subnet = factory.make_ipv4_Subnet_with_IPRanges()
+        iprange = subnet.get_dynamic_ranges().first()
+        iprange.save()
+        dhcp_snippet = factory.make_DHCPSnippet(
+            name, value, description, enabled, subnet=subnet, iprange=iprange
+        )
+        self.assertEqual(name, dhcp_snippet.name)
+        self.assertEqual(value.data, dhcp_snippet.value.data)
+        self.assertEqual(description, dhcp_snippet.description)
+        self.assertEqual(enabled, dhcp_snippet.enabled)
+        self.assertEqual(subnet, dhcp_snippet.subnet)
+        self.assertEqual(iprange, dhcp_snippet.iprange)
+
     def test_can_only_set_snippet_for_node_or_subnet(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
diff --git a/src/maasserver/testing/factory.py b/src/maasserver/testing/factory.py
index c463876..929c159 100644
--- a/src/maasserver/testing/factory.py
+++ b/src/maasserver/testing/factory.py
@@ -2955,6 +2955,7 @@ class Factory(maastesting.factory.Factory):
         enabled=True,
         node=None,
         subnet=None,
+        iprange=None,
     ):
         if name is None:
             name = self.make_name("dhcp_snippet")
@@ -2969,6 +2970,7 @@ class Factory(maastesting.factory.Factory):
             enabled=enabled,
             node=node,
             subnet=subnet,
+            iprange=iprange,
         )
 
     def make_default_PackageRepositories(self):
diff --git a/src/maasserver/tests/test_dhcp.py b/src/maasserver/tests/test_dhcp.py
index 6bc3db5..040bfbf 100644
--- a/src/maasserver/tests/test_dhcp.py
+++ b/src/maasserver/tests/test_dhcp.py
@@ -1582,8 +1582,16 @@ class TestMakeSubnetConfig(MAASServerTestCase):
         )
         self.assertEqual(
             [
-                {"ip_range_low": "10.9.8.11", "ip_range_high": "10.9.8.20"},
-                {"ip_range_low": "10.9.8.21", "ip_range_high": "10.9.8.30"},
+                {
+                    "ip_range_low": "10.9.8.11",
+                    "ip_range_high": "10.9.8.20",
+                    "dhcp_snippets": [],
+                },
+                {
+                    "ip_range_low": "10.9.8.21",
+                    "ip_range_high": "10.9.8.30",
+                    "dhcp_snippets": [],
+                },
             ],
             config["pools"],
         )
@@ -1615,11 +1623,13 @@ class TestMakeSubnetConfig(MAASServerTestCase):
                     "ip_range_low": "10.9.8.11",
                     "ip_range_high": "10.9.8.20",
                     "failover_peer": failover_peer,
+                    "dhcp_snippets": [],
                 },
                 {
                     "ip_range_low": "10.9.8.21",
                     "ip_range_high": "10.9.8.30",
                     "failover_peer": failover_peer,
+                    "dhcp_snippets": [],
                 },
             ],
             config["pools"],
@@ -1696,6 +1706,58 @@ class TestMakeSubnetConfig(MAASServerTestCase):
             config["disabled_boot_architectures"],
         )
 
+    def test_returns_iprange_dhcp_snippets(self):
+        rack_controller = factory.make_RackController(interface=False)
+        vlan = factory.make_VLAN()
+        subnet = factory.make_ipv4_Subnet_with_IPRanges(vlan=vlan)
+        iprange = subnet.get_dynamic_ranges().first()
+        iprange.save()
+        factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=rack_controller
+        )
+        default_domain = Domain.objects.get_default_domain()
+        subnet_snippets = [
+            factory.make_DHCPSnippet(subnet=subnet, enabled=True)
+            for _ in range(3)
+        ]
+        iprange_snippets = [
+            factory.make_DHCPSnippet(
+                subnet=subnet, iprange=iprange, enabled=True
+            )
+            for _ in range(3)
+        ]
+        dhcp_snippets = subnet_snippets + iprange_snippets
+        config = dhcp.make_subnet_config(
+            rack_controller,
+            subnet,
+            [factory.make_ipv4_address()],
+            [factory.make_name("ntp")],
+            default_domain,
+            subnets_dhcp_snippets=dhcp_snippets,
+        )
+        self.assertItemsEqual(
+            [
+                {
+                    "name": dhcp_snippet.name,
+                    "description": dhcp_snippet.description,
+                    "value": dhcp_snippet.value.data,
+                }
+                for dhcp_snippet in subnet_snippets
+            ],
+            config["dhcp_snippets"],
+        )
+        self.assertItemsEqual(
+            [
+                {
+                    "name": dhcp_snippet.name,
+                    "description": dhcp_snippet.description,
+                    "value": dhcp_snippet.value.data,
+                }
+                for dhcp_snippet in iprange_snippets
+            ],
+            config["pools"][0]["dhcp_snippets"],
+        )
+
     def test_subnet_without_gateway_restricts_nameservers(self):
         network1 = IPNetwork("10.9.8.0/24")
         network2 = IPNetwork("10.9.9.0/24")
@@ -2192,6 +2254,7 @@ class TestGetDHCPConfigureFor(MAASServerTestCase):
                                 "ip_range_high": str(ip_range.end_ip),
                                 "failover_peer": "failover-vlan-%d"
                                 % ha_vlan.id,
+                                "dhcp_snippets": [],
                             }
                             for ip_range in (
                                 ha_subnet.get_dynamic_ranges().order_by("id")
@@ -2226,6 +2289,7 @@ class TestGetDHCPConfigureFor(MAASServerTestCase):
                                 "ip_range_high": str(ip_range.end_ip),
                                 "failover_peer": "failover-vlan-%d"
                                 % ha_vlan.id,
+                                "dhcp_snippets": [],
                             }
                             for ip_range in (
                                 other_subnet.get_dynamic_ranges().order_by(
@@ -2350,6 +2414,7 @@ class TestGetDHCPConfigureFor(MAASServerTestCase):
                                 "ip_range_high": str(ip_range.end_ip),
                                 "failover_peer": "failover-vlan-%d"
                                 % ha_vlan.id,
+                                "dhcp_snippets": [],
                             }
                             for ip_range in (
                                 ha_subnet.get_dynamic_ranges().order_by("id")
@@ -2379,6 +2444,7 @@ class TestGetDHCPConfigureFor(MAASServerTestCase):
                                 "ip_range_high": str(ip_range.end_ip),
                                 "failover_peer": "failover-vlan-%d"
                                 % ha_vlan.id,
+                                "dhcp_snippets": [],
                             }
                             for ip_range in (
                                 other_subnet.get_dynamic_ranges().order_by(
@@ -2531,7 +2597,9 @@ class TestConfigureDHCP(MAASTransactionServerTestCase):
             gateway_ip="fd38:c341:27da:c831::1",
             dns_servers=[],
         )
-        factory.make_IPRange(
+        iprange_v4 = subnet_v4.get_dynamic_ranges().first()
+        iprange_v4.save()
+        iprange_v6 = factory.make_IPRange(
             subnet_v6,
             "fd38:c341:27da:c831:0:1::",
             "fd38:c341:27da:c831:0:1:ffff:0",
@@ -2561,6 +2629,12 @@ class TestConfigureDHCP(MAASTransactionServerTestCase):
             )
 
         for _ in range(3):
+            factory.make_DHCPSnippet(
+                subnet=subnet_v4, iprange=iprange_v4, enabled=True
+            )
+            factory.make_DHCPSnippet(
+                subnet=subnet_v6, iprange=iprange_v6, enabled=True
+            )
             factory.make_DHCPSnippet(subnet=subnet_v4, enabled=True)
             factory.make_DHCPSnippet(subnet=subnet_v6, enabled=True)
             factory.make_DHCPSnippet(enabled=True)
@@ -2831,7 +2905,9 @@ class TestValidateDHCPConfig(MAASTransactionServerTestCase):
         subnet_v6 = factory.make_Subnet(
             vlan=vlan, cidr="fd38:c341:27da:c831::/64"
         )
-        factory.make_IPRange(
+        iprange_v4 = subnet_v4.get_dynamic_ranges().first()
+        iprange_v4.save()
+        iprange_v6 = factory.make_IPRange(
             subnet_v6,
             "fd38:c341:27da:c831:0:1::",
             "fd38:c341:27da:c831:0:1:ffff:0",
@@ -2859,6 +2935,12 @@ class TestValidateDHCPConfig(MAASTransactionServerTestCase):
         )
 
         for _ in range(3):
+            factory.make_DHCPSnippet(
+                subnet=subnet_v4, iprange=iprange_v4, enabled=True
+            )
+            factory.make_DHCPSnippet(
+                subnet=subnet_v6, iprange=iprange_v6, enabled=True
+            )
             factory.make_DHCPSnippet(subnet=subnet_v4, enabled=True)
             factory.make_DHCPSnippet(subnet=subnet_v6, enabled=True)
             factory.make_DHCPSnippet(enabled=True)
diff --git a/src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py b/src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py
index c1f7b34..39567d5 100644
--- a/src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py
+++ b/src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py
@@ -31,8 +31,11 @@ class TestDHCPSnippetHandler(MAASServerTestCase):
     def dehydrate_dhcp_snippet(self, dhcp_snippet):
         node_system_id = None
         subnet_id = None
+        iprange_id = None
         if dhcp_snippet.subnet is not None:
             subnet_id = dhcp_snippet.subnet.id
+            if dhcp_snippet.iprange is not None:
+                iprange_id = dhcp_snippet.iprange.id
         elif dhcp_snippet.node is not None:
             node_system_id = dhcp_snippet.node.system_id
         return {
@@ -51,6 +54,7 @@ class TestDHCPSnippetHandler(MAASServerTestCase):
             "enabled": dhcp_snippet.enabled,
             "node": node_system_id,
             "subnet": subnet_id,
+            "iprange": iprange_id,
             "updated": dehydrate_datetime(dhcp_snippet.updated),
             "created": dehydrate_datetime(dhcp_snippet.created),
         }
diff --git a/src/provisioningserver/dhcp/testing/config.py b/src/provisioningserver/dhcp/testing/config.py
index 0a2b82a..f44363d 100644
--- a/src/provisioningserver/dhcp/testing/config.py
+++ b/src/provisioningserver/dhcp/testing/config.py
@@ -26,17 +26,23 @@ def fix_shared_networks_failover(shared_networks, failover_peers):
     return shared_networks
 
 
-def make_subnet_pool(network, start_ip=None, end_ip=None, failover_peer=None):
+def make_subnet_pool(
+    network, start_ip=None, end_ip=None, failover_peer=None, dhcp_snippets=None
+):
     """Return a pool entry for a subnet from network."""
     if start_ip is None and end_ip is None:
         start_ip, end_ip = factory.make_ip_range(network)
     if failover_peer is None:
         failover_peer = factory.make_name("failover")
-    return {
+    if dhcp_snippets is None:
+        dhcp_snippets = make_pool_dhcp_snippets()
+    pool = {
         "ip_range_low": str(start_ip),
         "ip_range_high": str(end_ip),
         "failover_peer": failover_peer,
+        "dhcp_snippets": dhcp_snippets,
     }
+    return pool
 
 
 def _make_snippets(count, template):
@@ -66,6 +72,11 @@ def make_host_dhcp_snippets(allow_empty=True):
     return _make_snippets(count, "option smtp-server %s;")
 
 
+def make_pool_dhcp_snippets(allow_empty=True):
+    count = random.randrange((0 if allow_empty else 1), 3)
+    return _make_snippets(count, "option nntp-server %s;")
+
+
 def make_host(
     hostname=None,
     interface_name=None,
diff --git a/src/provisioningserver/rpc/cluster.py b/src/provisioningserver/rpc/cluster.py
index a3fda58..b245c61 100644
--- a/src/provisioningserver/rpc/cluster.py
+++ b/src/provisioningserver/rpc/cluster.py
@@ -347,6 +347,28 @@ class _ConfigureDHCP(amp.Command):
                                                 b"failover_peer",
                                                 amp.Unicode(optional=True),
                                             ),
+                                            (
+                                                b"dhcp_snippets",
+                                                AmpList(
+                                                    [
+                                                        (
+                                                            b"name",
+                                                            amp.Unicode(),
+                                                        ),
+                                                        (
+                                                            b"description",
+                                                            amp.Unicode(
+                                                                optional=True
+                                                            ),
+                                                        ),
+                                                        (
+                                                            b"value",
+                                                            amp.Unicode(),
+                                                        ),
+                                                    ],
+                                                    optional=True,
+                                                ),
+                                            ),
                                         ]
                                     ),
                                 ),
diff --git a/src/provisioningserver/templates/dhcp/dhcpd.conf.template b/src/provisioningserver/templates/dhcp/dhcpd.conf.template
index 06c886d..a9d85ff 100644
--- a/src/provisioningserver/templates/dhcp/dhcpd.conf.template
+++ b/src/provisioningserver/templates/dhcp/dhcpd.conf.template
@@ -115,6 +115,19 @@ shared-network {{shared_network["name"]}} {
               {{if pool.get('failover_peer')}}
               failover peer "{{pool['failover_peer']}}";
               {{endif}}
+
+              {{if len(pool['dhcp_snippets']) == 0}}
+              # No DHCP snippets for pool
+              {{endif}}
+              {{for dhcp_snippet in pool['dhcp_snippets']}}
+              {{if dhcp_snippet['description'] != ''}}
+              # Description: {{dhcp_snippet['description'] | oneline}}
+              {{endif}}
+              {{for line in dhcp_snippet['value'].splitlines()}}
+              {{line}}
+              {{endfor}}
+              {{endfor}}
+
               range {{pool['ip_range_low']}} {{pool['ip_range_high']}};
            }
            {{endfor}}
diff --git a/src/provisioningserver/templates/dhcp/dhcpd6.conf.template b/src/provisioningserver/templates/dhcp/dhcpd6.conf.template
index 4a854d3..b33a839 100644
--- a/src/provisioningserver/templates/dhcp/dhcpd6.conf.template
+++ b/src/provisioningserver/templates/dhcp/dhcpd6.conf.template
@@ -81,6 +81,18 @@ shared-network {{shared_network["name"]}} {
 
            {{for pool in dhcp_subnet['pools']}}
            pool6 {
+              {{if len(pool['dhcp_snippets']) == 0}}
+              # No DHCP snippets for pool
+              {{endif}}
+              {{for dhcp_snippet in pool['dhcp_snippets']}}
+              {{if dhcp_snippet['description'] != ''}}
+              # Description: {{dhcp_snippet['description'] | oneline}}
+              {{endif}}
+              {{for line in dhcp_snippet['value'].splitlines()}}
+              {{line}}
+              {{endfor}}
+              {{endfor}}
+
               range6 {{pool['ip_range_low']}} {{pool['ip_range_high']}};
            }
            {{endfor}}