MAAS

Merge lp:~jtv/maas/rename-getRandomMACAddress-uses into lp:~maas-committers/maas/trunk

  1. rename-getRandomMACAddress-uses
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 3025
Proposed branch: lp:~jtv/maas/rename-getRandomMACAddress-uses
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 1718 lines (+188/-188)
38 files modified
src/maasserver/api/tests/test_enlistment.py (+11/-11)
src/maasserver/api/tests/test_node.py (+2/-2)
src/maasserver/api/tests/test_nodes.py (+3/-3)
src/maasserver/api/tests/test_pxeconfig.py (+3/-3)
src/maasserver/clusterrpc/tests/test_dhcp.py (+4/-4)
src/maasserver/models/tests/test_dhcplease.py (+6/-6)
src/maasserver/models/tests/test_macaddress.py (+2/-2)
src/maasserver/models/tests/test_node.py (+7/-7)
src/maasserver/models/tests/test_nodegroup.py (+3/-3)
src/maasserver/rpc/tests/test_nodes.py (+3/-3)
src/maasserver/rpc/tests/test_regionservice.py (+2/-2)
src/maasserver/testing/factory.py (+3/-3)
src/maasserver/tests/test_fields.py (+6/-6)
src/maasserver/tests/test_forms_macaddress.py (+4/-4)
src/maasserver/tests/test_forms_nodewithmacaddresses.py (+2/-2)
src/maasserver/tests/test_node_constraint_filter_forms.py (+2/-2)
src/maasserver/views/tests/test_nodes.py (+4/-4)
src/maastesting/factory.py (+1/-1)
src/metadataserver/deployment/tests/test_maas_configure_interfaces.py (+22/-22)
src/metadataserver/tests/test_api.py (+2/-2)
src/provisioningserver/boot/tests/test_powernv.py (+6/-6)
src/provisioningserver/boot/tests/test_pxe.py (+1/-1)
src/provisioningserver/boot/tests/test_uefi.py (+1/-1)
src/provisioningserver/boot/tests/test_windows.py (+7/-7)
src/provisioningserver/dhcp/tests/test_detect.py (+5/-5)
src/provisioningserver/dhcp/tests/test_leases.py (+4/-4)
src/provisioningserver/dhcp/tests/test_leases_parser.py (+39/-39)
src/provisioningserver/dhcp/tests/test_omshell.py (+3/-3)
src/provisioningserver/drivers/hardware/tests/test_mscm.py (+1/-1)
src/provisioningserver/drivers/hardware/tests/test_seamicro.py (+5/-5)
src/provisioningserver/drivers/hardware/tests/test_virsh.py (+2/-2)
src/provisioningserver/power/tests/test_poweraction.py (+2/-2)
src/provisioningserver/pserv_services/tests/test_lease_upload_service.py (+2/-2)
src/provisioningserver/pserv_services/tests/test_tftp.py (+3/-3)
src/provisioningserver/rpc/tests/test_clusterservice.py (+4/-4)
src/provisioningserver/rpc/tests/test_dhcp.py (+2/-2)
src/provisioningserver/utils/tests/test_network.py (+5/-5)
src/provisioningserver/utils/tests/test_utils.py (+4/-4)
To merge this branch: bzr merge lp:~jtv/maas/rename-getRandomMACAddress-uses
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+235113@code.launchpad.net

Commit message

Change existing uses of the old factory.getRandomMACAddress to use the new factory.make_mac_address.

Description of the change

There is still a compatibility stub, so while this may well cause merge conflicts, it won't break actual code.

