1
=== modified file 'src/maasserver/testing/factory.py'
2
--- src/maasserver/testing/factory.py	2016-05-12 19:07:37 +0000
3
+++ src/maasserver/testing/factory.py	2016-06-02 14:44:32 +0000
4
@@ -11,6 +11,10 @@
5
11
from datetime import timedelta
11
from datetime import timedelta
6
12
import hashlib
12
import hashlib
7
13
from io import BytesIO
13
from io import BytesIO
8
14
from itertools import (
9
15
    chain,
10
16
    repeat,
11
17
)
12
14
import logging
18
import logging
13
15
import random
19
import random
14
16
import time
20
import time
15
@@ -127,9 +131,12 @@
16
127
# src/maasserver/tests/data/test_rsa{0, 1, 2, 3, 4}.pub
131
# src/maasserver/tests/data/test_rsa{0, 1, 2, 3, 4}.pub
17
128
MAX_PUBLIC_KEYS = 5
132
MAX_PUBLIC_KEYS = 5
18
129
133
20
130
134
# Used to save a node without worrying about a valid transition.
21
131
ALL_NODE_STATES = list(map_enum(NODE_STATUS).values())
135
ALL_NODE_STATES = list(map_enum(NODE_STATUS).values())
22
132
136
23
137
# Maximum PID available on this machine.
24
138
with open("/proc/sys/kernel/pid_max") as fd:
25
139
    PID_MAX = int(fd.read())
26
133
140
27
134
# Use `undefined` instead of `None` for default factory arguments when `None`
141
# Use `undefined` instead of `None` for default factory arguments when `None`
28
135
# is a reasonable value for the argument.
142
# is a reasonable value for the argument.
29
@@ -281,17 +288,26 @@
30
281
        region.save()
288
        region.save()
31
282
        return region
289
        return region
32
283
290
33
291
    # PIDs for use with make_RegionControllerProcess. Note that the simpler
34
292
    # cycle(range(...)) is not used because it gradually consumes all memory.
35
293
    _rcp_pids = chain.from_iterable(repeat(range(PID_MAX)))
36
294
37
284
    def make_RegionControllerProcess(
295
    def make_RegionControllerProcess(
38
285
            self, region=None, pid=None, updated=None):
296
            self, region=None, pid=None, updated=None):
39
286
        if region is None:
297
        if region is None:
40
287
            region = self.make_RegionController()
298
            region = self.make_RegionController()
41
288
        if pid is None:
299
        if pid is None:
43
289
            pid = random.randint(1, 10000)
300
            pid = next(self._rcp_pids)
44
290
        process = RegionControllerProcess(
301
        process = RegionControllerProcess(
45
291
            region=region, pid=pid, updated=updated)
302
            region=region, pid=pid, updated=updated)
46
292
        process.save()
303
        process.save()
47
293
        return process
304
        return process
48
294
305
49
306
    # Ports for use with make_RegionControllerProcessEndpoint. Note that the
50
307
    # simpler cycle(range(...)) is not used because it gradually consumes all
51
308
    # memory.
52
309
    _rcpe_ports = chain.from_iterable(repeat(range(2**16)))
53
310
54
295
    def make_RegionControllerProcessEndpoint(
311
    def make_RegionControllerProcessEndpoint(
55
296
            self, process=None, address=None, port=None):
312
            self, process=None, address=None, port=None):
56
297
        if process is None:
313
        if process is None:
57
@@ -299,7 +315,7 @@
58
299
        if address is None:
315
        if address is None:
59
300
            address = self.make_ip_address()
316
            address = self.make_ip_address()
60
301
        if port is None:
317
        if port is None:
62
302
            port = random.randint(1, 10000)
318
            port = next(self._rcpe_ports)
63
303
        endpoint = RegionControllerProcessEndpoint(
319
        endpoint = RegionControllerProcessEndpoint(
64
304
            process=process, address=address, port=port)
320
            process=process, address=address, port=port)
