1
=== modified file 'src/maasserver/models/node.py'
2
--- src/maasserver/models/node.py	2016-07-06 17:22:11 +0000
3
+++ src/maasserver/models/node.py	2016-07-15 00:08:33 +0000
4
@@ -215,8 +215,23 @@
5
215
215
6
216
# Return type from `get_effective_power_info`.
216
# Return type from `get_effective_power_info`.
7
217
PowerInfo = namedtuple("PowerInfo", (
217
PowerInfo = namedtuple("PowerInfo", (
10
218
    "can_be_started", "can_be_stopped", "can_be_queried", "power_type",
218
    "can_be_started",
11
219
    "power_parameters"))
219
    "can_be_stopped",
12
220
    "can_be_queried",
13
221
    "power_type",
14
222
    "power_parameters",
15
223
))
16
224
17
225
DefaultGateways = namedtuple("DefaultGateways", (
18
226
    "ipv4",
19
227
    "ipv6",
20
228
))
21
229
22
230
GatewayDefinition = namedtuple("GatewayDefinition", (
23
231
    "interface_id",
24
232
    "subnet_id",
25
233
    "gateway_ip",
26
234
))
27
220
235
28
221
236
29
222
def generate_node_system_id():
237
def generate_node_system_id():
30
@@ -2691,7 +2706,7 @@
31
2691
                interface.id
2706
                interface.id
32
2692
            """, (self.id,))
2707
            """, (self.id,))
33
2693
        return [
2708
        return [
35
2694
            (found[0], found[1], found[2])
2709
            GatewayDefinition._make((found[0], found[1], found[2]))
36
2695
            for found in cursor.fetchall()
2710
            for found in cursor.fetchall()
37
2696
        ]
2711
        ]
38
2697
2712
39
@@ -2743,7 +2758,7 @@
40
2743
2758
41
2744
        # Early out if we already have both gateways.
2759
        # Early out if we already have both gateways.
42
2745
        if gateway_ipv4 and gateway_ipv6:
2760
        if gateway_ipv4 and gateway_ipv6:
44
2746
            return (gateway_ipv4, gateway_ipv6)
2761
            return DefaultGateways._make((gateway_ipv4, gateway_ipv6))
45
2747
2762
46
2748
        # Get the best guesses for the missing IP families.
2763
        # Get the best guesses for the missing IP families.
47
2749
        found_gateways = self.get_best_guess_for_default_gateways()
2764
        found_gateways = self.get_best_guess_for_default_gateways()
48
@@ -2753,7 +2768,47 @@
49
2753
        if not gateway_ipv6:
2768
        if not gateway_ipv6:
50
2754
            gateway_ipv6 = self._get_gateway_tuple_by_family(
2769
            gateway_ipv6 = self._get_gateway_tuple_by_family(
51
2755
                found_gateways, IPADDRESS_FAMILY.IPv6)
2770
                found_gateways, IPADDRESS_FAMILY.IPv6)
53
2756
        return (gateway_ipv4, gateway_ipv6)
2771
        return DefaultGateways._make((gateway_ipv4, gateway_ipv6))
54
2772
55
2773
    def get_default_dns_servers(self):
56
2774
        """Return the default DNS servers for this node."""
57
2775
        # Circular imports.
58
2776
        from maasserver.dns.zonegenerator import get_dns_server_address
59
2777
60
2778
        gateways = self.get_default_gateways()
61
2779
62
2780
        # Try first to use DNS servers from default gateway subnets.
63
2781
        if gateways.ipv4 is not None:
64
2782
            subnet = Subnet.objects.get(id=gateways.ipv4.subnet_id)
65
2783
            if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
66
2784
                # An IPv4 subnet is hosting the default gateway and has DNS
67
2785
                # servers defined. IPv4 DNS servers take first-priority.
68
2786
                return subnet.dns_servers
69
2787
        if gateways.ipv6 is not None:
70
2788
            subnet = Subnet.objects.get(id=gateways.ipv6.subnet_id)
71
2789
            if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