Jeroen

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api/tests/test_enlistment.py'
2--- src/maasserver/api/tests/test_enlistment.py 2014-09-10 16:20:31 +0000
3+++ src/maasserver/api/tests/test_enlistment.py 2014-09-18 12:49:34 +0000
4@@ -80,7 +80,7 @@
5 'hostname': hostname,
6 'architecture': make_usable_architecture(self),
7 'power_type': 'ether_wake',
8- 'mac_addresses': [factory.getRandomMACAddress()],
9+ 'mac_addresses': [factory.make_mac_address()],
10 })
11 parsed_result = json.loads(response.content)
12
13@@ -108,7 +108,7 @@
14 'hostname': hostname,
15 'architecture': architecture,
16 'power_type': 'ether_wake',
17- 'mac_addresses': factory.getRandomMACAddress(),
18+ 'mac_addresses': factory.make_mac_address(),
19 'power_parameters': json.dumps(power_parameters),
20 'power_type': power_type,
21 })
22@@ -206,7 +206,7 @@
23 'autodetect_nodegroup': '1',
24 'hostname': hostname,
25 'architecture': make_usable_architecture(self),
26- 'mac_addresses': [factory.getRandomMACAddress()],
27+ 'mac_addresses': [factory.make_mac_address()],
28 })
29 self.assertEqual(
30 NodeGroup.objects.ensure_master(),
31@@ -221,7 +221,7 @@
32 'autodetect_nodegroup': '1',
33 'architecture': architecture,
34 'power_type': 'ether_wake',
35- 'mac_addresses': [factory.getRandomMACAddress()],
36+ 'mac_addresses': [factory.make_mac_address()],
37 })
38 node = Node.objects.get(
39 system_id=json.loads(response.content)['system_id'])
40@@ -255,7 +255,7 @@
41 'op': 'new',
42 'architecture': architecture,
43 'power_type': 'ether_wake',
44- 'mac_addresses': [factory.getRandomMACAddress()],
45+ 'mac_addresses': [factory.make_mac_address()],
46 })
47 self.assertEqual(httplib.BAD_REQUEST, response.status_code)
48 self.assertIn('text/plain', response['Content-Type'])
49@@ -369,7 +369,7 @@
50 'hostname': hostname_with_domain,
51 'architecture': make_usable_architecture(self),
52 'power_type': 'ether_wake',
53- 'mac_addresses': [factory.getRandomMACAddress()],
54+ 'mac_addresses': [factory.make_mac_address()],
55 })
56 self.assertEqual(httplib.OK, response.status_code, response.content)
57 parsed_result = json.loads(response.content)
58@@ -392,7 +392,7 @@
59 'hostname': hostname_without_domain,
60 'architecture': make_usable_architecture(self),
61 'power_type': 'ether_wake',
62- 'mac_addresses': [factory.getRandomMACAddress()],
63+ 'mac_addresses': [factory.make_mac_address()],
64 })
65 self.assertEqual(httplib.OK, response.status_code, response.content)
66 parsed_result = json.loads(response.content)
67@@ -415,7 +415,7 @@
68 'hostname': factory.make_name('hostname'),
69 'architecture': make_usable_architecture(self),
70 'power_type': 'ether_wake',
71- 'mac_addresses': [factory.getRandomMACAddress()],
72+ 'mac_addresses': [factory.make_mac_address()],
73 },
74 REMOTE_ADDR=origin_ip)
75 self.assertEqual(httplib.OK, response.status_code, response.content)
76@@ -433,7 +433,7 @@
77 'hostname': factory.make_name('hostname'),
78 'architecture': make_usable_architecture(self),
79 'power_type': 'ether_wake',
80- 'mac_addresses': [factory.getRandomMACAddress()],
81+ 'mac_addresses': [factory.make_mac_address()],
82 },
83 HTTP_HOST=unknown_host)
84 self.assertEqual(httplib.OK, response.status_code, response.content)
85@@ -633,7 +633,7 @@
86 # The api allows the setting of a Node's power_parameters field.
87 # Create a power_parameter valid for the selected power_type.
88 self.client_log_in(as_admin=True)
89- new_mac_address = factory.getRandomMACAddress()
90+ new_mac_address = factory.make_mac_address()
91 response = self.client.post(
92 reverse('nodes_handler'), {
93 'op': 'new',
94@@ -662,7 +662,7 @@
95 'architecture': make_usable_architecture(self),
96 'power_type': 'ether_wake',
97 'power_parameters_unknown_param': factory.make_string(),
98- 'mac_addresses': [factory.getRandomMACAddress()],
99+ 'mac_addresses': [factory.make_mac_address()],
100 })
101
102 self.assertEqual(
103
104=== modified file 'src/maasserver/api/tests/test_node.py'
105--- src/maasserver/api/tests/test_node.py 2014-09-17 09:36:21 +0000
106+++ src/maasserver/api/tests/test_node.py 2014-09-18 12:49:34 +0000
107@@ -622,7 +622,7 @@
108 power_type='ether_wake',
109 architecture=make_usable_architecture(self))
110 # Create a power_parameter valid for the selected power_type.
111- new_power_address = factory.getRandomMACAddress()
112+ new_power_address = factory.make_mac_address()
113 response = self.client_put(
114 self.get_node_uri(node),
115 {'power_parameters_mac_address': new_power_address})
116@@ -1040,7 +1040,7 @@
117 def test_claim_sticky_ip_address_catches_bad_mac_address_parameter(self):
118 self.become_admin()
119 node = factory.make_node_with_mac_attached_to_nodegroupinterface()
120- random_mac = factory.getRandomMACAddress()
121+ random_mac = factory.make_mac_address()
122
123 response = self.client.post(
124 self.get_node_uri(node),
125
126=== modified file 'src/maasserver/api/tests/test_nodes.py'
127--- src/maasserver/api/tests/test_nodes.py 2014-09-17 09:36:21 +0000
128+++ src/maasserver/api/tests/test_nodes.py 2014-09-18 12:49:34 +0000
129@@ -87,7 +87,7 @@
130 class AnonymousIsRegisteredAPITest(MAASServerTestCase):
131
132 def test_is_registered_returns_True_if_node_registered(self):
133- mac_address = factory.getRandomMACAddress()
134+ mac_address = factory.make_mac_address()
135 factory.make_MACAddress(mac_address)
136 response = self.client.get(
137 reverse('nodes_handler'),
138@@ -97,7 +97,7 @@
139 (response.status_code, response.content))
140
141 def test_is_registered_returns_False_if_mac_registered_node_retired(self):
142- mac_address = factory.getRandomMACAddress()
143+ mac_address = factory.make_mac_address()
144 mac = factory.make_MACAddress(mac_address)
145 mac.node.status = NODE_STATUS.RETIRED
146 mac.node.save()
147@@ -124,7 +124,7 @@
148 (response.status_code, response.content))
149
150 def test_is_registered_returns_False_if_node_not_registered(self):
151- mac_address = factory.getRandomMACAddress()
152+ mac_address = factory.make_mac_address()
153 response = self.client.get(
154 reverse('nodes_handler'),
155 {'op': 'is_registered', 'mac_address': mac_address})
156
157=== modified file 'src/maasserver/api/tests/test_pxeconfig.py'
158--- src/maasserver/api/tests/test_pxeconfig.py 2014-09-15 14:28:28 +0000
159+++ src/maasserver/api/tests/test_pxeconfig.py 2014-09-18 12:49:34 +0000
160@@ -175,7 +175,7 @@
161 self.assertEqual(httplib.OK, response.status_code)
162
163 def test_pxeconfig_returns_no_content_for_unknown_node(self):
164- params = dict(mac=factory.getRandomMACAddress(delimiter='-'))
165+ params = dict(mac=factory.make_mac_address(delimiter='-'))
166 response = self.client.get(reverse('pxeconfig'), params)
167 self.assertEqual(httplib.NO_CONTENT, response.status_code)
168
169@@ -185,7 +185,7 @@
170 nodegroup = factory.make_NodeGroup()
171 params = dict(
172 self.get_default_params(),
173- mac=factory.getRandomMACAddress(delimiter='-'),
174+ mac=factory.make_mac_address(delimiter='-'),
175 arch=arch,
176 subarch=subarch,
177 cluster_uuid=nodegroup.uuid)
178@@ -203,7 +203,7 @@
179 nodegroup = factory.make_NodeGroup()
180 params = dict(
181 self.get_default_params(),
182- mac=factory.getRandomMACAddress(delimiter='-'),
183+ mac=factory.make_mac_address(delimiter='-'),
184 arch=arch,
185 subarch=subarch,
186 cluster_uuid=nodegroup.uuid)
187
188=== modified file 'src/maasserver/clusterrpc/tests/test_dhcp.py'
189--- src/maasserver/clusterrpc/tests/test_dhcp.py 2014-09-15 14:28:28 +0000
190+++ src/maasserver/clusterrpc/tests/test_dhcp.py 2014-09-18 12:49:34 +0000
191@@ -244,8 +244,8 @@
192 # Calls will be made to add these.
193 static_mappings = {
194 nodegroup: {
195- get_random_static_ip(): factory.getRandomMACAddress(),
196- get_random_static_ip(): factory.getRandomMACAddress(),
197+ get_random_static_ip(): factory.make_mac_address(),
198+ get_random_static_ip(): factory.make_mac_address(),
199 }
200 }
201
202@@ -491,7 +491,7 @@
203 # in to gen_calls_to_create_host_maps().
204 static_mappings = {
205 nodegroup: {
206- factory.make_ipv4_address(): factory.getRandomMACAddress()
207+ factory.make_ipv4_address(): factory.make_mac_address()
208 for _ in xrange(3)
209 }
210 for nodegroup in nodegroups
211@@ -524,7 +524,7 @@
212
213 static_mapping = {
214 nodegroup: {
215- factory.make_ipv6_address(): factory.getRandomMACAddress()
216+ factory.make_ipv6_address(): factory.make_mac_address()
217 }
218 }
219
220
221=== modified file 'src/maasserver/models/tests/test_dhcplease.py'
222--- src/maasserver/models/tests/test_dhcplease.py 2014-09-15 14:28:28 +0000
223+++ src/maasserver/models/tests/test_dhcplease.py 2014-09-18 12:49:34 +0000
224@@ -43,7 +43,7 @@
225 def test_init(self):
226 nodegroup = factory.make_NodeGroup()
227 ip = factory.make_ipv4_address()
228- mac = factory.getRandomMACAddress()
229+ mac = factory.make_mac_address()
230
231 lease = DHCPLease(nodegroup=nodegroup, ip=ip, mac=mac)
232 lease.save()
233@@ -101,7 +101,7 @@
234 nodegroup = factory.make_NodeGroup()
235 ip = factory.make_ipv4_address()
236 factory.make_DHCPLease(nodegroup=nodegroup, ip=ip)
237- new_mac = factory.getRandomMACAddress()
238+ new_mac = factory.make_mac_address()
239 DHCPLease.objects.update_leases(nodegroup, {ip: new_mac})
240 self.assertEqual({ip: new_mac}, map_leases(nodegroup))
241
242@@ -114,7 +114,7 @@
243
244 def test_update_leases_adds_new_ip_to_mac(self):
245 nodegroup = factory.make_NodeGroup()
246- mac = factory.getRandomMACAddress()
247+ mac = factory.make_mac_address()
248 ip1 = factory.make_ipv4_address()
249 ip2 = factory.make_ipv4_address()
250 factory.make_DHCPLease(nodegroup=nodegroup, mac=mac, ip=ip1)
251@@ -123,7 +123,7 @@
252
253 def test_update_leases_deletes_only_obsolete_ips(self):
254 nodegroup = factory.make_NodeGroup()
255- mac = factory.getRandomMACAddress()
256+ mac = factory.make_mac_address()
257 obsolete_ip = factory.make_ipv4_address()
258 current_ip = factory.make_ipv4_address()
259 factory.make_DHCPLease(nodegroup=nodegroup, mac=mac, ip=obsolete_ip)
260@@ -141,8 +141,8 @@
261
262 def test_update_leases_combines_additions_deletions_and_replacements(self):
263 nodegroup = factory.make_NodeGroup()
264- mac1 = factory.getRandomMACAddress()
265- mac2 = factory.getRandomMACAddress()
266+ mac1 = factory.make_mac_address()
267+ mac2 = factory.make_mac_address()
268 obsolete_lease = factory.make_DHCPLease(
269 nodegroup=nodegroup, mac=mac1)
270 # The obsolete lease won't be in the update, so it'll disappear.
271
272=== modified file 'src/maasserver/models/tests/test_macaddress.py'
273--- src/maasserver/models/tests/test_macaddress.py 2014-09-15 14:28:28 +0000
274+++ src/maasserver/models/tests/test_macaddress.py 2014-09-18 12:49:34 +0000
275@@ -782,7 +782,7 @@
276
277 def test_ignores_unknown_macs(self):
278 cluster = factory.make_NodeGroup()
279- mac_address = factory.getRandomMACAddress()
280+ mac_address = factory.make_mac_address()
281 leases = {
282 factory.make_ipv4_address(): mac_address
283 }
284@@ -801,7 +801,7 @@
285 ip_range_low='', ip_range_high='', router_ip='',
286 ip=factory.make_ipv4_address(),
287 management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
288- mac_address = factory.getRandomMACAddress()
289+ mac_address = factory.make_mac_address()
290 leases = {
291 factory.make_ipv4_address(): mac_address
292 }
293
294=== modified file 'src/maasserver/models/tests/test_node.py'
295--- src/maasserver/models/tests/test_node.py 2014-09-17 14:26:50 +0000
296+++ src/maasserver/models/tests/test_node.py 2014-09-18 12:49:34 +0000
297@@ -278,7 +278,7 @@
298 self.assertEqual(token, node.token)
299
300 def test_add_mac_address(self):
301- mac = factory.getRandomMACAddress()
302+ mac = factory.make_mac_address()
303 node = factory.make_Node()
304 node.add_mac_address(mac)
305 macs = MACAddress.objects.filter(node=node, mac_address=mac).count()
306@@ -290,7 +290,7 @@
307 cluster = factory.make_NodeGroup()
308 cluster_interface = factory.make_NodeGroupInterface(nodegroup=cluster)
309 ip_in_range = cluster_interface.static_ip_range_low
310- mac_address = factory.getRandomMACAddress()
311+ mac_address = factory.make_mac_address()
312 factory.make_DHCPLease(
313 mac=mac_address, ip=ip_in_range, nodegroup=cluster)
314 node = factory.make_Node(nodegroup=cluster)
315@@ -300,7 +300,7 @@
316 cluster_interface, node.get_primary_mac().cluster_interface)
317
318 def test_remove_mac_address(self):
319- mac = factory.getRandomMACAddress()
320+ mac = factory.make_mac_address()
321 node = factory.make_Node()
322 node.add_mac_address(mac)
323 node.remove_mac_address(mac)
324@@ -310,7 +310,7 @@
325
326 def test_get_primary_mac_returns_mac_address(self):
327 node = factory.make_Node()
328- mac = factory.getRandomMACAddress()
329+ mac = factory.make_mac_address()
330 node.add_mac_address(mac)
331 self.assertEqual(mac, node.get_primary_mac().mac_address)
332
333@@ -320,7 +320,7 @@
334
335 def test_get_primary_mac_returns_oldest_mac(self):
336 node = factory.make_Node()
337- macs = [factory.getRandomMACAddress() for counter in range(3)]
338+ macs = [factory.make_mac_address() for counter in range(3)]
339 offset = timedelta(0)
340 for mac in macs:
341 mac_address = node.add_mac_address(mac)
342@@ -478,14 +478,14 @@
343
344 def test_get_effective_power_parameters_adds_mac_if_no_params_set(self):
345 node = factory.make_Node()
346- mac = factory.getRandomMACAddress()
347+ mac = factory.make_mac_address()
348 node.add_mac_address(mac)
349 self.assertEqual(
350 mac, node.get_effective_power_parameters()['mac_address'])
351
352 def test_get_effective_power_parameters_adds_no_mac_if_params_set(self):
353 node = factory.make_Node(power_parameters={'foo': 'bar'})
354- mac = factory.getRandomMACAddress()
355+ mac = factory.make_mac_address()
356 node.add_mac_address(mac)
357 self.assertNotIn('mac', node.get_effective_power_parameters())
358
359
360=== modified file 'src/maasserver/models/tests/test_nodegroup.py'
361--- src/maasserver/models/tests/test_nodegroup.py 2014-09-17 20:36:17 +0000
362+++ src/maasserver/models/tests/test_nodegroup.py 2014-09-18 12:49:34 +0000
363@@ -505,7 +505,7 @@
364 protocol = fixture.makeCluster(nodegroup, AddSeaMicro15k)
365 protocol.AddSeaMicro15k.return_value = defer.succeed({})
366
367- mac = factory.getRandomMACAddress()
368+ mac = factory.make_mac_address()
369 username = factory.make_name('user')
370 password = factory.make_name('password')
371 power_control = factory.make_name('power_control')
372@@ -523,7 +523,7 @@
373 client = getClientFor.return_value
374 nodegroup = factory.make_NodeGroup()
375
376- mac = factory.getRandomMACAddress()
377+ mac = factory.make_mac_address()
378 username = factory.make_name('user')
379 password = factory.make_name('password')
380 power_control = factory.make_name('power_control')
381@@ -541,7 +541,7 @@
382 getClientFor.side_effect = NoConnectionsAvailable()
383 nodegroup = factory.make_NodeGroup()
384
385- mac = factory.getRandomMACAddress()
386+ mac = factory.make_mac_address()
387 username = factory.make_name('user')
388 password = factory.make_name('password')
389 power_control = factory.make_name('power_control')
390
391=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
392--- src/maasserver/rpc/tests/test_nodes.py 2014-09-10 14:31:57 +0000
393+++ src/maasserver/rpc/tests/test_nodes.py 2014-09-18 12:49:34 +0000
394@@ -52,7 +52,7 @@
395 self.prepare_cluster_rpc(cluster)
396
397 mac_addresses = [
398- factory.getRandomMACAddress() for _ in range(3)]
399+ factory.make_mac_address() for _ in range(3)]
400 architecture = make_usable_architecture(self)
401 power_type = random.choice(self.power_types)['name']
402 power_parameters = dumps({})
403@@ -87,7 +87,7 @@
404 ValidationError, create_node, cluster.uuid,
405 architecture="spam/eggs", power_type="scrambled",
406 power_parameters=dumps({}),
407- mac_addresses=[factory.getRandomMACAddress()])
408+ mac_addresses=[factory.make_mac_address()])
409
410 def test__raises_error_if_node_already_exists(self):
411 cluster = factory.make_NodeGroup()
412@@ -95,7 +95,7 @@
413 self.prepare_cluster_rpc(cluster)
414
415 mac_addresses = [
416- factory.getRandomMACAddress() for _ in range(3)]
417+ factory.make_mac_address() for _ in range(3)]
418 architecture = make_usable_architecture(self)
419 power_type = random.choice(self.power_types)['name']
420 power_parameters = dumps({})
421
422=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
423--- src/maasserver/rpc/tests/test_regionservice.py 2014-09-17 11:02:19 +0000
424+++ src/maasserver/rpc/tests/test_regionservice.py 2014-09-18 12:49:34 +0000
425@@ -287,7 +287,7 @@
426 nodegroup = yield deferToThread(self.make_node_group, uuid)
427 mapping = {
428 "ip": factory.make_ipv4_address(),
429- "mac": factory.getRandomMACAddress()
430+ "mac": factory.make_mac_address()
431 }
432
433 response = yield call_responder(Region(), UpdateLeases, {
434@@ -1655,7 +1655,7 @@
435 'architecture': make_usable_architecture(self),
436 'power_type': factory.make_name("power_type"),
437 'power_parameters': dumps({}),
438- 'mac_addresses': [factory.getRandomMACAddress()],
439+ 'mac_addresses': [factory.make_mac_address()],
440 }
441
442 response = yield call_responder(
443
444=== modified file 'src/maasserver/testing/factory.py'
445--- src/maasserver/testing/factory.py 2014-09-15 14:28:28 +0000
446+++ src/maasserver/testing/factory.py 2014-09-18 12:49:34 +0000
447@@ -464,7 +464,7 @@
448
449 def make_MAC(self):
450 """Generate a random MAC address, in the form of a MAC object."""
451- return MAC(self.getRandomMACAddress())
452+ return MAC(self.make_mac_address())
453
454 def make_MACAddress(self, address=None, node=None, networks=None,
455 **kwargs):
456@@ -472,7 +472,7 @@
457 if node is None:
458 node = self.make_Node()
459 if address is None:
460- address = self.getRandomMACAddress()
461+ address = self.make_mac_address()
462 mac = MACAddress(mac_address=MAC(address), node=node, **kwargs)
463 mac.save()
464 if networks is not None:
465@@ -522,7 +522,7 @@
466 if ip is None:
467 ip = self.make_ipv4_address()
468 if mac is None:
469- mac = self.getRandomMACAddress()
470+ mac = self.make_mac_address()
471 lease = DHCPLease(nodegroup=nodegroup, ip=ip, mac=MAC(mac))
472 lease.save()
473 return lease
474
475=== modified file 'src/maasserver/tests/test_fields.py'
476--- src/maasserver/tests/test_fields.py 2014-09-10 16:20:31 +0000
477+++ src/maasserver/tests/test_fields.py 2014-09-18 12:49:34 +0000
478@@ -141,22 +141,22 @@
479 self.assertIsNone(MAC(None).get_raw())
480
481 def test_get_raw_returns_wrapped_address(self):
482- addr = factory.getRandomMACAddress()
483+ addr = factory.make_mac_address()
484 self.assertEqual(addr, MAC(addr).get_raw())
485
486 def test_get_raw_punches_through_double_wrapping(self):
487- addr = factory.getRandomMACAddress()
488+ addr = factory.make_mac_address()
489 self.assertEqual(addr, MAC(MAC(addr)).get_raw())
490
491 def test_getquoted_returns_NULL_for_None(self):
492 self.assertEqual("NULL", MAC(None).getquoted())
493
494 def test_getquoted_returns_SQL_for_MAC(self):
495- addr = factory.getRandomMACAddress()
496+ addr = factory.make_mac_address()
497 self.assertEqual("'%s'::macaddr" % addr, MAC(addr).getquoted())
498
499 def test_getquoted_punches_through_double_wrapping(self):
500- addr = factory.getRandomMACAddress()
501+ addr = factory.make_mac_address()
502 self.assertEqual("'%s'::macaddr" % addr, MAC(MAC(addr)).getquoted())
503
504 def test_mac_equals_self(self):
505@@ -164,7 +164,7 @@
506 self.assertTrue(mac == mac)
507
508 def test_mac_equals_identical_mac(self):
509- addr = factory.getRandomMACAddress()
510+ addr = factory.make_mac_address()
511 self.assertTrue(MAC(addr) == MAC(addr))
512
513 def test_eq_punches_through_double_wrapping_on_self(self):
514@@ -215,7 +215,7 @@
515 self.assertItemsEqual(set([mac1, mac2]), [mac1, mac2])
516
517 def test_identical_macs_hash_identically(self):
518- addr = factory.getRandomMACAddress()
519+ addr = factory.make_mac_address()
520 self.assertItemsEqual(
521 set([MAC(addr), MAC(addr), MAC(MAC(addr)), addr]),
522 [addr])
523
524=== modified file 'src/maasserver/tests/test_forms_macaddress.py'
525--- src/maasserver/tests/test_forms_macaddress.py 2014-09-10 16:20:31 +0000
526+++ src/maasserver/tests/test_forms_macaddress.py 2014-09-18 12:49:34 +0000
527@@ -24,7 +24,7 @@
528
529 def test_MACAddressForm_creates_mac_address(self):
530 node = factory.make_Node()
531- mac = factory.getRandomMACAddress()
532+ mac = factory.make_mac_address()
533 form = MACAddressForm(node=node, data={'mac_address': mac})
534 form.save()
535 self.assertTrue(
536@@ -32,7 +32,7 @@
537
538 def test_saves_to_db_by_default(self):
539 node = factory.make_Node()
540- mac = factory.getRandomMACAddress()
541+ mac = factory.make_mac_address()
542 form = MACAddressForm(node=node, data={'mac_address': mac})
543 form.save()
544 self.assertEqual(
545@@ -40,13 +40,13 @@
546
547 def test_does_not_save_to_db_if_commit_is_False(self):
548 node = factory.make_Node()
549- mac = factory.getRandomMACAddress()
550+ mac = factory.make_mac_address()
551 form = MACAddressForm(node=node, data={'mac_address': mac})
552 form.save(commit=False)
553 self.assertItemsEqual([], MACAddress.objects.filter(mac_address=mac))
554
555 def test_MACAddressForm_displays_error_message_if_mac_already_used(self):
556- mac = factory.getRandomMACAddress()
557+ mac = factory.make_mac_address()
558 node = factory.make_MACAddress(address=mac)
559 node = factory.make_Node()
560 form = MACAddressForm(node=node, data={'mac_address': mac})
561
562=== modified file 'src/maasserver/tests/test_forms_nodewithmacaddresses.py'
563--- src/maasserver/tests/test_forms_nodewithmacaddresses.py 2014-09-10 16:20:31 +0000
564+++ src/maasserver/tests/test_forms_nodewithmacaddresses.py 2014-09-18 12:49:34 +0000
565@@ -41,7 +41,7 @@
566 def make_params(self, mac_addresses=None, architecture=None,
567 hostname=None, nodegroup=None):
568 if mac_addresses is None:
569- mac_addresses = [factory.getRandomMACAddress()]
570+ mac_addresses = [factory.make_mac_address()]
571 if architecture is None:
572 architecture = factory.make_name('arch')
573 if hostname is None:
574@@ -104,7 +104,7 @@
575 # Empty values in the list of MAC addresses are simply ignored.
576 form = NodeWithMACAddressesForm(
577 data=self.make_params(
578- mac_addresses=[factory.getRandomMACAddress(), '']))
579+ mac_addresses=[factory.make_mac_address(), '']))
580
581 self.assertTrue(form.is_valid())
582
583
584=== modified file 'src/maasserver/tests/test_node_constraint_filter_forms.py'
585--- src/maasserver/tests/test_node_constraint_filter_forms.py 2014-09-15 14:28:28 +0000
586+++ src/maasserver/tests/test_node_constraint_filter_forms.py 2014-09-18 12:49:34 +0000
587@@ -701,8 +701,8 @@
588 'not_tags': [factory.make_Tag().name],
589 'networks': [factory.make_Network().name],
590 'not_networks': [factory.make_Network().name],
591- 'connected_to': [factory.getRandomMACAddress()],
592- 'not_connected_to': [factory.getRandomMACAddress()],
593+ 'connected_to': [factory.make_mac_address()],
594+ 'not_connected_to': [factory.make_mac_address()],
595 'zone': factory.make_Zone(),
596 'not_in_zone': [factory.make_Zone().name],
597 }
598
599=== modified file 'src/maasserver/views/tests/test_nodes.py'
600--- src/maasserver/views/tests/test_nodes.py 2014-09-17 09:36:21 +0000
601+++ src/maasserver/views/tests/test_nodes.py 2014-09-18 12:49:34 +0000
602@@ -1725,7 +1725,7 @@
603 # with a nice error message because the node could not be found.
604 self.client_log_in()
605 node_id = factory.make_string()
606- mac = factory.getRandomMACAddress()
607+ mac = factory.make_mac_address()
608 mac_delete_link = reverse('mac-delete', args=[node_id, mac])
609 response = self.client.get(mac_delete_link)
610 self.assertEqual(httplib.NOT_FOUND, response.status_code)
611@@ -1735,7 +1735,7 @@
612 # to the node edit page.
613 self.client_log_in()
614 node = factory.make_Node(owner=self.logged_in_user)
615- mac = factory.getRandomMACAddress()
616+ mac = factory.make_mac_address()
617 mac_delete_link = reverse('mac-delete', args=[node.system_id, mac])
618 response = self.client.get(mac_delete_link)
619 self.assertEqual(
620@@ -1809,7 +1809,7 @@
621 self.client_log_in()
622 node = factory.make_Node(owner=self.logged_in_user)
623 mac_add_link = reverse('mac-add', args=[node.system_id])
624- mac = factory.getRandomMACAddress()
625+ mac = factory.make_mac_address()
626 response = self.client.post(mac_add_link, {'mac_address': mac})
627 self.assertEqual(
628 reverse('node-edit', args=[node.system_id]),
629@@ -1821,7 +1821,7 @@
630 self.client_log_in()
631 node = factory.make_Node(owner=self.logged_in_user)
632 mac_add_link = reverse('mac-add', args=[node.system_id])
633- mac = factory.getRandomMACAddress()
634+ mac = factory.make_mac_address()
635 response = self.client.post(mac_add_link, {'mac_address': mac})
636 redirect = extract_redirect(response)
637 response = self.client.get(redirect)
638
639=== modified file 'src/maastesting/factory.py'
640--- src/maastesting/factory.py 2014-09-18 11:18:24 +0000
641+++ src/maastesting/factory.py 2014-09-18 12:49:34 +0000
642@@ -278,7 +278,7 @@
643 # guards against shortfalls as random IP addresses collide.
644 leases = {}
645 while len(leases) < num_leases:
646- leases[self.make_ipv4_address()] = self.getRandomMACAddress()
647+ leases[self.make_ipv4_address()] = self.make_mac_address()
648 return leases
649
650 def make_date(self, year=2011):
651
652=== modified file 'src/metadataserver/deployment/tests/test_maas_configure_interfaces.py'
653--- src/metadataserver/deployment/tests/test_maas_configure_interfaces.py 2014-09-18 09:28:09 +0000
654+++ src/metadataserver/deployment/tests/test_maas_configure_interfaces.py 2014-09-18 12:49:34 +0000
655@@ -61,7 +61,7 @@
656 config_dir = factory.make_name('etc-network')
657 ip = factory.make_ipv6_address()
658 gateway = factory.make_ipv6_address()
659- mac = factory.getRandomMACAddress()
660+ mac = factory.make_mac_address()
661 args = parser.parse_args([
662 '--config-dir=%s' % config_dir,
663 '--update-interfaces',
664@@ -86,7 +86,7 @@
665 def test__parses_multiple_ip_mac_pairs(self):
666 parser = script.prepare_parser()
667 pairs = [
668- (factory.make_ipv6_address(), factory.getRandomMACAddress())
669+ (factory.make_ipv6_address(), factory.make_mac_address())
670 for _ in range(randint(2, 4))
671 ]
672 args = ['--static-ip=%s=%s' % pair for pair in pairs]
673@@ -94,7 +94,7 @@
674
675 def test__checks_for_obviously_malformed_ip_mac_pairs(self):
676 ip = factory.make_ipv6_address()
677- mac = factory.getRandomMACAddress()
678+ mac = factory.make_mac_address()
679 parser = script.prepare_parser()
680 self.assertRaises(
681 script.BadArgument,
682@@ -103,7 +103,7 @@
683
684 def make_denormalised_mac():
685 """Create a MAC address that is not in its normalised form."""
686- mac = factory.getRandomMACAddress()
687+ mac = factory.make_mac_address()
688 if mac.upper() == mac.lower():
689 # This is not denormalised. Inject an upper-case letter to ensure
690 # that we get something denormalised.
691@@ -115,7 +115,7 @@
692
693 def test__splits_ip_mac_pairs(self):
694 ip = factory.make_ipv6_address()
695- mac = factory.getRandomMACAddress()
696+ mac = factory.make_mac_address()
697 self.assertEqual(
698 (ip, mac),
699 script.split_ip_mac_pair('%s=%s' % (ip, mac)))
700@@ -132,19 +132,19 @@
701 class TestNormaliseMAC(MAASTestCase):
702
703 def test__normalises(self):
704- mac = factory.getRandomMACAddress()
705+ mac = factory.make_mac_address()
706 self.assertEqual(
707 script.normalise_mac(mac.lower()),
708 script.normalise_mac(mac.upper()))
709
710 def test__is_idempotent(self):
711- mac = factory.getRandomMACAddress()
712+ mac = factory.make_mac_address()
713 self.assertEqual(
714 script.normalise_mac(mac),
715 script.normalise_mac(script.normalise_mac(mac)))
716
717 def test__strips_whitespace(self):
718- mac = factory.getRandomMACAddress()
719+ mac = factory.make_mac_address()
720 self.assertEqual(mac, script.normalise_mac(' %s\n' % mac))
721
722
723@@ -225,7 +225,7 @@
724
725 def test__combines_mappings(self):
726 ip = factory.make_ipv6_address()
727- mac = factory.getRandomMACAddress()
728+ mac = factory.make_mac_address()
729 interface = factory.make_name('eth')
730 self.assertEqual(
731 {interface: [ip]},
732@@ -235,14 +235,14 @@
733
734 def test__ignores_unknown_macs(self):
735 ip = factory.make_ipv6_address()
736- mac = factory.getRandomMACAddress()
737+ mac = factory.make_mac_address()
738 self.assertEqual(
739 {},
740 script.map_addresses_by_interface({}, [(ip, mac)]))
741
742 def test__ignores_unknown_interfaces(self):
743 ip = factory.make_ipv6_address()
744- mac = factory.getRandomMACAddress()
745+ mac = factory.make_mac_address()
746 self.assertEqual(
747 {},
748 script.map_addresses_by_interface({mac: []}, [(ip, mac)]))
749@@ -250,7 +250,7 @@
750 def test__combines_addresses_per_interface(self):
751 ip1 = factory.make_ipv6_address()
752 ip2 = factory.make_ipv6_address()
753- mac = factory.getRandomMACAddress()
754+ mac = factory.make_mac_address()
755 interface = factory.make_name('eth')
756 mapping = script.map_addresses_by_interface(
757 {mac: [interface]},
758@@ -298,7 +298,7 @@
759
760 def test__returns_config_file_text(self):
761 ip = factory.make_ipv6_address()
762- mac = factory.getRandomMACAddress()
763+ mac = factory.make_mac_address()
764 interface = factory.make_name('eth')
765 self.assertIn(
766 script.compose_config_stanza(interface, [ip], []),
767@@ -388,7 +388,7 @@
768 def test__writes_network_config(self):
769 write_file = self.patch_write_file()
770 ip = factory.make_ipv6_address()
771- mac = factory.getRandomMACAddress()
772+ mac = factory.make_mac_address()
773 interface = factory.make_name('eth')
774 config_dir = self.make_config_dir()
775
776@@ -404,7 +404,7 @@
777
778 def test__returns_interfaces_with_addresses(self):
779 ip = factory.make_ipv6_address()
780- mac = factory.getRandomMACAddress()
781+ mac = factory.make_mac_address()
782 interface = factory.make_name('eth')
783 config_dir = self.make_config_dir()
784 self.patch_write_file()
785@@ -416,7 +416,7 @@
786
787 def test__ignores_interfaces_without_addresses(self):
788 ip = factory.make_ipv6_address()
789- mac = factory.getRandomMACAddress()
790+ mac = factory.make_mac_address()
791 config_dir = self.make_config_dir()
792 self.patch_write_file()
793 self.assertEqual(
794@@ -468,7 +468,7 @@
795
796 def test__generates_udev_rule(self):
797 interface = factory.make_name('eth')
798- mac = factory.getRandomMACAddress()
799+ mac = factory.make_mac_address()
800 expected_rule = (
801 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", '
802 'ATTR{address}=="%(mac)s", NAME="%(interface)s"'
803@@ -485,7 +485,7 @@
804
805 def test__writes_udev_file(self):
806 interface = factory.make_name('eth')
807- mac = factory.getRandomMACAddress()
808+ mac = factory.make_mac_address()
809 write_file = self.patch_write_file()
810 script.name_interfaces({mac: [interface]})
811 self.assertThat(
812@@ -495,7 +495,7 @@
813
814 def test__writes_udev_rules(self):
815 interface = factory.make_name('eth')
816- mac = factory.getRandomMACAddress()
817+ mac = factory.make_mac_address()
818 write_file = self.patch_write_file()
819 script.name_interfaces({mac: [interface]})
820 [call] = write_file.mock_calls
821@@ -513,7 +513,7 @@
822 lo_interface = 'lo'
823 lo_mac = '00:00:00:00:00:00'
824 proper_interface = factory.make_name('eth')
825- proper_mac = factory.getRandomMACAddress()
826+ proper_mac = factory.make_mac_address()
827 generate_udev_rule = self.patch_autospec(script, 'generate_udev_rule')
828 generate_udev_rule.return_value = "(udev rule)"
829 script.name_interfaces(
830@@ -527,7 +527,7 @@
831
832 def test__skips_if_udev_rules_d_does_not_exist(self):
833 interface = factory.make_name('eth')
834- mac = factory.getRandomMACAddress()
835+ mac = factory.make_mac_address()
836 write_file = self.patch_write_file()
837 write_file.side_effect = IOError(
838 ENOENT, "Deliberate error: No such file or directory.")
839@@ -537,7 +537,7 @@
840
841 def test__propagates_similar_but_different_errors_writing_file(self):
842 interface = factory.make_name('eth')
843- mac = factory.getRandomMACAddress()
844+ mac = factory.make_mac_address()
845 write_file = self.patch_write_file()
846 write_file.side_effect = IOError(
847 EACCES, "Deliberate error: Permission denied.")
848
849=== modified file 'src/metadataserver/tests/test_api.py'
850--- src/metadataserver/tests/test_api.py 2014-09-17 09:36:37 +0000
851+++ src/metadataserver/tests/test_api.py 2014-09-18 12:49:34 +0000
852@@ -124,11 +124,11 @@
853 def test_get_node_for_mac_refuses_if_anonymous_access_disabled(self):
854 self.patch(settings, 'ALLOW_UNSAFE_METADATA_ACCESS', False)
855 self.assertRaises(
856- PermissionDenied, get_node_for_mac, factory.getRandomMACAddress())
857+ PermissionDenied, get_node_for_mac, factory.make_mac_address())
858
859 def test_get_node_for_mac_raises_404_for_unknown_mac(self):
860 self.assertRaises(
861- MAASAPINotFound, get_node_for_mac, factory.getRandomMACAddress())
862+ MAASAPINotFound, get_node_for_mac, factory.make_mac_address())
863
864 def test_get_node_for_mac_finds_node_by_mac(self):
865 mac = factory.make_MACAddress()
866
867=== modified file 'src/provisioningserver/boot/tests/test_powernv.py'
868--- src/provisioningserver/boot/tests/test_powernv.py 2014-08-27 03:38:28 +0000
869+++ src/provisioningserver/boot/tests/test_powernv.py 2014-09-18 12:49:34 +0000
870@@ -68,7 +68,7 @@
871 The path is intended to match `re_config_file`, and the components are
872 the expected groups from a match.
873 """
874- components = {"mac": factory.getRandomMACAddress("-")}
875+ components = {"mac": factory.make_mac_address("-")}
876 config_path = compose_config_path(components["mac"])
877 return config_path, components
878
879@@ -136,7 +136,7 @@
880
881 def test_match_path_pxe_config_without_mac(self):
882 method = PowerNVBootMethod()
883- fake_mac = factory.getRandomMACAddress()
884+ fake_mac = factory.make_mac_address()
885 self.patch(powernv_module, 'get_remote_mac').return_value = fake_mac
886 config_path = 'ppc64el/pxelinux.cfg/default'
887 params = method.match_path(None, config_path)
888@@ -148,7 +148,7 @@
889
890 def test_match_path_pxe_prefix_request(self):
891 method = PowerNVBootMethod()
892- fake_mac = factory.getRandomMACAddress()
893+ fake_mac = factory.make_mac_address()
894 self.patch(powernv_module, 'get_remote_mac').return_value = fake_mac
895 file_path = 'ppc64el/file'
896 params = method.match_path(None, file_path)
897@@ -223,7 +223,7 @@
898
899 def test_get_reader_appends_bootif(self):
900 method = PowerNVBootMethod()
901- fake_mac = factory.getRandomMACAddress()
902+ fake_mac = factory.make_mac_address()
903 params = make_kernel_parameters(self, purpose="install")
904 output = method.get_reader(
905 backend=None, kernel_params=params, arch='ppc64el', mac=fake_mac)
906@@ -233,13 +233,13 @@
907 self.assertIn(expected, config['execute']['APPEND'])
908
909 def test_format_bootif_replaces_colon(self):
910- fake_mac = factory.getRandomMACAddress()
911+ fake_mac = factory.make_mac_address()
912 self.assertEqual(
913 '01-%s' % fake_mac.replace(':', '-').lower(),
914 format_bootif(fake_mac))
915
916 def test_format_bootif_makes_mac_address_lower(self):
917- fake_mac = factory.getRandomMACAddress()
918+ fake_mac = factory.make_mac_address()
919 fake_mac = fake_mac.upper()
920 self.assertEqual(
921 '01-%s' % fake_mac.replace(':', '-').lower(),
922
923=== modified file 'src/provisioningserver/boot/tests/test_pxe.py'
924--- src/provisioningserver/boot/tests/test_pxe.py 2014-06-24 12:44:35 +0000
925+++ src/provisioningserver/boot/tests/test_pxe.py 2014-09-18 12:49:34 +0000
926@@ -374,7 +374,7 @@
927 The path is intended to match `re_config_file`, and the components are
928 the expected groups from a match.
929 """
930- components = {"mac": factory.getRandomMACAddress("-"),
931+ components = {"mac": factory.make_mac_address("-"),
932 "arch": None,
933 "subarch": None}
934 config_path = compose_config_path(components["mac"])
935
936=== modified file 'src/provisioningserver/boot/tests/test_uefi.py'
937--- src/provisioningserver/boot/tests/test_uefi.py 2014-09-04 21:28:56 +0000
938+++ src/provisioningserver/boot/tests/test_uefi.py 2014-09-18 12:49:34 +0000
939@@ -163,7 +163,7 @@
940 The path is intended to match `re_config_file`, and
941 the components are the expected groups from a match.
942 """
943- components = {"mac": factory.getRandomMACAddress(":"),
944+ components = {"mac": factory.make_mac_address(":"),
945 "arch": None,
946 "subarch": None}
947 config_path = compose_config_path(components["mac"])
948
949=== modified file 'src/provisioningserver/boot/tests/test_windows.py'
950--- src/provisioningserver/boot/tests/test_windows.py 2014-09-13 11:38:50 +0000
951+++ src/provisioningserver/boot/tests/test_windows.py 2014-09-18 12:49:34 +0000
952@@ -176,7 +176,7 @@
953 @inlineCallbacks
954 def test_get_node_info(self):
955 method = WindowsPXEBootMethod()
956- mock_mac = factory.getRandomMACAddress()
957+ mock_mac = factory.make_mac_address()
958 mock_purpose = factory.make_name('install')
959 mock_release = factory.make_name('release')
960 self.patch(windows_module, 'get_remote_mac').return_value = mock_mac
961@@ -214,7 +214,7 @@
962 def test_match_path_pxelinux(self):
963 method = WindowsPXEBootMethod()
964 method.remote_path = factory.make_string()
965- mock_mac = factory.getRandomMACAddress()
966+ mock_mac = factory.make_mac_address()
967 mock_get_node_info = self.patch(method, 'get_node_info')
968 mock_get_node_info.return_value = {
969 'purpose': 'install',
970@@ -230,7 +230,7 @@
971 def test_match_path_pxelinux_only_on_install(self):
972 method = WindowsPXEBootMethod()
973 method.remote_path = factory.make_string()
974- mock_mac = factory.getRandomMACAddress()
975+ mock_mac = factory.make_mac_address()
976 mock_get_node_info = self.patch(method, 'get_node_info')
977 mock_get_node_info.return_value = {
978 'purpose': factory.make_string(),
979@@ -245,7 +245,7 @@
980 def test_match_path_pxelinux_missing_hivex(self):
981 method = WindowsPXEBootMethod()
982 method.remote_path = factory.make_string()
983- mock_mac = factory.getRandomMACAddress()
984+ mock_mac = factory.make_mac_address()
985 mock_get_node_info = self.patch(method, 'get_node_info')
986 mock_get_node_info.return_value = {
987 'purpose': factory.make_string(),
988@@ -261,7 +261,7 @@
989 def test_match_path_pxelinux_only_on_windows(self):
990 method = WindowsPXEBootMethod()
991 method.remote_path = factory.make_string()
992- mock_mac = factory.getRandomMACAddress()
993+ mock_mac = factory.make_mac_address()
994 mock_get_node_info = self.patch(method, 'get_node_info')
995 mock_get_node_info.return_value = {
996 'purpose': 'install',
997@@ -285,7 +285,7 @@
998 @inlineCallbacks
999 def test_match_path_static_file(self):
1000 method = WindowsPXEBootMethod()
1001- mock_mac = factory.getRandomMACAddress()
1002+ mock_mac = factory.make_mac_address()
1003 mock_get_node_info = self.patch(windows_module, 'get_remote_mac')
1004 mock_get_node_info.return_value = mock_mac
1005
1006@@ -296,7 +296,7 @@
1007 @inlineCallbacks
1008 def test_match_path_static_file_clean_path(self):
1009 method = WindowsPXEBootMethod()
1010- mock_mac = factory.getRandomMACAddress()
1011+ mock_mac = factory.make_mac_address()
1012 mock_get_node_info = self.patch(windows_module, 'get_remote_mac')
1013 mock_get_node_info.return_value = mock_mac
1014
1015
1016=== modified file 'src/provisioningserver/dhcp/tests/test_detect.py'
1017--- src/provisioningserver/dhcp/tests/test_detect.py 2014-09-13 11:38:50 +0000
1018+++ src/provisioningserver/dhcp/tests/test_detect.py 2014-09-18 12:49:34 +0000
1019@@ -73,19 +73,19 @@
1020 self.patch(detect_module, 'make_transaction_ID').return_value = (
1021 transaction_id)
1022
1023- discover = DHCPDiscoverPacket(factory.getRandomMACAddress())
1024+ discover = DHCPDiscoverPacket(factory.make_mac_address())
1025
1026 self.assertEqual(transaction_id, discover.transaction_ID)
1027
1028 def test_init_sets_packed_mac(self):
1029- mac = factory.getRandomMACAddress()
1030+ mac = factory.make_mac_address()
1031 discover = DHCPDiscoverPacket(mac)
1032 self.assertEqual(
1033 discover.string_mac_to_packed(mac),
1034 discover.packed_mac)
1035
1036 def test_init_sets_packet(self):
1037- discover = DHCPDiscoverPacket(factory.getRandomMACAddress())
1038+ discover = DHCPDiscoverPacket(factory.make_mac_address())
1039 self.assertIsNotNone(discover.packet)
1040
1041 def test_string_mac_to_packed(self):
1042@@ -95,7 +95,7 @@
1043 self.assertEqual(expected, discover.string_mac_to_packed(input))
1044
1045 def test__build(self):
1046- mac = factory.getRandomMACAddress()
1047+ mac = factory.make_mac_address()
1048 discover = DHCPDiscoverPacket(mac)
1049 discover._build()
1050
1051@@ -179,7 +179,7 @@
1052
1053 def patch_interface_MAC(self):
1054 """Patch `get_interface_MAC` to return a fixed value."""
1055- mac = factory.getRandomMACAddress()
1056+ mac = factory.make_mac_address()
1057 self.patch(detect_module, 'get_interface_MAC').return_value = mac
1058 return mac
1059
1060
1061=== modified file 'src/provisioningserver/dhcp/tests/test_leases.py'
1062--- src/provisioningserver/dhcp/tests/test_leases.py 2014-09-15 14:28:28 +0000
1063+++ src/provisioningserver/dhcp/tests/test_leases.py 2014-09-18 12:49:34 +0000
1064@@ -135,10 +135,10 @@
1065
1066 def test_check_lease_changes_returns_tuple_if_lease_changed(self):
1067 ip = factory.make_ipv4_address()
1068- leases = {ip: factory.getRandomMACAddress()}
1069+ leases = {ip: factory.make_mac_address()}
1070 self.set_lease_state(
1071 datetime.utcnow() - timedelta(seconds=10), leases.copy())
1072- leases[ip] = factory.getRandomMACAddress()
1073+ leases[ip] = factory.make_mac_address()
1074 leases_file = self.fake_leases_file(leases)
1075 self.assertEqual(
1076 (get_write_time(leases_file), leases),
1077@@ -171,7 +171,7 @@
1078 leases = factory.make_random_leases()
1079 self.set_lease_state(
1080 datetime.utcnow() - timedelta(seconds=10), leases.copy())
1081- leases[factory.make_ipv4_address()] = factory.getRandomMACAddress()
1082+ leases[factory.make_ipv4_address()] = factory.make_mac_address()
1083 leases_file = self.fake_leases_file(leases)
1084 self.assertEqual(
1085 (get_write_time(leases_file), leases),
1086@@ -205,7 +205,7 @@
1087 def test_parse_leases_file_parses_leases(self):
1088 params = {
1089 'ip': factory.make_ipv4_address(),
1090- 'mac': factory.getRandomMACAddress(),
1091+ 'mac': factory.make_mac_address(),
1092 }
1093 leases_file = self.write_leases_file("""\
1094 lease %(ip)s {
1095
1096=== modified file 'src/provisioningserver/dhcp/tests/test_leases_parser.py'
1097--- src/provisioningserver/dhcp/tests/test_leases_parser.py 2014-09-13 11:38:50 +0000
1098+++ src/provisioningserver/dhcp/tests/test_leases_parser.py 2014-09-18 12:49:34 +0000
1099@@ -44,7 +44,7 @@
1100 if ip is None:
1101 ip = factory.make_ipv4_address()
1102 if mac is None:
1103- mac = factory.getRandomMACAddress()
1104+ mac = factory.make_mac_address()
1105 Hardware = namedtuple('Hardware', ['mac'])
1106 Lease = namedtuple(
1107 'Lease', ['lease_or_host', 'ip', 'hardware', 'ends'])
1108@@ -113,7 +113,7 @@
1109 The host entry will be in IPv4 or IPv6 depending on `ip`.
1110 """
1111 if mac is None:
1112- mac = factory.getRandomMACAddress()
1113+ mac = factory.make_mac_address()
1114 params = {
1115 'ip': unicode(ip),
1116 'mac': mac,
1117@@ -139,25 +139,25 @@
1118
1119 def test_parse_leases_parses_IPv4_lease(self):
1120 ip = factory.make_ipv4_address()
1121- mac = factory.getRandomMACAddress()
1122+ mac = factory.make_mac_address()
1123 leases = self.parse(self.make_lease_entry(ip, mac))
1124 self.assertEqual({ip: mac}, leases)
1125
1126 def test_parse_leases_parses_IPv6_lease(self):
1127 ip = unicode(factory.make_ipv6_address())
1128- mac = factory.getRandomMACAddress()
1129+ mac = factory.make_mac_address()
1130 leases = self.parse(self.make_lease_entry(ip, mac))
1131 self.assertEqual({ip: mac}, leases)
1132
1133 def test_parse_leases_parses_IPv4_host(self):
1134 ip = factory.make_ipv4_address()
1135- mac = factory.getRandomMACAddress()
1136+ mac = factory.make_mac_address()
1137 leases = self.parse(self.make_lease_entry(ip, mac))
1138 self.assertEqual({ip: mac}, leases)
1139
1140 def test_parse_leases_parses_IPv6_host(self):
1141 ip = factory.make_ipv6_address()
1142- mac = factory.getRandomMACAddress()
1143+ mac = factory.make_mac_address()
1144 leases = self.parse(self.make_lease_entry(ip, mac))
1145 self.assertEqual({unicode(ip): mac}, leases)
1146
1147@@ -169,9 +169,9 @@
1148 def test_parse_leases_copes_with_misleading_values(self):
1149 params = {
1150 'ip1': factory.make_ipv4_address(),
1151- 'mac1': factory.getRandomMACAddress(),
1152+ 'mac1': factory.make_mac_address(),
1153 'ip2': factory.make_ipv4_address(),
1154- 'mac2': factory.getRandomMACAddress(),
1155+ 'mac2': factory.make_mac_address(),
1156 }
1157 leases = self.parse(dedent("""\
1158 host %(ip1)s {
1159@@ -205,7 +205,7 @@
1160 def test_parse_leases_ignores_incomplete_lease_at_end(self):
1161 params = {
1162 'ip': factory.make_ipv4_address(),
1163- 'mac': factory.getRandomMACAddress(),
1164+ 'mac': factory.make_mac_address(),
1165 'incomplete_ip': factory.make_ipv4_address(),
1166 }
1167 leases = self.parse(dedent("""\
1168@@ -220,7 +220,7 @@
1169 def test_parse_leases_ignores_comments(self):
1170 params = {
1171 'ip': factory.make_ipv4_address(),
1172- 'mac': factory.getRandomMACAddress(),
1173+ 'mac': factory.make_mac_address(),
1174 }
1175 leases = self.parse(dedent("""\
1176 # Top comment (ignored).
1177@@ -235,7 +235,7 @@
1178 def test_parse_leases_ignores_expired_leases(self):
1179 params = {
1180 'ip': factory.make_ipv4_address(),
1181- 'mac': factory.getRandomMACAddress(),
1182+ 'mac': factory.make_mac_address(),
1183 }
1184 leases = self.parse(dedent("""\
1185 lease %(ip)s {
1186@@ -248,7 +248,7 @@
1187 def test_parse_leases_treats_never_as_eternity(self):
1188 params = {
1189 'ip': factory.make_ipv4_address(),
1190- 'mac': factory.getRandomMACAddress(),
1191+ 'mac': factory.make_mac_address(),
1192 }
1193 leases = self.parse(dedent("""\
1194 lease %(ip)s {
1195@@ -261,7 +261,7 @@
1196 def test_parse_leases_treats_missing_end_date_as_eternity(self):
1197 params = {
1198 'ip': factory.make_ipv4_address(),
1199- 'mac': factory.getRandomMACAddress(),
1200+ 'mac': factory.make_mac_address(),
1201 }
1202 leases = self.parse(dedent("""\
1203 lease %(ip)s {
1204@@ -273,8 +273,8 @@
1205 def test_parse_leases_takes_latest_lease_for_address(self):
1206 params = {
1207 'ip': factory.make_ipv4_address(),
1208- 'old_owner': factory.getRandomMACAddress(),
1209- 'new_owner': factory.getRandomMACAddress(),
1210+ 'old_owner': factory.make_mac_address(),
1211+ 'new_owner': factory.make_mac_address(),
1212 }
1213 leases = self.parse(dedent("""\
1214 lease %(ip)s {
1215@@ -289,7 +289,7 @@
1216 def test_parse_leases_recognizes_host_deleted_statement_as_rubout(self):
1217 params = {
1218 'ip': factory.make_ipv4_address(),
1219- 'mac': factory.getRandomMACAddress(),
1220+ 'mac': factory.make_mac_address(),
1221 }
1222 leases = self.parse(dedent("""\
1223 host %(ip)s {
1224@@ -304,7 +304,7 @@
1225 def test_host_declaration_is_like_an_unexpired_lease(self):
1226 params = {
1227 'ip': factory.make_ipv4_address(),
1228- 'mac': factory.getRandomMACAddress(),
1229+ 'mac': factory.make_mac_address(),
1230 }
1231 leases = self.parse(dedent("""\
1232 host %(ip)s {
1233@@ -320,8 +320,8 @@
1234 def test_expired_lease_does_not_shadow_earlier_host_stanza(self):
1235 params = {
1236 'ip': factory.make_ipv4_address(),
1237- 'mac1': factory.getRandomMACAddress(),
1238- 'mac2': factory.getRandomMACAddress(),
1239+ 'mac1': factory.make_mac_address(),
1240+ 'mac2': factory.make_mac_address(),
1241 }
1242 leases = leases_parser_fast.parse_leases(dedent("""\
1243 host %(ip)s {
1244@@ -342,8 +342,8 @@
1245 def test_active_lease_shadows_earlier_host_stanza(self):
1246 params = {
1247 'ip': factory.make_ipv4_address(),
1248- 'mac1': factory.getRandomMACAddress(),
1249- 'mac2': factory.getRandomMACAddress(),
1250+ 'mac1': factory.make_mac_address(),
1251+ 'mac2': factory.make_mac_address(),
1252 }
1253 leases = leases_parser_fast.parse_leases(dedent("""\
1254 host %(ip)s {
1255@@ -362,8 +362,8 @@
1256 def test_host_stanza_shadows_earlier_active_lease(self):
1257 params = {
1258 'ip': factory.make_ipv4_address(),
1259- 'mac1': factory.getRandomMACAddress(),
1260- 'mac2': factory.getRandomMACAddress(),
1261+ 'mac1': factory.make_mac_address(),
1262+ 'mac2': factory.make_mac_address(),
1263 }
1264 leases = leases_parser_fast.parse_leases(dedent("""\
1265 lease %(ip)s {
1266@@ -427,8 +427,8 @@
1267 def test_gather_leases_combines_expired_and_current_leases(self):
1268 earlier = '1 2001/01/01 00:00:00'
1269 ip = factory.make_ipv4_address()
1270- old_owner = factory.getRandomMACAddress()
1271- new_owner = factory.getRandomMACAddress()
1272+ old_owner = factory.make_mac_address()
1273+ new_owner = factory.make_mac_address()
1274 leases = [
1275 fake_parsed_lease(ip=ip, mac=old_owner, ends=earlier),
1276 fake_parsed_lease(ip=ip, mac=new_owner),
1277@@ -438,8 +438,8 @@
1278 def test_gather_leases_ignores_ordering(self):
1279 earlier = '1 2001/01/01 00:00:00'
1280 ip = factory.make_ipv4_address()
1281- old_owner = factory.getRandomMACAddress()
1282- new_owner = factory.getRandomMACAddress()
1283+ old_owner = factory.make_mac_address()
1284+ new_owner = factory.make_mac_address()
1285 leases = [
1286 fake_parsed_lease(ip=ip, mac=new_owner),
1287 fake_parsed_lease(ip=ip, mac=old_owner, ends=earlier),
1288@@ -466,7 +466,7 @@
1289
1290 def test_gather_hosts_follows_reassigned_host(self):
1291 ip = factory.make_ipv4_address()
1292- new_owner = factory.getRandomMACAddress()
1293+ new_owner = factory.make_mac_address()
1294 hosts = [
1295 fake_parsed_host(ip=ip),
1296 fake_parsed_rubout(ip=ip),
1297@@ -477,7 +477,7 @@
1298 def test_is_lease_and_is_host_recognize_lease(self):
1299 params = {
1300 'ip': factory.make_ipv4_address(),
1301- 'mac': factory.getRandomMACAddress(),
1302+ 'mac': factory.make_mac_address(),
1303 }
1304 [parsed_lease] = lease_parser.searchString(dedent("""\
1305 lease %(ip)s {
1306@@ -491,7 +491,7 @@
1307 def test_is_lease_and_is_host_recognize_host(self):
1308 params = {
1309 'ip': factory.make_ipv4_address(),
1310- 'mac': factory.getRandomMACAddress(),
1311+ 'mac': factory.make_mac_address(),
1312 }
1313 [parsed_host] = lease_parser.searchString(dedent("""\
1314 host %(ip)s {
1315@@ -505,7 +505,7 @@
1316 def test_get_host_mac_returns_None_for_host(self):
1317 params = {
1318 'ip': factory.make_ipv4_address(),
1319- 'mac': factory.getRandomMACAddress(),
1320+ 'mac': factory.make_mac_address(),
1321 }
1322 [parsed_host] = lease_parser.searchString(dedent("""\
1323 host %(ip)s {
1324@@ -526,7 +526,7 @@
1325 def test_get_host_mac_returns_None_for_rubout_even_with_mac(self):
1326 params = {
1327 'ip': factory.make_ipv4_address(),
1328- 'mac': factory.getRandomMACAddress(),
1329+ 'mac': factory.make_mac_address(),
1330 }
1331 [parsed_host] = lease_parser.searchString(dedent("""\
1332 host %(ip)s {
1333@@ -538,7 +538,7 @@
1334
1335 def test_combine_entries_accepts_host_followed_by_expired_lease(self):
1336 ip = factory.make_ipv4_address()
1337- mac = factory.getRandomMACAddress()
1338+ mac = factory.make_mac_address()
1339 earlier = '1 2001/01/01 00:00:00'
1340 entries = [
1341 fake_parsed_host(ip=ip, mac=mac),
1342@@ -548,7 +548,7 @@
1343
1344 def test_combine_entries_accepts_expired_lease_followed_by_host(self):
1345 ip = factory.make_ipv4_address()
1346- mac = factory.getRandomMACAddress()
1347+ mac = factory.make_mac_address()
1348 earlier = '1 2001/01/01 00:00:00'
1349 entries = [
1350 fake_parsed_lease(ip=ip, ends=earlier),
1351@@ -558,7 +558,7 @@
1352
1353 def test_combine_entries_accepts_rubout_followed_by_current_lease(self):
1354 ip = factory.make_ipv4_address()
1355- mac = factory.getRandomMACAddress()
1356+ mac = factory.make_mac_address()
1357 entries = [
1358 fake_parsed_host(ip=ip),
1359 fake_parsed_rubout(ip=ip),
1360@@ -568,7 +568,7 @@
1361
1362 def test_combine_entries_ignores_rubout_followed_by_expired_lease(self):
1363 ip = factory.make_ipv4_address()
1364- mac = factory.getRandomMACAddress()
1365+ mac = factory.make_mac_address()
1366 earlier = '1 2001/01/01 00:00:00'
1367 entries = [
1368 fake_parsed_host(ip=ip),
1369@@ -579,7 +579,7 @@
1370
1371 def test_combine_entries_ignores_expired_lease_followed_by_rubout(self):
1372 ip = factory.make_ipv4_address()
1373- mac = factory.getRandomMACAddress()
1374+ mac = factory.make_mac_address()
1375 earlier = '1 2001/01/01 00:00:00'
1376 entries = [
1377 fake_parsed_host(ip=ip),
1378@@ -590,7 +590,7 @@
1379
1380 def test_combine_entries_accepts_valid_lease_followed_by_rubout(self):
1381 ip = factory.make_ipv4_address()
1382- mac = factory.getRandomMACAddress()
1383+ mac = factory.make_mac_address()
1384 entries = [
1385 fake_parsed_host(ip=ip),
1386 fake_parsed_lease(ip=ip, mac=mac),
1387@@ -600,7 +600,7 @@
1388
1389 def test_combine_entries_accepts_reassigned_host(self):
1390 ip = factory.make_ipv4_address()
1391- mac = factory.getRandomMACAddress()
1392+ mac = factory.make_mac_address()
1393 entries = [
1394 fake_parsed_host(ip=ip),
1395 fake_parsed_rubout(ip=ip),
1396
1397=== modified file 'src/provisioningserver/dhcp/tests/test_omshell.py'
1398--- src/provisioningserver/dhcp/tests/test_omshell.py 2014-09-15 14:28:28 +0000
1399+++ src/provisioningserver/dhcp/tests/test_omshell.py 2014-09-18 12:49:34 +0000
1400@@ -56,7 +56,7 @@
1401 server_address = factory.make_string()
1402 shared_key = factory.make_string()
1403 ip_address = factory.make_ipv4_address()
1404- mac_address = factory.getRandomMACAddress()
1405+ mac_address = factory.make_mac_address()
1406 shell = Omshell(server_address, shared_key)
1407
1408 # Instead of calling a real omshell, we'll just record the
1409@@ -95,7 +95,7 @@
1410 server_address = factory.make_string()
1411 shared_key = factory.make_string()
1412 ip_address = factory.make_ipv4_address()
1413- mac_address = factory.getRandomMACAddress()
1414+ mac_address = factory.make_mac_address()
1415 shell = Omshell(server_address, shared_key)
1416
1417 # Fake a call that results in a failure with random output.
1418@@ -113,7 +113,7 @@
1419 # success.
1420 params = {
1421 'ip': factory.make_ipv4_address(),
1422- 'mac': factory.getRandomMACAddress(),
1423+ 'mac': factory.make_mac_address(),
1424 'hostname': factory.make_name('hostname')
1425 }
1426 shell = Omshell(factory.make_name('server'), factory.make_name('key'))
1427
1428=== modified file 'src/provisioningserver/drivers/hardware/tests/test_mscm.py'
1429--- src/provisioningserver/drivers/hardware/tests/test_mscm.py 2014-07-03 20:08:45 +0000
1430+++ src/provisioningserver/drivers/hardware/tests/test_mscm.py 2014-09-18 12:49:34 +0000
1431@@ -52,7 +52,7 @@
1432
1433 def make_show_node_macaddr(length=10):
1434 """Make a fake return value for get_node_macaddr."""
1435- return ''.join((factory.getRandomMACAddress() + ' ')
1436+ return ''.join((factory.make_mac_address() + ' ')
1437 for _ in xrange(length))
1438
1439
1440
1441=== modified file 'src/provisioningserver/drivers/hardware/tests/test_seamicro.py'
1442--- src/provisioningserver/drivers/hardware/tests/test_seamicro.py 2014-09-15 14:28:28 +0000
1443+++ src/provisioningserver/drivers/hardware/tests/test_seamicro.py 2014-09-18 12:49:34 +0000
1444@@ -66,7 +66,7 @@
1445 self.nic = {}
1446
1447 def add_fake_nic(self, id):
1448- self.nic[id] = {'macAddr': factory.getRandomMACAddress()}
1449+ self.nic[id] = {'macAddr': factory.make_mac_address()}
1450
1451 def get_fake_macs(self):
1452 return [nic['macAddr'] for nic in self.nic.values()]
1453@@ -313,22 +313,22 @@
1454 0: {
1455 'serverId': '0/0',
1456 'serverNIC': '0',
1457- 'serverMacAddr': factory.getRandomMACAddress(),
1458+ 'serverMacAddr': factory.make_mac_address(),
1459 },
1460 1: {
1461 'serverId': '1/0',
1462 'serverNIC': '0',
1463- 'serverMacAddr': factory.getRandomMACAddress(),
1464+ 'serverMacAddr': factory.make_mac_address(),
1465 },
1466 2: {
1467 'serverId': '2/0',
1468 'serverNIC': '0',
1469- 'serverMacAddr': factory.getRandomMACAddress(),
1470+ 'serverMacAddr': factory.make_mac_address(),
1471 },
1472 3: {
1473 'serverId': '3/1',
1474 'serverNIC': '1',
1475- 'serverMacAddr': factory.getRandomMACAddress(),
1476+ 'serverMacAddr': factory.make_mac_address(),
1477 },
1478 }
1479 self.patch(
1480
1481=== modified file 'src/provisioningserver/drivers/hardware/tests/test_virsh.py'
1482--- src/provisioningserver/drivers/hardware/tests/test_virsh.py 2014-09-14 10:56:55 +0000
1483+++ src/provisioningserver/drivers/hardware/tests/test_virsh.py 2014-09-18 12:49:34 +0000
1484@@ -169,7 +169,7 @@
1485 self.assertEqual(None, expected)
1486
1487 def test_mac_addresses_returns_list(self):
1488- macs = [factory.getRandomMACAddress() for _ in range(2)]
1489+ macs = [factory.make_mac_address() for _ in range(2)]
1490 output = SAMPLE_IFLIST % (macs[0], macs[1])
1491 conn = self.configure_virshssh(output)
1492 expected = conn.get_mac_addresses('')
1493@@ -220,7 +220,7 @@
1494 called_params = []
1495 fake_macs = []
1496 for machine in machines:
1497- macs = [factory.getRandomMACAddress() for _ in range(3)]
1498+ macs = [factory.make_mac_address() for _ in range(3)]
1499 fake_macs.append(macs)
1500 called_params.append({
1501 'power_address': poweraddr,
1502
1503=== modified file 'src/provisioningserver/power/tests/test_poweraction.py'
1504--- src/provisioningserver/power/tests/test_poweraction.py 2014-09-12 01:27:55 +0000
1505+++ src/provisioningserver/power/tests/test_poweraction.py 2014-09-18 12:49:34 +0000
1506@@ -167,7 +167,7 @@
1507 pa = PowerAction('ether_wake')
1508 self.assertRaises(
1509 PowerActionFail,
1510- pa.execute, power_change='off', mac=factory.getRandomMACAddress())
1511+ pa.execute, power_change='off', mac=factory.make_mac_address())
1512
1513 def test_fence_cdu_checks_state(self):
1514 # We can't test the fence_cdu template in detail (and it may be
1515@@ -309,7 +309,7 @@
1516 find_ip_via_arp.return_value = sentinel.ip_address_from_mac
1517
1518 power_action = self.make_stubbed_power_action()
1519- mac_address = factory.getRandomMACAddress()
1520+ mac_address = factory.make_mac_address()
1521 result = power_action.execute(mac_address=mac_address)
1522 self.assertEqual("done", result)
1523 self.assertThat(
1524
1525=== modified file 'src/provisioningserver/pserv_services/tests/test_lease_upload_service.py'
1526--- src/provisioningserver/pserv_services/tests/test_lease_upload_service.py 2014-09-13 11:38:50 +0000
1527+++ src/provisioningserver/pserv_services/tests/test_lease_upload_service.py 2014-09-18 12:49:34 +0000
1528@@ -54,13 +54,13 @@
1529
1530 def make_random_lease():
1531 ip = factory.make_ipv4_address()
1532- mac = factory.getRandomMACAddress()
1533+ mac = factory.make_mac_address()
1534 return {ip: mac}
1535
1536
1537 def make_random_mapping():
1538 ip = factory.make_ipv4_address()
1539- mac = factory.getRandomMACAddress()
1540+ mac = factory.make_mac_address()
1541 mapping = {"ip": ip, "mac": mac}
1542 return mapping
1543
1544
1545=== modified file 'src/provisioningserver/pserv_services/tests/test_tftp.py'
1546--- src/provisioningserver/pserv_services/tests/test_tftp.py 2014-09-13 11:38:50 +0000
1547+++ src/provisioningserver/pserv_services/tests/test_tftp.py 2014-09-18 12:49:34 +0000
1548@@ -116,7 +116,7 @@
1549 def test_get_generator_url(self):
1550 # get_generator_url() merges the parameters obtained from the request
1551 # file path (arch, subarch, name) into the configured generator URL.
1552- mac = factory.getRandomMACAddress("-")
1553+ mac = factory.make_mac_address("-")
1554 dummy = factory.make_name("dummy").encode("ascii")
1555 backend_url = b"http://example.com/?" + urlencode({b"dummy": dummy})
1556 backend = TFTPBackend(self.make_dir(), backend_url)
1557@@ -152,7 +152,7 @@
1558 cluster_uuid = factory.make_UUID()
1559 self.patch(tftp_module, 'get_cluster_uuid').return_value = (
1560 cluster_uuid)
1561- mac = factory.getRandomMACAddress("-")
1562+ mac = factory.make_mac_address("-")
1563 config_path = compose_config_path(mac)
1564 backend = TFTPBackend(self.make_dir(), b"http://example.com/")
1565 # python-tx-tftp sets up call context so that backends can discover
1566@@ -193,7 +193,7 @@
1567 # `PXEBootMethod.get_reader`.
1568 backend = TFTPBackend(self.make_dir(), b"http://example.com/")
1569 # Fake configuration parameters, as discovered from the file path.
1570- fake_params = {"mac": factory.getRandomMACAddress("-")}
1571+ fake_params = {"mac": factory.make_mac_address("-")}
1572 # Fake kernel configuration parameters, as returned from the API call.
1573 fake_kernel_params = make_kernel_parameters()
1574
1575
1576=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
1577--- src/provisioningserver/rpc/tests/test_clusterservice.py 2014-09-17 11:02:19 +0000
1578+++ src/provisioningserver/rpc/tests/test_clusterservice.py 2014-09-18 12:49:34 +0000
1579@@ -1056,7 +1056,7 @@
1580 create_host_maps = self.patch(clusterservice, "create_host_maps")
1581 mappings = [
1582 {"ip_address": factory.make_ipv4_address(),
1583- "mac_address": factory.getRandomMACAddress()}
1584+ "mac_address": factory.make_mac_address()}
1585 for _ in range(2)
1586 ]
1587 shared_key = factory.make_name("shared_key")
1588@@ -1198,7 +1198,7 @@
1589 clusterservice, 'find_ip_via_arp')
1590 find_ip_via_arp.return_value = factory.make_ipv4_address()
1591
1592- mac = factory.getRandomMACAddress()
1593+ mac = factory.make_mac_address()
1594 username = factory.make_name('user')
1595 password = factory.make_name('password')
1596 power_control = factory.make_name('power_control')
1597@@ -1219,7 +1219,7 @@
1598 clusterservice, 'find_ip_via_arp')
1599 find_ip_via_arp.return_value = None
1600
1601- mac = factory.getRandomMACAddress()
1602+ mac = factory.make_mac_address()
1603 username = factory.make_name('user')
1604 password = factory.make_name('password')
1605 power_control = factory.make_name('power_control')
1606@@ -1244,7 +1244,7 @@
1607 clusterservice, 'find_ip_via_arp')
1608 find_ip_via_arp.return_value = factory.make_ipv4_address()
1609
1610- mac = factory.getRandomMACAddress()
1611+ mac = factory.make_mac_address()
1612 username = factory.make_name('user')
1613 password = factory.make_name('password')
1614 power_control = factory.make_name('power_control')
1615
1616=== modified file 'src/provisioningserver/rpc/tests/test_dhcp.py'
1617--- src/provisioningserver/rpc/tests/test_dhcp.py 2014-09-15 14:28:28 +0000
1618+++ src/provisioningserver/rpc/tests/test_dhcp.py 2014-09-18 12:49:34 +0000
1619@@ -165,7 +165,7 @@
1620 omshell_create = self.patch(Omshell, "create")
1621 mappings = [
1622 {"ip_address": factory.make_ipv4_address(),
1623- "mac_address": factory.getRandomMACAddress()}
1624+ "mac_address": factory.make_mac_address()}
1625 for _ in range(5)
1626 ]
1627 dhcp.create_host_maps(mappings, sentinel.shared_key)
1628@@ -180,7 +180,7 @@
1629 omshell_create.side_effect = ExternalProcessError(
1630 returncode=2, cmd=("omshell",), output=error_message)
1631 ip_address = factory.make_ipv4_address()
1632- mac_address = factory.getRandomMACAddress()
1633+ mac_address = factory.make_mac_address()
1634 mappings = [{"ip_address": ip_address, "mac_address": mac_address}]
1635 with FakeLogger("maas.dhcp") as logger:
1636 error = self.assertRaises(
1637
1638=== modified file 'src/provisioningserver/utils/tests/test_network.py'
1639--- src/provisioningserver/utils/tests/test_network.py 2014-09-15 14:28:28 +0000
1640+++ src/provisioningserver/utils/tests/test_network.py 2014-09-18 12:49:34 +0000
1641@@ -90,7 +90,7 @@
1642 self.assertEqual("192.168.0.1", ip_address_observed)
1643
1644 def test__returns_consistent_output(self):
1645- mac = factory.getRandomMACAddress()
1646+ mac = factory.make_mac_address()
1647 ips = [
1648 '10.0.0.11',
1649 '10.0.0.99',
1650@@ -126,7 +126,7 @@
1651 if ip is None:
1652 ip = factory.make_ipv4_address()
1653 if mac is None:
1654- mac = factory.getRandomMACAddress()
1655+ mac = factory.make_mac_address()
1656 if dev is None:
1657 dev = factory.make_name('eth', sep='')
1658 return "%(ip)s dev %(dev)s lladdr %(mac)s\n" % {
1659@@ -181,7 +181,7 @@
1660 self.assertIsNone(find_mac_via_arp('10.1.1.100'))
1661
1662 def test__is_not_fooled_by_different_notations(self):
1663- mac = factory.getRandomMACAddress()
1664+ mac = factory.make_mac_address()
1665 self.patch_call(self.make_output_line('9::0:05', mac=mac))
1666 self.assertEqual(mac, find_mac_via_arp('09:0::5'))
1667
1668@@ -262,8 +262,8 @@
1669 patch_interfaces(self, {
1670 interface: {
1671 AF_LINK: [{
1672- 'addr': unicode(factory.getRandomMACAddress()),
1673- 'peer': unicode(factory.getRandomMACAddress()),
1674+ 'addr': unicode(factory.make_mac_address()),
1675+ 'peer': unicode(factory.make_mac_address()),
1676 }],
1677 },
1678 })
1679
1680=== modified file 'src/provisioningserver/utils/tests/test_utils.py'
1681--- src/provisioningserver/utils/tests/test_utils.py 2014-09-16 11:43:25 +0000
1682+++ src/provisioningserver/utils/tests/test_utils.py 2014-09-18 12:49:34 +0000
1683@@ -424,7 +424,7 @@
1684 {"system_id": factory.make_name("system-id")})
1685
1686 uuid = 'node-' + factory.make_UUID()
1687- macs = sorted(factory.getRandomMACAddress() for _ in range(3))
1688+ macs = sorted(factory.make_mac_address() for _ in range(3))
1689 arch = factory.make_name('architecture')
1690 power_type = factory.make_name('power_type')
1691 power_parameters = {
1692@@ -458,7 +458,7 @@
1693 get_cluster_uuid.return_value = 'cluster-' + factory.make_UUID()
1694
1695 uuid = 'node-' + factory.make_UUID()
1696- macs = sorted(factory.getRandomMACAddress() for _ in range(3))
1697+ macs = sorted(factory.make_mac_address() for _ in range(3))
1698 arch = factory.make_name('architecture')
1699 power_type = factory.make_name('power_type')
1700 power_parameters = {
1701@@ -495,7 +495,7 @@
1702 }
1703
1704 # Create a list of MACs with one random duplicate.
1705- macs = sorted(factory.getRandomMACAddress() for _ in range(3))
1706+ macs = sorted(factory.make_mac_address() for _ in range(3))
1707 macs_with_duplicate = macs + [choice(macs)]
1708
1709 yield create_node(
1710@@ -518,7 +518,7 @@
1711 get_cluster_uuid.return_value = 'cluster-' + factory.make_UUID()
1712
1713 uuid = 'node-' + factory.make_UUID()
1714- macs = sorted(factory.getRandomMACAddress() for _ in range(3))
1715+ macs = sorted(factory.make_mac_address() for _ in range(3))
1716 arch = factory.make_name('architecture')
1717 power_type = factory.make_name('power_type')
1718 power_parameters = {