65
305
        endpoint.save()
321
        endpoint.save()
66
306
322
67
=== modified file 'src/maasserver/websockets/handlers/device.py'
68
--- src/maasserver/websockets/handlers/device.py	2016-04-22 21:02:20 +0000
69
+++ src/maasserver/websockets/handlers/device.py	2016-06-02 14:44:32 +0000
70
@@ -29,6 +29,7 @@
71
29
    node_prefetch,
29
    node_prefetch,
72
30
    NodeHandler,
30
    NodeHandler,
73
31
)
31
)
74
32
from netaddr import EUI
75
32
from provisioningserver.logger import get_maas_logger
33
from provisioningserver.logger import get_maas_logger
76
33
34
77
34
35
78
@@ -50,11 +51,16 @@
79
50
51
80
51
52
81
52
def get_Interface_from_list(interfaces, mac):
53
def get_Interface_from_list(interfaces, mac):
87
53
    """Return the `Interface` object based on the mac value."""
54
    """Return the `Interface` object with the given MAC address."""
88
54
    for obj in interfaces:
55
    # Compare using EUI instances so that we're not concerned with a MAC's
89
55
        if obj.mac_address == mac:
56
    # canonical form, i.e. colons versus hyphens, uppercase versus lowercase.
90
56
            return obj
57
    mac = EUI(mac)
91
57
    return None
58
    for interface in interfaces:
92
59
        ifmac = interface.mac_address
93
60
        if ifmac is not None and EUI(ifmac.raw) == mac:
94
61
            return interface
95
62
    else:
96
63
        return None
97
58
64
98
59
65
99
60
class DeviceHandler(NodeHandler):
66
class DeviceHandler(NodeHandler):
100
61
67
101
=== modified file 'src/maasserver/websockets/handlers/tests/test_device.py'
102
--- src/maasserver/websockets/handlers/tests/test_device.py	2016-04-29 21:38:44 +0000
103
+++ src/maasserver/websockets/handlers/tests/test_device.py	2016-06-02 14:44:32 +0000
104
@@ -434,6 +434,34 @@
105
434
            StaticIPAddress.objects.filter(ip=external_ip_address).count(),
434
            StaticIPAddress.objects.filter(ip=external_ip_address).count(),
106
435
            Equals(1), "External StaticIPAddress was not created.")
435
            Equals(1), "External StaticIPAddress was not created.")
107
436
436
108
437
    def test_create_copes_with_mac_addresses_of_different_case(self):
109
438
        user = factory.make_User()
110
439
        handler = DeviceHandler(user, {})
111
440
        mac = factory.make_mac_address()
112
441
        created_device = handler.create({
113
442
            "hostname": factory.make_name("hostname"),
114
443
            "primary_mac": mac.lower(),  # Lowercase.
115
444
            "interfaces": [{
116
445
                "mac": mac.upper(),  # Uppercase.
117
446
                "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
118
447
            }],
119
448
        })
120
449
        self.assertThat(created_device["primary_mac"], Equals(mac))
121
450
122
451
    def test_create_copes_with_mac_addresses_of_different_forms(self):
123
452
        user = factory.make_User()
124
453
        handler = DeviceHandler(user, {})
125
454
        mac = factory.make_mac_address(delimiter=":")
126
455
        created_device = handler.create({
127
456
            "hostname": factory.make_name("hostname"),
128
457
            "primary_mac": mac,  # Colons.
129
458
            "interfaces": [{
130
459
                "mac": mac.replace(":", "-"),  # Hyphens.
131
460
                "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
132
461
            }],
133
462
        })
134
463
        self.assertThat(created_device["primary_mac"], Equals(mac))
135
464
136
437
    def test_missing_action_raises_error(self):
465
    def test_missing_action_raises_error(self):
137
438
        user = factory.make_User()
466
        user = factory.make_User()
138
439
        device = self.make_device_with_ip_address(owner=user)