72
2790
                # An IPv6 subnet is hosting the default gateway and has DNS
73
2791
                # servers defined. IPv6 DNS servers take second-priority.
74
2792
                return subnet.dns_servers
75
2793
76
2794
        # No default gateway subnet has specific DNS servers defined, so
77
2795
        # use MAAS for the default DNS server.
78
2796
        if gateways.ipv4 is None and gateways.ipv6 is None:
79
2797
            # If there are no default gateways, the default is the MAAS
80
2798
            # region IP address.
81
2799
            maas_dns_server = get_dns_server_address(
82
2800
                rack_controller=self.get_boot_rack_controller())
83
2801
        else:
84
2802
            # Choose an address consistent with the primary address-family
85
2803
            # in use, as indicated by the presence (or not) of a gateway.
86
2804
            # Note that this path is only taken if the MAAS URL is set to
87
2805
            # a hostname, and the hostname resolves to both an IPv4 and an
88
2806
            # IPv6 address.
89
2807
            maas_dns_server = get_dns_server_address(
90
2808
                rack_controller=self.get_boot_rack_controller(),
91
2809
                ipv4=(gateways.ipv4 is not None),
92
2810
                ipv6=(gateways.ipv6 is not None))
93
2811
        return [maas_dns_server]
94
2757
2812
95
2758
    def get_boot_purpose(self):
2813
    def get_boot_purpose(self):
96
2759
        """
2814
        """
97
2760
2815
98
=== modified file 'src/maasserver/models/tests/test_node.py'
99
--- src/maasserver/models/tests/test_node.py	2016-06-30 17:03:46 +0000
100
+++ src/maasserver/models/tests/test_node.py	2016-07-15 00:08:33 +0000
101
@@ -36,6 +36,7 @@
102
36
from maasserver.enum import (
36
from maasserver.enum import (
103
37
    FILESYSTEM_GROUP_TYPE,
37
    FILESYSTEM_GROUP_TYPE,
104
38
    FILESYSTEM_TYPE,
38
    FILESYSTEM_TYPE,
105
39
    INTERFACE_LINK_TYPE,
106
39
    INTERFACE_TYPE,
40
    INTERFACE_TYPE,
107
40
    IPADDRESS_TYPE,
41
    IPADDRESS_TYPE,
108
41
    NODE_PERMISSION,
42
    NODE_PERMISSION,
109
@@ -93,6 +94,7 @@
110
93
    NODE_TRANSITIONS,
94
    NODE_TRANSITIONS,
111
94
)
95
)
112
95
from maasserver.rpc.testing.fixtures import MockLiveRegionToClusterRPCFixture
96
from maasserver.rpc.testing.fixtures import MockLiveRegionToClusterRPCFixture
113
97
import maasserver.server_address as server_address_module
114
96
from maasserver.storage_layouts import (
98
from maasserver.storage_layouts import (
115
97
    StorageLayoutError,
99
    StorageLayoutError,
116
98
    StorageLayoutMissingBootDiskError,
100
    StorageLayoutMissingBootDiskError,
117
@@ -136,6 +138,7 @@
118
136
    commissioning,
138
    commissioning,
119
137
    disk_erasing,
139
    disk_erasing,
120
138
)
140
)
121
141
from netaddr import IPAddress
122
139
from provisioningserver.events import (
142
from provisioningserver.events import (
123
140
    EVENT_DETAILS,
143
    EVENT_DETAILS,
124
141
    EVENT_TYPES,
144
    EVENT_TYPES,
125
@@ -4303,6 +4306,158 @@
126
4303
            ), node.get_default_gateways())
4306
            ), node.get_default_gateways())
127
4304
4307
128
4305
4308
129
4309
class TestGetDefaultDNSServers(MAASServerTestCase):
130
4310
    """Tests for `Node.get_default_dns_servers`."""
131
4311
132
4312
    def make_Node_with_RackController(
133
4313
            self, ipv4=True, ipv6=True, ipv4_gateway=True, ipv6_gateway=True,
134
4314
            ipv4_subnet_dns=None, ipv6_subnet_dns=None):
