1
diff --git a/src/maasserver/dhcp.py b/src/maasserver/dhcp.py
2
index d903aab..33b89e5 100644
3
--- a/src/maasserver/dhcp.py
4
+++ b/src/maasserver/dhcp.py
5
@@ -36,6 +36,7 @@ from maasserver.models import (
6
36
    Service,
36
    Service,
7
37
    StaticIPAddress,
37
    StaticIPAddress,
8
38
    Subnet,
38
    Subnet,
9
39
    VLAN,
10
39
)
40
)
11
40
from maasserver.rpc import getAllClients, getClientFor, getRandomClient
41
from maasserver.rpc import getAllClients, getClientFor, getRandomClient
12
41
from maasserver.utils.orm import transactional
42
from maasserver.utils.orm import transactional
13
@@ -961,6 +962,27 @@ def configure_dhcp(rack_controller):
14
961
        raise ipv6_exc
962
        raise ipv6_exc
15
962
963
16
963
964
17
965
def get_racks_by_subnet(subnet):
18
966
    """Return the set of racks with at least one interface configured on the
19
967
    specified subnet.
20
968
    """
21
969
    racks = RackController.objects.filter(
22
970
        interface__ip_addresses__subnet__in=[subnet]
23
971
    )
24
972
25
973
    if subnet.vlan.relay_vlan_id:
26
974
        relay_vlan = VLAN.objects.get(id=subnet.vlan.relay_vlan_id)
27
975
        racks = racks.union(
28
976
            RackController.objects.filter(
29
977
                id__in=[
30
978
                    relay_vlan.primary_rack_id,
31
979
                    relay_vlan.secondary_rack_id,
32
980
                ]
33
981
            )
34
982
        )
35
983
    return racks
36
984
37
985
38
964
def validate_dhcp_config(test_dhcp_snippet=None):
986
def validate_dhcp_config(test_dhcp_snippet=None):
39
965
    """Validate a DHCPD config with uncommitted values.
987
    """Validate a DHCPD config with uncommitted values.
40
966
988
41
@@ -995,9 +1017,7 @@ def validate_dhcp_config(test_dhcp_snippet=None):
42
995
    if test_dhcp_snippet is not None:
1017
    if test_dhcp_snippet is not None:
43
996
        if test_dhcp_snippet.subnet is not None:
1018
        if test_dhcp_snippet.subnet is not None:
44
997
            rack_controller = find_connected_rack(
1019
            rack_controller = find_connected_rack(
48
998
                RackController.objects.filter_by_subnets(
1020
                get_racks_by_subnet(test_dhcp_snippet.subnet)
46
999
                    [test_dhcp_snippet.subnet]
47
1000
                )
49
1001
            )
1021
            )
50
1002
        elif test_dhcp_snippet.node is not None:
1022
        elif test_dhcp_snippet.node is not None:
51
1003
            rack_controller = find_connected_rack(
1023
            rack_controller = find_connected_rack(
52
@@ -1006,6 +1026,10 @@ def validate_dhcp_config(test_dhcp_snippet=None):
53
1006
    # If no rack controller is linked to the DHCPSnippet its a global DHCP
1026
    # If no rack controller is linked to the DHCPSnippet its a global DHCP
54
1007
    # snippet which we can test anywhere.
1027
    # snippet which we can test anywhere.
55
1008
    if rack_controller is None:
1028
    if rack_controller is None:
56
1029
        log.msg(
57
1030
            "Could not find a rack controller for the snippet. Trying "
58
1031
            "random client"
59
1032
        )
60
1009
        try:
1033
        try:
61
1010
            client = getRandomClient()
1034
            client = getRandomClient()
62
1011
        except NoConnectionsAvailable:
1035
        except NoConnectionsAvailable:
63
diff --git a/src/maasserver/tests/test_dhcp.py b/src/maasserver/tests/test_dhcp.py
64
index ee0aba5..3e898da 100644
65
--- a/src/maasserver/tests/test_dhcp.py
66
+++ b/src/maasserver/tests/test_dhcp.py
67
@@ -3191,6 +3191,38 @@ class TestValidateDHCPConfig(MAASTransactionServerTestCase):
68
3191
            ),
3191
            ),
69
3192
        )
3192
        )
70
3193
3193
71
3194
    def test_get_racks_by_subnet_relayed(self):
72
3195
        rack1 = factory.make_RackController()
73
3196
        factory.make_RackController()
74
3197
        vlan1_primary = factory.make_VLAN(dhcp_on=True, primary_rack=rack1)
75
3198
        vlan2_secondary = factory.make_VLAN(
76
3199
            dhcp_on=False, primary_rack=rack1, relay_vlan=vlan1_primary
77
3200
        )
78
3201
79
3202
        factory.make_Subnet(vlan=vlan1_primary, cidr="10.20.30.0/24")
80
3203
        subnet2 = factory.make_Subnet(
81
3204
            vlan=vlan2_secondary, cidr="10.20.31.0/24"
82
3205
        )
83
3206
        self.assertItemsEqual([rack1], dhcp.get_racks_by_subnet(subnet2))
84
3207
85
3208
    def test_get_racks_by_subnet_rack_primary(self):
86
3209
        rack1 = factory.make_RackController()
87
3210
        factory.make_RackController()
88
3211
        vlan1_primary = factory.make_VLAN(dhcp_on=True, primary_rack=rack1)
89
3212
        subnet1 = factory.make_Subnet(vlan=vlan1_primary, cidr="10.20.30.0/24")
90
3213
91
3214
        interface = factory.make_Interface(
92
3215
            INTERFACE_TYPE.PHYSICAL, node=rack1, vlan=vlan1_primary
93
3216
        )
94
3217
95
3218
        factory.make_StaticIPAddress(
96
3219
            alloc_type=IPADDRESS_TYPE.AUTO,
97
3220
            subnet=subnet1,
98
3221
            interface=interface,
99
3222
        )
100
3223
101
3224
        self.assertItemsEqual([rack1], dhcp.get_racks_by_subnet(subnet1))
102
3225
103
3194
    def test_returns_no_errors_when_valid(self):
3226
    def test_returns_no_errors_when_valid(self):
104
3195
        rack_controller, config = self.create_rack_controller()
3227
        rack_controller, config = self.create_rack_controller()
105
3196
        self.prepare_rpc(rack_controller)
3228
        self.prepare_rpc(rack_controller)
Reviewer	Date Requested	Status
Björn Tillenius		Approve on 2021-04-12
MAAS Lander		Needs Fixing on 2021-04-08
Alberto Donato (community)	2020-10-02	Approve on 2020-11-25
Review via email: mp+391758@code.launchpad.net