467
        device = self.make_device_with_ip_address(owner=user)
Reviewer	Review Type	Date Requested	Status
Lee Trager (community)		2016-06-01	Approve on 2016-06-02
Review via email: mp+296173@code.launchpad.net
1	=== modified file 'src/maasserver/testing/factory.py'
2	--- src/maasserver/testing/factory.py 2016-05-12 19:07:37 +0000
3	+++ src/maasserver/testing/factory.py 2016-06-02 14:44:32 +0000
4	@@ -11,6 +11,10 @@
5	11	from datetime import timedelta	11	from datetime import timedelta
6	12	import hashlib	12	import hashlib
7	13	from io import BytesIO	13	from io import BytesIO
8			14	from itertools import (
9			15	chain,
10			16	repeat,
11			17	)
12	14	import logging	18	import logging
13	15	import random	19	import random
14	16	import time	20	import time
15	@@ -127,9 +131,12 @@
16	127	# src/maasserver/tests/data/test_rsa{0, 1, 2, 3, 4}.pub	131	# src/maasserver/tests/data/test_rsa{0, 1, 2, 3, 4}.pub
17	128	MAX_PUBLIC_KEYS = 5	132	MAX_PUBLIC_KEYS = 5
18	129		133
20	130		134	# Used to save a node without worrying about a valid transition.
21	131	ALL_NODE_STATES = list(map_enum(NODE_STATUS).values())	135	ALL_NODE_STATES = list(map_enum(NODE_STATUS).values())
22	132		136
23			137	# Maximum PID available on this machine.
24			138	with open("/proc/sys/kernel/pid_max") as fd:
25			139	PID_MAX = int(fd.read())
26	133		140
27	134	# Use `undefined` instead of `None` for default factory arguments when `None`	141	# Use `undefined` instead of `None` for default factory arguments when `None`
28	135	# is a reasonable value for the argument.	142	# is a reasonable value for the argument.
29	@@ -281,17 +288,26 @@
30	281	region.save()	288	region.save()
31	282	return region	289	return region
32	283		290
33			291	# PIDs for use with make_RegionControllerProcess. Note that the simpler
34			292	# cycle(range(...)) is not used because it gradually consumes all memory.
35			293	_rcp_pids = chain.from_iterable(repeat(range(PID_MAX)))
36			294
37	284	def make_RegionControllerProcess(	295	def make_RegionControllerProcess(
38	285	self, region=None, pid=None, updated=None):	296	self, region=None, pid=None, updated=None):
39	286	if region is None:	297	if region is None:
40	287	region = self.make_RegionController()	298	region = self.make_RegionController()
41	288	if pid is None:	299	if pid is None:
43	289	pid = random.randint(1, 10000)	300	pid = next(self._rcp_pids)
44	290	process = RegionControllerProcess(	301	process = RegionControllerProcess(
45	291	region=region, pid=pid, updated=updated)	302	region=region, pid=pid, updated=updated)
46	292	process.save()	303	process.save()
47	293	return process	304	return process
48	294		305
49			306	# Ports for use with make_RegionControllerProcessEndpoint. Note that the
50			307	# simpler cycle(range(...)) is not used because it gradually consumes all
51			308	# memory.
52			309	_rcpe_ports = chain.from_iterable(repeat(range(2**16)))
53			310
54	295	def make_RegionControllerProcessEndpoint(	311	def make_RegionControllerProcessEndpoint(
55	296	self, process=None, address=None, port=None):	312	self, process=None, address=None, port=None):
56	297	if process is None:	313	if process is None:
57	@@ -299,7 +315,7 @@
58	299	if address is None:	315	if address is None:
59	300	address = self.make_ip_address()	316	address = self.make_ip_address()
60	301	if port is None:	317	if port is None:
62	302	port = random.randint(1, 10000)	318	port = next(self._rcpe_ports)
63	303	endpoint = RegionControllerProcessEndpoint(	319	endpoint = RegionControllerProcessEndpoint(
64	304	process=process, address=address, port=port)	320	process=process, address=address, port=port)
65	305	endpoint.save()	321	endpoint.save()
66	306		322
67	=== modified file 'src/maasserver/websockets/handlers/device.py'
68	--- src/maasserver/websockets/handlers/device.py 2016-04-22 21:02:20 +0000
69	+++ src/maasserver/websockets/handlers/device.py 2016-06-02 14:44:32 +0000
70	@@ -29,6 +29,7 @@
71	29	node_prefetch,	29	node_prefetch,
72	30	NodeHandler,	30	NodeHandler,
73	31	)	31	)
74			32	from netaddr import EUI
75	32	from provisioningserver.logger import get_maas_logger	33	from provisioningserver.logger import get_maas_logger
76	33		34
77	34		35
78	@@ -50,11 +51,16 @@
79	50		51
80	51		52
81	52	def get_Interface_from_list(interfaces, mac):	53	def get_Interface_from_list(interfaces, mac):
87	53	"""Return the `Interface` object based on the mac value."""	54	"""Return the `Interface` object with the given MAC address."""
88	54	for obj in interfaces:	55	# Compare using EUI instances so that we're not concerned with a MAC's
89	55	if obj.mac_address == mac:	56	# canonical form, i.e. colons versus hyphens, uppercase versus lowercase.
90	56	return obj	57	mac = EUI(mac)
91	57	return None	58	for interface in interfaces:
92			59	ifmac = interface.mac_address
93			60	if ifmac is not None and EUI(ifmac.raw) == mac:
94			61	return interface
95			62	else:
96			63	return None
97	58		64
98	59		65
99	60	class DeviceHandler(NodeHandler):	66	class DeviceHandler(NodeHandler):
100	61		67
101	=== modified file 'src/maasserver/websockets/handlers/tests/test_device.py'
102	--- src/maasserver/websockets/handlers/tests/test_device.py 2016-04-29 21:38:44 +0000
103	+++ src/maasserver/websockets/handlers/tests/test_device.py 2016-06-02 14:44:32 +0000
104	@@ -434,6 +434,34 @@
105	434	StaticIPAddress.objects.filter(ip=external_ip_address).count(),	434	StaticIPAddress.objects.filter(ip=external_ip_address).count(),
106	435	Equals(1), "External StaticIPAddress was not created.")	435	Equals(1), "External StaticIPAddress was not created.")
107	436		436
108			437	def test_create_copes_with_mac_addresses_of_different_case(self):
109			438	user = factory.make_User()
110			439	handler = DeviceHandler(user, {})
111			440	mac = factory.make_mac_address()
112			441	created_device = handler.create({
113			442	"hostname": factory.make_name("hostname"),
114			443	"primary_mac": mac.lower(), # Lowercase.
115			444	"interfaces": [{
116			445	"mac": mac.upper(), # Uppercase.
117			446	"ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
118			447	}],
119			448	})
120			449	self.assertThat(created_device["primary_mac"], Equals(mac))
121			450
122			451	def test_create_copes_with_mac_addresses_of_different_forms(self):
123			452	user = factory.make_User()
124			453	handler = DeviceHandler(user, {})
125			454	mac = factory.make_mac_address(delimiter=":")
126			455	created_device = handler.create({
127			456	"hostname": factory.make_name("hostname"),
128			457	"primary_mac": mac, # Colons.
129			458	"interfaces": [{
130			459	"mac": mac.replace(":", "-"), # Hyphens.
131			460	"ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
132			461	}],
133			462	})
134			463	self.assertThat(created_device["primary_mac"], Equals(mac))
135			464
136	437	def test_missing_action_raises_error(self):	465	def test_missing_action_raises_error(self):
137	438	user = factory.make_User()	466	user = factory.make_User()
138	439	device = self.make_device_with_ip_address(owner=user)	467	device = self.make_device_with_ip_address(owner=user)