135
4315
        ipv4_subnet_dns = [] if ipv4_subnet_dns is None else ipv4_subnet_dns
136
4316
        ipv6_subnet_dns = [] if ipv6_subnet_dns is None else ipv6_subnet_dns
137
4317
        rack_v4 = None
138
4318
        rack_v6 = None
139
4319
        fabric = factory.make_Fabric()
140
4320
        vlan = fabric.get_default_vlan()
141
4321
        if ipv4:
142
4322
            gateway_ip = None if ipv4_gateway else ""
143
4323
            v4_subnet = factory.make_Subnet(
144
4324
                version=4, vlan=vlan, dns_servers=ipv4_subnet_dns,
145
4325
                gateway_ip=gateway_ip)
146
4326
        if ipv6:
147
4327
            gateway_ip = None if ipv6_gateway else ""
148
4328
            v6_subnet = factory.make_Subnet(
149
4329
                version=6, vlan=vlan, dns_servers=ipv6_subnet_dns,
150
4330
                gateway_ip=gateway_ip)
151
4331
        rack = factory.make_RegionRackController()
152
4332
        vlan.primary_rack = rack
153
4333
        vlan.dhcp_on = True
154
4334
        vlan.save()
155
4335
        # In order to determine the correct IP address per-address-family,
156
4336
        # a name lookup is performed on the hostname part of the URL.
157
4337
        # We need to mock that so we can return whatever IP addresses it
158
4338
        # resolves to.
159
4339
        rack.url = "http://region:5240/MAAS/"
160
4340
        if ipv4:
161
4341
            rack_v4 = factory.pick_ip_in_Subnet(v4_subnet)
162
4342
        if ipv6:
163
4343
            rack_v6 = factory.pick_ip_in_Subnet(v6_subnet)
164
4344
165
4345
        def get_address(hostname, ip_version=4):
166
4346
            """Mock function to return the IP address of the rack based on the
167
4347
            given address family.
168
4348
            """
169
4349
            if ip_version == 4:
170
4350
                return {IPAddress(rack_v4)} if rack_v4 else set()
171
4351
            elif ip_version == 6:
172
4352
                return {IPAddress(rack_v6)} if rack_v6 else set()
173
4353
174
4354
        resolve_hostname = self.patch(
175
4355
            server_address_module, 'resolve_hostname')
176
4356
        resolve_hostname.side_effect = get_address
177
4357
        rack.interface_set.all().delete()
178
4358
        rackif = factory.make_Interface(vlan=vlan, node=rack)
179
4359
        if ipv4:
180
4360
            rackif.link_subnet(INTERFACE_LINK_TYPE.STATIC, v4_subnet, rack_v4)
181
4361
        if ipv6:
182
4362
            rackif.link_subnet(INTERFACE_LINK_TYPE.STATIC, v6_subnet, rack_v6)
183
4363
        rack.boot_interface = rackif
184
4364
        rack.save()
185
4365
        node = factory.make_Node(status=NODE_STATUS.READY, disable_ipv4=False)
186
4366
        nodeif = factory.make_Interface(vlan=vlan, node=node)
187
4367
        if ipv4:
188
4368
            nodeif.link_subnet(INTERFACE_LINK_TYPE.AUTO, v4_subnet)
189
4369
        if ipv6:
190
4370
            nodeif.link_subnet(INTERFACE_LINK_TYPE.AUTO, v6_subnet)
191
4371
        node.boot_interface = nodeif
192
4372
        node.save()
193
4373
        return rack_v4, rack_v6, node
194
4374
195
4375
    def test__uses_rack_ipv4_if_ipv4_only_with_no_gateway(self):
196
4376
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
197
4377
            ipv4=True, ipv4_gateway=False, ipv6=False, ipv6_gateway=False)
198
4378
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
199
4379
200
4380
    def test__uses_rack_ipv4_if_ipv4_only_with_no_gateway_v4_dns(self):
201
4381
        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
202
4382
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
203
4383
            ipv4=True, ipv4_gateway=False, ipv6=False, ipv6_gateway=False,
204
4384
            ipv4_subnet_dns=[ipv4_subnet_dns])
205
4385
        self.assertThat(
206
4386
            node.get_default_dns_servers(), Equals([rack_v4]))
207
4387
208
4388
    def test__uses_rack_ipv6_if_ipv6_only_with_no_gateway_v6_dns(self):
209
4389
        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
210
4390
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
211
4391
            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=False,
212
4392
            ipv6_subnet_dns=[ipv6_subnet_dns])
213
4393
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
214
4394
215
4395
    def test__uses_rack_ipv4_if_dual_stack_with_no_gateway(self):
216
4396
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
217
4397
            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=False)
218
4398
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
219
4399
220
4400
    def test__uses_rack_ipv4_if_dual_stack_with_ipv4_gateway(self):
221
4401
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
222
4402
            ipv4=True, ipv4_gateway=True, ipv6=True, ipv6_gateway=False)
223
4403
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
224
4404
225
4405
    def test__uses_subnet_ipv4_if_dual_stack_with_ipv4_gateway_with_dns(self):
226
4406
        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
227
4407
        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
228
4408
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
229
4409
            ipv4=True, ipv4_gateway=True, ipv6=True, ipv6_gateway=False,
230
4410
            ipv4_subnet_dns=[ipv4_subnet_dns],
231
4411
            ipv6_subnet_dns=[ipv6_subnet_dns])
232
4412
        self.assertThat(
233
4413
            node.get_default_dns_servers(), Equals([ipv4_subnet_dns]))
234
4414
235
4415
    def test__uses_rack_ipv6_if_dual_stack_with_ipv6_gateway(self):
236
4416
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
237
4417
            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=True)
238
4418
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
239
4419
240
4420
    def test__uses_subnet_ipv6_if_dual_stack_with_ipv6_gateway(self):
241
4421
        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
242
4422
        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
243
4423
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
244
4424
            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=True,
245
4425
            ipv4_subnet_dns=[ipv4_subnet_dns],
246
4426
            ipv6_subnet_dns=[ipv6_subnet_dns])
247
4427
        self.assertThat(
248
4428
            node.get_default_dns_servers(), Equals([ipv6_subnet_dns]))
249
4429
250
4430
    def test__uses_rack_ipv4_if_ipv4_with_ipv4_gateway(self):
251
4431
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
252
4432
            ipv4=True, ipv4_gateway=True, ipv6=False, ipv6_gateway=False)
253
4433
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
254
4434
255
4435
    def test__uses_subnet_ipv4_if_ipv4_stack_with_ipv4_gateway_and_dns(self):
256
4436
        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
257
4437
        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
258
4438
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
259
4439
            ipv4=True, ipv4_gateway=True, ipv6=False, ipv6_gateway=False,
260
4440
            ipv4_subnet_dns=[ipv4_subnet_dns],
261
4441
            ipv6_subnet_dns=[ipv6_subnet_dns])
262
4442
        self.assertThat(
263
4443
            node.get_default_dns_servers(), Equals([ipv4_subnet_dns]))
264
4444
265
4445
    def test__uses_rack_ipv6_if_ipv6_with_ipv6_gateway(self):
266
4446
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
267
4447
            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=True)
268
4448
        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
269
4449
270
4450
    def test__uses_subnet_ipv6_if_ipv6_with_ipv6_gateway_and_dns(self):
271
4451
        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
272
4452
        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
273
4453
        rack_v4, rack_v6, node = self.make_Node_with_RackController(
274
4454
            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=True,
275
4455
            ipv4_subnet_dns=[ipv4_subnet_dns],
276
4456
            ipv6_subnet_dns=[ipv6_subnet_dns])
277
4457
        self.assertThat(
278
4458
            node.get_default_dns_servers(), Equals([ipv6_subnet_dns]))
279
4459
280
4460
281
4306
class TestNode_Start(MAASServerTestCase):
4461
class TestNode_Start(MAASServerTestCase):
282
4307
    """Tests for Node.start()."""
4462
    """Tests for Node.start()."""
283
4308
4463
284
4309
4464
285
=== modified file 'src/maasserver/preseed_network.py'
286
--- src/maasserver/preseed_network.py	2016-03-28 13:54:47 +0000
287
+++ src/maasserver/preseed_network.py	2016-07-15 00:08:33 +0000
288
@@ -6,10 +6,7 @@
289
6
__all__ = [
6
__all__ = [
290
7
    ]
7
    ]
291
8
8
296
9
from maasserver.dns.zonegenerator import (
9
from maasserver.dns.zonegenerator import get_dns_search_paths
293
10
    get_dns_search_paths,
294
11
    get_dns_server_address,
295
12
)
297
13
from maasserver.enum import (
10
from maasserver.enum import (
298
14
    INTERFACE_TYPE,
11
    INTERFACE_TYPE,
299
15
    IPADDRESS_FAMILY,
12
    IPADDRESS_FAMILY,
300
@@ -24,6 +21,7 @@
301
24
    def __init__(self, node):
21
    def __init__(self, node):
302
25
        self.node = node
22
        self.node = node
303
26
        self.gateways = node.get_default_gateways()
23
        self.gateways = node.get_default_gateways()
304
24
        self.dns_servers = node.get_default_dns_servers()
305
27
        self.gateway_ipv4_set = False
25
        self.gateway_ipv4_set = False
306
28
        self.gateway_ipv6_set = False
26
        self.gateway_ipv6_set = False
307
29
        self.operations = {
27
        self.operations = {
308
@@ -51,8 +49,7 @@
309
51
49
310
52
        self.network_config.append({
50
        self.network_config.append({
311
53
            "type": "nameserver",
51
            "type": "nameserver",
314
54
            "address": get_dns_server_address(
52
            "address": self.dns_servers,
313
55
                rack_controller=self.node.get_boot_rack_controller()),
315
56
            "search": sorted(get_dns_search_paths()),
53
            "search": sorted(get_dns_search_paths()),
316
57
        })
54
        })
317
58
55
318
59
56
319
=== modified file 'src/maasserver/tests/test_preseed_network.py'
320
--- src/maasserver/tests/test_preseed_network.py	2016-04-15 23:38:27 +0000
321
+++ src/maasserver/tests/test_preseed_network.py	2016-07-15 00:08:33 +0000
322
@@ -8,10 +8,7 @@
323
8
import random
8
import random
324
9
from textwrap import dedent
9
from textwrap import dedent
325
10
10
330
11
from maasserver.dns.zonegenerator import (
11
from maasserver.dns.zonegenerator import get_dns_search_paths
327
12
    get_dns_search_paths,
328
13
    get_dns_server_address,
329
14
)
331
15
from maasserver.enum import (
12
from maasserver.enum import (
332
16
    INTERFACE_TYPE,
13
    INTERFACE_TYPE,
333
17
    IPADDRESS_FAMILY,
14
    IPADDRESS_FAMILY,
334
@@ -203,8 +200,7 @@
335
203
200
336
204
    def collectDNSConfig(self, node):
201
    def collectDNSConfig(self, node):
337
205
        config = "- type: nameserver\n  address: %s\n  search:\n" % (
202
        config = "- type: nameserver\n  address: %s\n  search:\n" % (
340
206
            get_dns_server_address(
203
            repr(node.get_default_dns_servers()))
339
207
                rack_controller=node.get_boot_primary_rack_controller()))
341
208
        dns_searches = sorted(get_dns_search_paths())
204
        dns_searches = sorted(get_dns_search_paths())
342
209
        for dns_name in dns_searches:
205
        for dns_name in dns_searches:
343
210
            config += "   - %s\n" % dns_name
206
            config += "   - %s\n" % dns_name
Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)		2016-07-13	Approve on 2016-07-14
Review via email: mp+299896@code.launchpad.net