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

[Jeroen T. Vermeulen]

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

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

Jeroen

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/api/tests/test_enlistment.py'
--- src/maasserver/api/tests/test_enlistment.py	2014-09-10 16:20:31 +0000
+++ src/maasserver/api/tests/test_enlistment.py	2014-09-18 12:49:34 +0000
@@ -80,7 +80,7 @@
                 'hostname': hostname,
                 'architecture': make_usable_architecture(self),
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             })
         parsed_result = json.loads(response.content)
 
@@ -108,7 +108,7 @@
                 'hostname': hostname,
                 'architecture': architecture,
                 'power_type': 'ether_wake',
-                'mac_addresses': factory.getRandomMACAddress(),
+                'mac_addresses': factory.make_mac_address(),
                 'power_parameters': json.dumps(power_parameters),
                 'power_type': power_type,
             })
@@ -206,7 +206,7 @@
                 'autodetect_nodegroup': '1',
                 'hostname': hostname,
                 'architecture': make_usable_architecture(self),
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             })
         self.assertEqual(
             NodeGroup.objects.ensure_master(),
@@ -221,7 +221,7 @@
                 'autodetect_nodegroup': '1',
                 'architecture': architecture,
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             })
         node = Node.objects.get(
             system_id=json.loads(response.content)['system_id'])
@@ -255,7 +255,7 @@
                 'op': 'new',
                 'architecture': architecture,
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             })
         self.assertEqual(httplib.BAD_REQUEST, response.status_code)
         self.assertIn('text/plain', response['Content-Type'])
@@ -369,7 +369,7 @@
                 'hostname': hostname_with_domain,
                 'architecture': make_usable_architecture(self),
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             })
         self.assertEqual(httplib.OK, response.status_code, response.content)
         parsed_result = json.loads(response.content)
@@ -392,7 +392,7 @@
                 'hostname': hostname_without_domain,
                 'architecture': make_usable_architecture(self),
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             })
         self.assertEqual(httplib.OK, response.status_code, response.content)
         parsed_result = json.loads(response.content)
@@ -415,7 +415,7 @@
                 'hostname': factory.make_name('hostname'),
                 'architecture': make_usable_architecture(self),
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             },
             REMOTE_ADDR=origin_ip)
         self.assertEqual(httplib.OK, response.status_code, response.content)
@@ -433,7 +433,7 @@
                 'hostname': factory.make_name('hostname'),
                 'architecture': make_usable_architecture(self),
                 'power_type': 'ether_wake',
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
             },
             HTTP_HOST=unknown_host)
         self.assertEqual(httplib.OK, response.status_code, response.content)
@@ -633,7 +633,7 @@
         # The api allows the setting of a Node's power_parameters field.
         # Create a power_parameter valid for the selected power_type.
         self.client_log_in(as_admin=True)
-        new_mac_address = factory.getRandomMACAddress()
+        new_mac_address = factory.make_mac_address()
         response = self.client.post(
             reverse('nodes_handler'), {
                 'op': 'new',
@@ -662,7 +662,7 @@
                 'architecture': make_usable_architecture(self),
                 'power_type': 'ether_wake',
                 'power_parameters_unknown_param': factory.make_string(),
-                'mac_addresses': [factory.getRandomMACAddress()],
+                'mac_addresses': [factory.make_mac_address()],
                 })
 
         self.assertEqual(
 
=== modified file 'src/maasserver/api/tests/test_node.py'
--- src/maasserver/api/tests/test_node.py	2014-09-17 09:36:21 +0000
+++ src/maasserver/api/tests/test_node.py	2014-09-18 12:49:34 +0000
@@ -622,7 +622,7 @@
             power_type='ether_wake',
             architecture=make_usable_architecture(self))
         # Create a power_parameter valid for the selected power_type.
-        new_power_address = factory.getRandomMACAddress()
+        new_power_address = factory.make_mac_address()
         response = self.client_put(
             self.get_node_uri(node),
             {'power_parameters_mac_address': new_power_address})
@@ -1040,7 +1040,7 @@
     def test_claim_sticky_ip_address_catches_bad_mac_address_parameter(self):
         self.become_admin()
         node = factory.make_node_with_mac_attached_to_nodegroupinterface()
-        random_mac = factory.getRandomMACAddress()
+        random_mac = factory.make_mac_address()
 
         response = self.client.post(
             self.get_node_uri(node),
 
=== modified file 'src/maasserver/api/tests/test_nodes.py'
--- src/maasserver/api/tests/test_nodes.py	2014-09-17 09:36:21 +0000
+++ src/maasserver/api/tests/test_nodes.py	2014-09-18 12:49:34 +0000
@@ -87,7 +87,7 @@
 class AnonymousIsRegisteredAPITest(MAASServerTestCase):
 
     def test_is_registered_returns_True_if_node_registered(self):
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         factory.make_MACAddress(mac_address)
         response = self.client.get(
             reverse('nodes_handler'),
@@ -97,7 +97,7 @@
             (response.status_code, response.content))
 
     def test_is_registered_returns_False_if_mac_registered_node_retired(self):
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         mac = factory.make_MACAddress(mac_address)
         mac.node.status = NODE_STATUS.RETIRED
         mac.node.save()
@@ -124,7 +124,7 @@
             (response.status_code, response.content))
 
     def test_is_registered_returns_False_if_node_not_registered(self):
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         response = self.client.get(
             reverse('nodes_handler'),
             {'op': 'is_registered', 'mac_address': mac_address})
 
=== modified file 'src/maasserver/api/tests/test_pxeconfig.py'
--- src/maasserver/api/tests/test_pxeconfig.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/api/tests/test_pxeconfig.py	2014-09-18 12:49:34 +0000
@@ -175,7 +175,7 @@
         self.assertEqual(httplib.OK, response.status_code)
 
     def test_pxeconfig_returns_no_content_for_unknown_node(self):
-        params = dict(mac=factory.getRandomMACAddress(delimiter='-'))
+        params = dict(mac=factory.make_mac_address(delimiter='-'))
         response = self.client.get(reverse('pxeconfig'), params)
         self.assertEqual(httplib.NO_CONTENT, response.status_code)
 
@@ -185,7 +185,7 @@
         nodegroup = factory.make_NodeGroup()
         params = dict(
             self.get_default_params(),
-            mac=factory.getRandomMACAddress(delimiter='-'),
+            mac=factory.make_mac_address(delimiter='-'),
             arch=arch,
             subarch=subarch,
             cluster_uuid=nodegroup.uuid)
@@ -203,7 +203,7 @@
         nodegroup = factory.make_NodeGroup()
         params = dict(
             self.get_default_params(),
-            mac=factory.getRandomMACAddress(delimiter='-'),
+            mac=factory.make_mac_address(delimiter='-'),
             arch=arch,
             subarch=subarch,
             cluster_uuid=nodegroup.uuid)
 
=== modified file 'src/maasserver/clusterrpc/tests/test_dhcp.py'
--- src/maasserver/clusterrpc/tests/test_dhcp.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/clusterrpc/tests/test_dhcp.py	2014-09-18 12:49:34 +0000
@@ -244,8 +244,8 @@
         # Calls will be made to add these.
         static_mappings = {
             nodegroup: {
-                get_random_static_ip(): factory.getRandomMACAddress(),
-                get_random_static_ip(): factory.getRandomMACAddress(),
+                get_random_static_ip(): factory.make_mac_address(),
+                get_random_static_ip(): factory.make_mac_address(),
             }
         }
 
@@ -491,7 +491,7 @@
         # in to gen_calls_to_create_host_maps().
         static_mappings = {
             nodegroup: {
-                factory.make_ipv4_address(): factory.getRandomMACAddress()
+                factory.make_ipv4_address(): factory.make_mac_address()
                 for _ in xrange(3)
             }
             for nodegroup in nodegroups
@@ -524,7 +524,7 @@
 
         static_mapping = {
             nodegroup: {
-                factory.make_ipv6_address(): factory.getRandomMACAddress()
+                factory.make_ipv6_address(): factory.make_mac_address()
             }
         }
 
 
=== modified file 'src/maasserver/models/tests/test_dhcplease.py'
--- src/maasserver/models/tests/test_dhcplease.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/models/tests/test_dhcplease.py	2014-09-18 12:49:34 +0000
@@ -43,7 +43,7 @@
     def test_init(self):
         nodegroup = factory.make_NodeGroup()
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
 
         lease = DHCPLease(nodegroup=nodegroup, ip=ip, mac=mac)
         lease.save()
@@ -101,7 +101,7 @@
         nodegroup = factory.make_NodeGroup()
         ip = factory.make_ipv4_address()
         factory.make_DHCPLease(nodegroup=nodegroup, ip=ip)
-        new_mac = factory.getRandomMACAddress()
+        new_mac = factory.make_mac_address()
         DHCPLease.objects.update_leases(nodegroup, {ip: new_mac})
         self.assertEqual({ip: new_mac}, map_leases(nodegroup))
 
@@ -114,7 +114,7 @@
 
     def test_update_leases_adds_new_ip_to_mac(self):
         nodegroup = factory.make_NodeGroup()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         ip1 = factory.make_ipv4_address()
         ip2 = factory.make_ipv4_address()
         factory.make_DHCPLease(nodegroup=nodegroup, mac=mac, ip=ip1)
@@ -123,7 +123,7 @@
 
     def test_update_leases_deletes_only_obsolete_ips(self):
         nodegroup = factory.make_NodeGroup()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         obsolete_ip = factory.make_ipv4_address()
         current_ip = factory.make_ipv4_address()
         factory.make_DHCPLease(nodegroup=nodegroup, mac=mac, ip=obsolete_ip)
@@ -141,8 +141,8 @@
 
     def test_update_leases_combines_additions_deletions_and_replacements(self):
         nodegroup = factory.make_NodeGroup()
-        mac1 = factory.getRandomMACAddress()
-        mac2 = factory.getRandomMACAddress()
+        mac1 = factory.make_mac_address()
+        mac2 = factory.make_mac_address()
         obsolete_lease = factory.make_DHCPLease(
             nodegroup=nodegroup, mac=mac1)
         # The obsolete lease won't be in the update, so it'll disappear.
 
=== modified file 'src/maasserver/models/tests/test_macaddress.py'
--- src/maasserver/models/tests/test_macaddress.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/models/tests/test_macaddress.py	2014-09-18 12:49:34 +0000
@@ -782,7 +782,7 @@
 
     def test_ignores_unknown_macs(self):
         cluster = factory.make_NodeGroup()
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         leases = {
             factory.make_ipv4_address(): mac_address
             }
@@ -801,7 +801,7 @@
             ip_range_low='', ip_range_high='', router_ip='',
             ip=factory.make_ipv4_address(),
             management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         leases = {
             factory.make_ipv4_address(): mac_address
             }
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-09-17 14:26:50 +0000
+++ src/maasserver/models/tests/test_node.py	2014-09-18 12:49:34 +0000
@@ -278,7 +278,7 @@
         self.assertEqual(token, node.token)
 
     def test_add_mac_address(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         node = factory.make_Node()
         node.add_mac_address(mac)
         macs = MACAddress.objects.filter(node=node, mac_address=mac).count()
@@ -290,7 +290,7 @@
         cluster = factory.make_NodeGroup()
         cluster_interface = factory.make_NodeGroupInterface(nodegroup=cluster)
         ip_in_range = cluster_interface.static_ip_range_low
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         factory.make_DHCPLease(
             mac=mac_address, ip=ip_in_range, nodegroup=cluster)
         node = factory.make_Node(nodegroup=cluster)
@@ -300,7 +300,7 @@
             cluster_interface, node.get_primary_mac().cluster_interface)
 
     def test_remove_mac_address(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         node = factory.make_Node()
         node.add_mac_address(mac)
         node.remove_mac_address(mac)
@@ -310,7 +310,7 @@
 
     def test_get_primary_mac_returns_mac_address(self):
         node = factory.make_Node()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         node.add_mac_address(mac)
         self.assertEqual(mac, node.get_primary_mac().mac_address)
 
@@ -320,7 +320,7 @@
 
     def test_get_primary_mac_returns_oldest_mac(self):
         node = factory.make_Node()
-        macs = [factory.getRandomMACAddress() for counter in range(3)]
+        macs = [factory.make_mac_address() for counter in range(3)]
         offset = timedelta(0)
         for mac in macs:
             mac_address = node.add_mac_address(mac)
@@ -478,14 +478,14 @@
 
     def test_get_effective_power_parameters_adds_mac_if_no_params_set(self):
         node = factory.make_Node()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         node.add_mac_address(mac)
         self.assertEqual(
             mac, node.get_effective_power_parameters()['mac_address'])
 
     def test_get_effective_power_parameters_adds_no_mac_if_params_set(self):
         node = factory.make_Node(power_parameters={'foo': 'bar'})
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         node.add_mac_address(mac)
         self.assertNotIn('mac', node.get_effective_power_parameters())
 
 
=== modified file 'src/maasserver/models/tests/test_nodegroup.py'
--- src/maasserver/models/tests/test_nodegroup.py	2014-09-17 20:36:17 +0000
+++ src/maasserver/models/tests/test_nodegroup.py	2014-09-18 12:49:34 +0000
@@ -505,7 +505,7 @@
         protocol = fixture.makeCluster(nodegroup, AddSeaMicro15k)
         protocol.AddSeaMicro15k.return_value = defer.succeed({})
 
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         username = factory.make_name('user')
         password = factory.make_name('password')
         power_control = factory.make_name('power_control')
@@ -523,7 +523,7 @@
         client = getClientFor.return_value
         nodegroup = factory.make_NodeGroup()
 
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         username = factory.make_name('user')
         password = factory.make_name('password')
         power_control = factory.make_name('power_control')
@@ -541,7 +541,7 @@
         getClientFor.side_effect = NoConnectionsAvailable()
         nodegroup = factory.make_NodeGroup()
 
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         username = factory.make_name('user')
         password = factory.make_name('password')
         power_control = factory.make_name('power_control')
 
=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
--- src/maasserver/rpc/tests/test_nodes.py	2014-09-10 14:31:57 +0000
+++ src/maasserver/rpc/tests/test_nodes.py	2014-09-18 12:49:34 +0000
@@ -52,7 +52,7 @@
         self.prepare_cluster_rpc(cluster)
 
         mac_addresses = [
-            factory.getRandomMACAddress() for _ in range(3)]
+            factory.make_mac_address() for _ in range(3)]
         architecture = make_usable_architecture(self)
         power_type = random.choice(self.power_types)['name']
         power_parameters = dumps({})
@@ -87,7 +87,7 @@
             ValidationError, create_node, cluster.uuid,
             architecture="spam/eggs", power_type="scrambled",
             power_parameters=dumps({}),
-            mac_addresses=[factory.getRandomMACAddress()])
+            mac_addresses=[factory.make_mac_address()])
 
     def test__raises_error_if_node_already_exists(self):
         cluster = factory.make_NodeGroup()
@@ -95,7 +95,7 @@
         self.prepare_cluster_rpc(cluster)
 
         mac_addresses = [
-            factory.getRandomMACAddress() for _ in range(3)]
+            factory.make_mac_address() for _ in range(3)]
         architecture = make_usable_architecture(self)
         power_type = random.choice(self.power_types)['name']
         power_parameters = dumps({})
 
=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2014-09-17 11:02:19 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2014-09-18 12:49:34 +0000
@@ -287,7 +287,7 @@
         nodegroup = yield deferToThread(self.make_node_group, uuid)
         mapping = {
             "ip": factory.make_ipv4_address(),
-            "mac": factory.getRandomMACAddress()
+            "mac": factory.make_mac_address()
         }
 
         response = yield call_responder(Region(), UpdateLeases, {
@@ -1655,7 +1655,7 @@
             'architecture': make_usable_architecture(self),
             'power_type': factory.make_name("power_type"),
             'power_parameters': dumps({}),
-            'mac_addresses': [factory.getRandomMACAddress()],
+            'mac_addresses': [factory.make_mac_address()],
         }
 
         response = yield call_responder(
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/testing/factory.py	2014-09-18 12:49:34 +0000
@@ -464,7 +464,7 @@
 
     def make_MAC(self):
         """Generate a random MAC address, in the form of a MAC object."""
-        return MAC(self.getRandomMACAddress())
+        return MAC(self.make_mac_address())
 
     def make_MACAddress(self, address=None, node=None, networks=None,
                         **kwargs):
@@ -472,7 +472,7 @@
         if node is None:
             node = self.make_Node()
         if address is None:
-            address = self.getRandomMACAddress()
+            address = self.make_mac_address()
         mac = MACAddress(mac_address=MAC(address), node=node, **kwargs)
         mac.save()
         if networks is not None:
@@ -522,7 +522,7 @@
         if ip is None:
             ip = self.make_ipv4_address()
         if mac is None:
-            mac = self.getRandomMACAddress()
+            mac = self.make_mac_address()
         lease = DHCPLease(nodegroup=nodegroup, ip=ip, mac=MAC(mac))
         lease.save()
         return lease
 
=== modified file 'src/maasserver/tests/test_fields.py'
--- src/maasserver/tests/test_fields.py	2014-09-10 16:20:31 +0000
+++ src/maasserver/tests/test_fields.py	2014-09-18 12:49:34 +0000
@@ -141,22 +141,22 @@
         self.assertIsNone(MAC(None).get_raw())
 
     def test_get_raw_returns_wrapped_address(self):
-        addr = factory.getRandomMACAddress()
+        addr = factory.make_mac_address()
         self.assertEqual(addr, MAC(addr).get_raw())
 
     def test_get_raw_punches_through_double_wrapping(self):
-        addr = factory.getRandomMACAddress()
+        addr = factory.make_mac_address()
         self.assertEqual(addr, MAC(MAC(addr)).get_raw())
 
     def test_getquoted_returns_NULL_for_None(self):
         self.assertEqual("NULL", MAC(None).getquoted())
 
     def test_getquoted_returns_SQL_for_MAC(self):
-        addr = factory.getRandomMACAddress()
+        addr = factory.make_mac_address()
         self.assertEqual("'%s'::macaddr" % addr, MAC(addr).getquoted())
 
     def test_getquoted_punches_through_double_wrapping(self):
-        addr = factory.getRandomMACAddress()
+        addr = factory.make_mac_address()
         self.assertEqual("'%s'::macaddr" % addr, MAC(MAC(addr)).getquoted())
 
     def test_mac_equals_self(self):
@@ -164,7 +164,7 @@
         self.assertTrue(mac == mac)
 
     def test_mac_equals_identical_mac(self):
-        addr = factory.getRandomMACAddress()
+        addr = factory.make_mac_address()
         self.assertTrue(MAC(addr) == MAC(addr))
 
     def test_eq_punches_through_double_wrapping_on_self(self):
@@ -215,7 +215,7 @@
         self.assertItemsEqual(set([mac1, mac2]), [mac1, mac2])
 
     def test_identical_macs_hash_identically(self):
-        addr = factory.getRandomMACAddress()
+        addr = factory.make_mac_address()
         self.assertItemsEqual(
             set([MAC(addr), MAC(addr), MAC(MAC(addr)), addr]),
             [addr])
 
=== modified file 'src/maasserver/tests/test_forms_macaddress.py'
--- src/maasserver/tests/test_forms_macaddress.py	2014-09-10 16:20:31 +0000
+++ src/maasserver/tests/test_forms_macaddress.py	2014-09-18 12:49:34 +0000
@@ -24,7 +24,7 @@
 
     def test_MACAddressForm_creates_mac_address(self):
         node = factory.make_Node()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         form = MACAddressForm(node=node, data={'mac_address': mac})
         form.save()
         self.assertTrue(
@@ -32,7 +32,7 @@
 
     def test_saves_to_db_by_default(self):
         node = factory.make_Node()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         form = MACAddressForm(node=node, data={'mac_address': mac})
         form.save()
         self.assertEqual(
@@ -40,13 +40,13 @@
 
     def test_does_not_save_to_db_if_commit_is_False(self):
         node = factory.make_Node()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         form = MACAddressForm(node=node, data={'mac_address': mac})
         form.save(commit=False)
         self.assertItemsEqual([], MACAddress.objects.filter(mac_address=mac))
 
     def test_MACAddressForm_displays_error_message_if_mac_already_used(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         node = factory.make_MACAddress(address=mac)
         node = factory.make_Node()
         form = MACAddressForm(node=node, data={'mac_address': mac})
 
=== modified file 'src/maasserver/tests/test_forms_nodewithmacaddresses.py'
--- src/maasserver/tests/test_forms_nodewithmacaddresses.py	2014-09-10 16:20:31 +0000
+++ src/maasserver/tests/test_forms_nodewithmacaddresses.py	2014-09-18 12:49:34 +0000
@@ -41,7 +41,7 @@
     def make_params(self, mac_addresses=None, architecture=None,
                     hostname=None, nodegroup=None):
         if mac_addresses is None:
-            mac_addresses = [factory.getRandomMACAddress()]
+            mac_addresses = [factory.make_mac_address()]
         if architecture is None:
             architecture = factory.make_name('arch')
         if hostname is None:
@@ -104,7 +104,7 @@
         # Empty values in the list of MAC addresses are simply ignored.
         form = NodeWithMACAddressesForm(
             data=self.make_params(
-                mac_addresses=[factory.getRandomMACAddress(), '']))
+                mac_addresses=[factory.make_mac_address(), '']))
 
         self.assertTrue(form.is_valid())
 
 
=== modified file 'src/maasserver/tests/test_node_constraint_filter_forms.py'
--- src/maasserver/tests/test_node_constraint_filter_forms.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/tests/test_node_constraint_filter_forms.py	2014-09-18 12:49:34 +0000
@@ -701,8 +701,8 @@
             'not_tags': [factory.make_Tag().name],
             'networks': [factory.make_Network().name],
             'not_networks': [factory.make_Network().name],
-            'connected_to': [factory.getRandomMACAddress()],
-            'not_connected_to': [factory.getRandomMACAddress()],
+            'connected_to': [factory.make_mac_address()],
+            'not_connected_to': [factory.make_mac_address()],
             'zone': factory.make_Zone(),
             'not_in_zone': [factory.make_Zone().name],
             }
 
=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-09-17 09:36:21 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-09-18 12:49:34 +0000
@@ -1725,7 +1725,7 @@
         # with a nice error message because the node could not be found.
         self.client_log_in()
         node_id = factory.make_string()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         mac_delete_link = reverse('mac-delete', args=[node_id, mac])
         response = self.client.get(mac_delete_link)
         self.assertEqual(httplib.NOT_FOUND, response.status_code)
@@ -1735,7 +1735,7 @@
         # to the node edit page.
         self.client_log_in()
         node = factory.make_Node(owner=self.logged_in_user)
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         mac_delete_link = reverse('mac-delete', args=[node.system_id, mac])
         response = self.client.get(mac_delete_link)
         self.assertEqual(
@@ -1809,7 +1809,7 @@
         self.client_log_in()
         node = factory.make_Node(owner=self.logged_in_user)
         mac_add_link = reverse('mac-add', args=[node.system_id])
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         response = self.client.post(mac_add_link, {'mac_address': mac})
         self.assertEqual(
             reverse('node-edit', args=[node.system_id]),
@@ -1821,7 +1821,7 @@
         self.client_log_in()
         node = factory.make_Node(owner=self.logged_in_user)
         mac_add_link = reverse('mac-add', args=[node.system_id])
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         response = self.client.post(mac_add_link, {'mac_address': mac})
         redirect = extract_redirect(response)
         response = self.client.get(redirect)
 
=== modified file 'src/maastesting/factory.py'
--- src/maastesting/factory.py	2014-09-18 11:18:24 +0000
+++ src/maastesting/factory.py	2014-09-18 12:49:34 +0000
@@ -278,7 +278,7 @@
         # guards against shortfalls as random IP addresses collide.
         leases = {}
         while len(leases) < num_leases:
-            leases[self.make_ipv4_address()] = self.getRandomMACAddress()
+            leases[self.make_ipv4_address()] = self.make_mac_address()
         return leases
 
     def make_date(self, year=2011):
 
=== modified file 'src/metadataserver/deployment/tests/test_maas_configure_interfaces.py'
--- src/metadataserver/deployment/tests/test_maas_configure_interfaces.py	2014-09-18 09:28:09 +0000
+++ src/metadataserver/deployment/tests/test_maas_configure_interfaces.py	2014-09-18 12:49:34 +0000
@@ -61,7 +61,7 @@
         config_dir = factory.make_name('etc-network')
         ip = factory.make_ipv6_address()
         gateway = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         args = parser.parse_args([
             '--config-dir=%s' % config_dir,
             '--update-interfaces',
@@ -86,7 +86,7 @@
     def test__parses_multiple_ip_mac_pairs(self):
         parser = script.prepare_parser()
         pairs = [
-            (factory.make_ipv6_address(), factory.getRandomMACAddress())
+            (factory.make_ipv6_address(), factory.make_mac_address())
             for _ in range(randint(2, 4))
             ]
         args = ['--static-ip=%s=%s' % pair for pair in pairs]
@@ -94,7 +94,7 @@
 
     def test__checks_for_obviously_malformed_ip_mac_pairs(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         parser = script.prepare_parser()
         self.assertRaises(
             script.BadArgument,
@@ -103,7 +103,7 @@
 
 def make_denormalised_mac():
     """Create a MAC address that is not in its normalised form."""
-    mac = factory.getRandomMACAddress()
+    mac = factory.make_mac_address()
     if mac.upper() == mac.lower():
         # This is not denormalised.  Inject an upper-case letter to ensure
         # that we get something denormalised.
@@ -115,7 +115,7 @@
 
     def test__splits_ip_mac_pairs(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.assertEqual(
             (ip, mac),
             script.split_ip_mac_pair('%s=%s' % (ip, mac)))
@@ -132,19 +132,19 @@
 class TestNormaliseMAC(MAASTestCase):
 
     def test__normalises(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.assertEqual(
             script.normalise_mac(mac.lower()),
             script.normalise_mac(mac.upper()))
 
     def test__is_idempotent(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.assertEqual(
             script.normalise_mac(mac),
             script.normalise_mac(script.normalise_mac(mac)))
 
     def test__strips_whitespace(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.assertEqual(mac, script.normalise_mac(' %s\n' % mac))
 
 
@@ -225,7 +225,7 @@
 
     def test__combines_mappings(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         interface = factory.make_name('eth')
         self.assertEqual(
             {interface: [ip]},
@@ -235,14 +235,14 @@
 
     def test__ignores_unknown_macs(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.assertEqual(
             {},
             script.map_addresses_by_interface({}, [(ip, mac)]))
 
     def test__ignores_unknown_interfaces(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.assertEqual(
             {},
             script.map_addresses_by_interface({mac: []}, [(ip, mac)]))
@@ -250,7 +250,7 @@
     def test__combines_addresses_per_interface(self):
         ip1 = factory.make_ipv6_address()
         ip2 = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         interface = factory.make_name('eth')
         mapping = script.map_addresses_by_interface(
             {mac: [interface]},
@@ -298,7 +298,7 @@
 
     def test__returns_config_file_text(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         interface = factory.make_name('eth')
         self.assertIn(
             script.compose_config_stanza(interface, [ip], []),
@@ -388,7 +388,7 @@
     def test__writes_network_config(self):
         write_file = self.patch_write_file()
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         interface = factory.make_name('eth')
         config_dir = self.make_config_dir()
 
@@ -404,7 +404,7 @@
 
     def test__returns_interfaces_with_addresses(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         interface = factory.make_name('eth')
         config_dir = self.make_config_dir()
         self.patch_write_file()
@@ -416,7 +416,7 @@
 
     def test__ignores_interfaces_without_addresses(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         config_dir = self.make_config_dir()
         self.patch_write_file()
         self.assertEqual(
@@ -468,7 +468,7 @@
 
     def test__generates_udev_rule(self):
         interface = factory.make_name('eth')
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         expected_rule = (
             'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", '
             'ATTR{address}=="%(mac)s", NAME="%(interface)s"'
@@ -485,7 +485,7 @@
 
     def test__writes_udev_file(self):
         interface = factory.make_name('eth')
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         write_file = self.patch_write_file()
         script.name_interfaces({mac: [interface]})
         self.assertThat(
@@ -495,7 +495,7 @@
 
     def test__writes_udev_rules(self):
         interface = factory.make_name('eth')
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         write_file = self.patch_write_file()
         script.name_interfaces({mac: [interface]})
         [call] = write_file.mock_calls
@@ -513,7 +513,7 @@
         lo_interface = 'lo'
         lo_mac = '00:00:00:00:00:00'
         proper_interface = factory.make_name('eth')
-        proper_mac = factory.getRandomMACAddress()
+        proper_mac = factory.make_mac_address()
         generate_udev_rule = self.patch_autospec(script, 'generate_udev_rule')
         generate_udev_rule.return_value = "(udev rule)"
         script.name_interfaces(
@@ -527,7 +527,7 @@
 
     def test__skips_if_udev_rules_d_does_not_exist(self):
         interface = factory.make_name('eth')
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         write_file = self.patch_write_file()
         write_file.side_effect = IOError(
             ENOENT, "Deliberate error: No such file or directory.")
@@ -537,7 +537,7 @@
 
     def test__propagates_similar_but_different_errors_writing_file(self):
         interface = factory.make_name('eth')
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         write_file = self.patch_write_file()
         write_file.side_effect = IOError(
             EACCES, "Deliberate error: Permission denied.")
 
=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2014-09-17 09:36:37 +0000
+++ src/metadataserver/tests/test_api.py	2014-09-18 12:49:34 +0000
@@ -124,11 +124,11 @@
     def test_get_node_for_mac_refuses_if_anonymous_access_disabled(self):
         self.patch(settings, 'ALLOW_UNSAFE_METADATA_ACCESS', False)
         self.assertRaises(
-            PermissionDenied, get_node_for_mac, factory.getRandomMACAddress())
+            PermissionDenied, get_node_for_mac, factory.make_mac_address())
 
     def test_get_node_for_mac_raises_404_for_unknown_mac(self):
         self.assertRaises(
-            MAASAPINotFound, get_node_for_mac, factory.getRandomMACAddress())
+            MAASAPINotFound, get_node_for_mac, factory.make_mac_address())
 
     def test_get_node_for_mac_finds_node_by_mac(self):
         mac = factory.make_MACAddress()
 
=== modified file 'src/provisioningserver/boot/tests/test_powernv.py'
--- src/provisioningserver/boot/tests/test_powernv.py	2014-08-27 03:38:28 +0000
+++ src/provisioningserver/boot/tests/test_powernv.py	2014-09-18 12:49:34 +0000
@@ -68,7 +68,7 @@
     The path is intended to match `re_config_file`, and the components are
     the expected groups from a match.
     """
-    components = {"mac": factory.getRandomMACAddress("-")}
+    components = {"mac": factory.make_mac_address("-")}
     config_path = compose_config_path(components["mac"])
     return config_path, components
 
@@ -136,7 +136,7 @@
 
     def test_match_path_pxe_config_without_mac(self):
         method = PowerNVBootMethod()
-        fake_mac = factory.getRandomMACAddress()
+        fake_mac = factory.make_mac_address()
         self.patch(powernv_module, 'get_remote_mac').return_value = fake_mac
         config_path = 'ppc64el/pxelinux.cfg/default'
         params = method.match_path(None, config_path)
@@ -148,7 +148,7 @@
 
     def test_match_path_pxe_prefix_request(self):
         method = PowerNVBootMethod()
-        fake_mac = factory.getRandomMACAddress()
+        fake_mac = factory.make_mac_address()
         self.patch(powernv_module, 'get_remote_mac').return_value = fake_mac
         file_path = 'ppc64el/file'
         params = method.match_path(None, file_path)
@@ -223,7 +223,7 @@
 
     def test_get_reader_appends_bootif(self):
         method = PowerNVBootMethod()
-        fake_mac = factory.getRandomMACAddress()
+        fake_mac = factory.make_mac_address()
         params = make_kernel_parameters(self, purpose="install")
         output = method.get_reader(
             backend=None, kernel_params=params, arch='ppc64el', mac=fake_mac)
@@ -233,13 +233,13 @@
         self.assertIn(expected, config['execute']['APPEND'])
 
     def test_format_bootif_replaces_colon(self):
-        fake_mac = factory.getRandomMACAddress()
+        fake_mac = factory.make_mac_address()
         self.assertEqual(
             '01-%s' % fake_mac.replace(':', '-').lower(),
             format_bootif(fake_mac))
 
     def test_format_bootif_makes_mac_address_lower(self):
-        fake_mac = factory.getRandomMACAddress()
+        fake_mac = factory.make_mac_address()
         fake_mac = fake_mac.upper()
         self.assertEqual(
             '01-%s' % fake_mac.replace(':', '-').lower(),
 
=== modified file 'src/provisioningserver/boot/tests/test_pxe.py'
--- src/provisioningserver/boot/tests/test_pxe.py	2014-06-24 12:44:35 +0000
+++ src/provisioningserver/boot/tests/test_pxe.py	2014-09-18 12:49:34 +0000
@@ -374,7 +374,7 @@
         The path is intended to match `re_config_file`, and the components are
         the expected groups from a match.
         """
-        components = {"mac": factory.getRandomMACAddress("-"),
+        components = {"mac": factory.make_mac_address("-"),
                       "arch": None,
                       "subarch": None}
         config_path = compose_config_path(components["mac"])
 
=== modified file 'src/provisioningserver/boot/tests/test_uefi.py'
--- src/provisioningserver/boot/tests/test_uefi.py	2014-09-04 21:28:56 +0000
+++ src/provisioningserver/boot/tests/test_uefi.py	2014-09-18 12:49:34 +0000
@@ -163,7 +163,7 @@
         The path is intended to match `re_config_file`, and
         the components are the expected groups from a match.
         """
-        components = {"mac": factory.getRandomMACAddress(":"),
+        components = {"mac": factory.make_mac_address(":"),
                       "arch": None,
                       "subarch": None}
         config_path = compose_config_path(components["mac"])
 
=== modified file 'src/provisioningserver/boot/tests/test_windows.py'
--- src/provisioningserver/boot/tests/test_windows.py	2014-09-13 11:38:50 +0000
+++ src/provisioningserver/boot/tests/test_windows.py	2014-09-18 12:49:34 +0000
@@ -176,7 +176,7 @@
     @inlineCallbacks
     def test_get_node_info(self):
         method = WindowsPXEBootMethod()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_purpose = factory.make_name('install')
         mock_release = factory.make_name('release')
         self.patch(windows_module, 'get_remote_mac').return_value = mock_mac
@@ -214,7 +214,7 @@
     def test_match_path_pxelinux(self):
         method = WindowsPXEBootMethod()
         method.remote_path = factory.make_string()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_get_node_info = self.patch(method, 'get_node_info')
         mock_get_node_info.return_value = {
             'purpose': 'install',
@@ -230,7 +230,7 @@
     def test_match_path_pxelinux_only_on_install(self):
         method = WindowsPXEBootMethod()
         method.remote_path = factory.make_string()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_get_node_info = self.patch(method, 'get_node_info')
         mock_get_node_info.return_value = {
             'purpose': factory.make_string(),
@@ -245,7 +245,7 @@
     def test_match_path_pxelinux_missing_hivex(self):
         method = WindowsPXEBootMethod()
         method.remote_path = factory.make_string()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_get_node_info = self.patch(method, 'get_node_info')
         mock_get_node_info.return_value = {
             'purpose': factory.make_string(),
@@ -261,7 +261,7 @@
     def test_match_path_pxelinux_only_on_windows(self):
         method = WindowsPXEBootMethod()
         method.remote_path = factory.make_string()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_get_node_info = self.patch(method, 'get_node_info')
         mock_get_node_info.return_value = {
             'purpose': 'install',
@@ -285,7 +285,7 @@
     @inlineCallbacks
     def test_match_path_static_file(self):
         method = WindowsPXEBootMethod()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_get_node_info = self.patch(windows_module, 'get_remote_mac')
         mock_get_node_info.return_value = mock_mac
 
@@ -296,7 +296,7 @@
     @inlineCallbacks
     def test_match_path_static_file_clean_path(self):
         method = WindowsPXEBootMethod()
-        mock_mac = factory.getRandomMACAddress()
+        mock_mac = factory.make_mac_address()
         mock_get_node_info = self.patch(windows_module, 'get_remote_mac')
         mock_get_node_info.return_value = mock_mac
 
 
=== modified file 'src/provisioningserver/dhcp/tests/test_detect.py'
--- src/provisioningserver/dhcp/tests/test_detect.py	2014-09-13 11:38:50 +0000
+++ src/provisioningserver/dhcp/tests/test_detect.py	2014-09-18 12:49:34 +0000
@@ -73,19 +73,19 @@
         self.patch(detect_module, 'make_transaction_ID').return_value = (
             transaction_id)
 
-        discover = DHCPDiscoverPacket(factory.getRandomMACAddress())
+        discover = DHCPDiscoverPacket(factory.make_mac_address())
 
         self.assertEqual(transaction_id, discover.transaction_ID)
 
     def test_init_sets_packed_mac(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         discover = DHCPDiscoverPacket(mac)
         self.assertEqual(
             discover.string_mac_to_packed(mac),
             discover.packed_mac)
 
     def test_init_sets_packet(self):
-        discover = DHCPDiscoverPacket(factory.getRandomMACAddress())
+        discover = DHCPDiscoverPacket(factory.make_mac_address())
         self.assertIsNotNone(discover.packet)
 
     def test_string_mac_to_packed(self):
@@ -95,7 +95,7 @@
         self.assertEqual(expected, discover.string_mac_to_packed(input))
 
     def test__build(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         discover = DHCPDiscoverPacket(mac)
         discover._build()
 
@@ -179,7 +179,7 @@
 
     def patch_interface_MAC(self):
         """Patch `get_interface_MAC` to return a fixed value."""
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.patch(detect_module, 'get_interface_MAC').return_value = mac
         return mac
 
 
=== modified file 'src/provisioningserver/dhcp/tests/test_leases.py'
--- src/provisioningserver/dhcp/tests/test_leases.py	2014-09-15 14:28:28 +0000
+++ src/provisioningserver/dhcp/tests/test_leases.py	2014-09-18 12:49:34 +0000
@@ -135,10 +135,10 @@
 
     def test_check_lease_changes_returns_tuple_if_lease_changed(self):
         ip = factory.make_ipv4_address()
-        leases = {ip: factory.getRandomMACAddress()}
+        leases = {ip: factory.make_mac_address()}
         self.set_lease_state(
             datetime.utcnow() - timedelta(seconds=10), leases.copy())
-        leases[ip] = factory.getRandomMACAddress()
+        leases[ip] = factory.make_mac_address()
         leases_file = self.fake_leases_file(leases)
         self.assertEqual(
             (get_write_time(leases_file), leases),
@@ -171,7 +171,7 @@
         leases = factory.make_random_leases()
         self.set_lease_state(
             datetime.utcnow() - timedelta(seconds=10), leases.copy())
-        leases[factory.make_ipv4_address()] = factory.getRandomMACAddress()
+        leases[factory.make_ipv4_address()] = factory.make_mac_address()
         leases_file = self.fake_leases_file(leases)
         self.assertEqual(
             (get_write_time(leases_file), leases),
@@ -205,7 +205,7 @@
     def test_parse_leases_file_parses_leases(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases_file = self.write_leases_file("""\
             lease %(ip)s {
 
=== modified file 'src/provisioningserver/dhcp/tests/test_leases_parser.py'
--- src/provisioningserver/dhcp/tests/test_leases_parser.py	2014-09-13 11:38:50 +0000
+++ src/provisioningserver/dhcp/tests/test_leases_parser.py	2014-09-18 12:49:34 +0000
@@ -44,7 +44,7 @@
     if ip is None:
         ip = factory.make_ipv4_address()
     if mac is None:
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
     Hardware = namedtuple('Hardware', ['mac'])
     Lease = namedtuple(
         'Lease', ['lease_or_host', 'ip', 'hardware', 'ends'])
@@ -113,7 +113,7 @@
         The host entry will be in IPv4 or IPv6 depending on `ip`.
         """
         if mac is None:
-            mac = factory.getRandomMACAddress()
+            mac = factory.make_mac_address()
         params = {
             'ip': unicode(ip),
             'mac': mac,
@@ -139,25 +139,25 @@
 
     def test_parse_leases_parses_IPv4_lease(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         leases = self.parse(self.make_lease_entry(ip, mac))
         self.assertEqual({ip: mac}, leases)
 
     def test_parse_leases_parses_IPv6_lease(self):
         ip = unicode(factory.make_ipv6_address())
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         leases = self.parse(self.make_lease_entry(ip, mac))
         self.assertEqual({ip: mac}, leases)
 
     def test_parse_leases_parses_IPv4_host(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         leases = self.parse(self.make_lease_entry(ip, mac))
         self.assertEqual({ip: mac}, leases)
 
     def test_parse_leases_parses_IPv6_host(self):
         ip = factory.make_ipv6_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         leases = self.parse(self.make_lease_entry(ip, mac))
         self.assertEqual({unicode(ip): mac}, leases)
 
@@ -169,9 +169,9 @@
     def test_parse_leases_copes_with_misleading_values(self):
         params = {
             'ip1': factory.make_ipv4_address(),
-            'mac1': factory.getRandomMACAddress(),
+            'mac1': factory.make_mac_address(),
             'ip2': factory.make_ipv4_address(),
-            'mac2': factory.getRandomMACAddress(),
+            'mac2': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             host %(ip1)s {
@@ -205,7 +205,7 @@
     def test_parse_leases_ignores_incomplete_lease_at_end(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
             'incomplete_ip': factory.make_ipv4_address(),
         }
         leases = self.parse(dedent("""\
@@ -220,7 +220,7 @@
     def test_parse_leases_ignores_comments(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             # Top comment (ignored).
@@ -235,7 +235,7 @@
     def test_parse_leases_ignores_expired_leases(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             lease %(ip)s {
@@ -248,7 +248,7 @@
     def test_parse_leases_treats_never_as_eternity(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             lease %(ip)s {
@@ -261,7 +261,7 @@
     def test_parse_leases_treats_missing_end_date_as_eternity(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             lease %(ip)s {
@@ -273,8 +273,8 @@
     def test_parse_leases_takes_latest_lease_for_address(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'old_owner': factory.getRandomMACAddress(),
-            'new_owner': factory.getRandomMACAddress(),
+            'old_owner': factory.make_mac_address(),
+            'new_owner': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             lease %(ip)s {
@@ -289,7 +289,7 @@
     def test_parse_leases_recognizes_host_deleted_statement_as_rubout(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             host %(ip)s {
@@ -304,7 +304,7 @@
     def test_host_declaration_is_like_an_unexpired_lease(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         leases = self.parse(dedent("""\
             host %(ip)s {
@@ -320,8 +320,8 @@
     def test_expired_lease_does_not_shadow_earlier_host_stanza(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac1': factory.getRandomMACAddress(),
-            'mac2': factory.getRandomMACAddress(),
+            'mac1': factory.make_mac_address(),
+            'mac2': factory.make_mac_address(),
         }
         leases = leases_parser_fast.parse_leases(dedent("""\
             host %(ip)s {
@@ -342,8 +342,8 @@
     def test_active_lease_shadows_earlier_host_stanza(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac1': factory.getRandomMACAddress(),
-            'mac2': factory.getRandomMACAddress(),
+            'mac1': factory.make_mac_address(),
+            'mac2': factory.make_mac_address(),
         }
         leases = leases_parser_fast.parse_leases(dedent("""\
             host %(ip)s {
@@ -362,8 +362,8 @@
     def test_host_stanza_shadows_earlier_active_lease(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac1': factory.getRandomMACAddress(),
-            'mac2': factory.getRandomMACAddress(),
+            'mac1': factory.make_mac_address(),
+            'mac2': factory.make_mac_address(),
         }
         leases = leases_parser_fast.parse_leases(dedent("""\
             lease %(ip)s {
@@ -427,8 +427,8 @@
     def test_gather_leases_combines_expired_and_current_leases(self):
         earlier = '1 2001/01/01 00:00:00'
         ip = factory.make_ipv4_address()
-        old_owner = factory.getRandomMACAddress()
-        new_owner = factory.getRandomMACAddress()
+        old_owner = factory.make_mac_address()
+        new_owner = factory.make_mac_address()
         leases = [
             fake_parsed_lease(ip=ip, mac=old_owner, ends=earlier),
             fake_parsed_lease(ip=ip, mac=new_owner),
@@ -438,8 +438,8 @@
     def test_gather_leases_ignores_ordering(self):
         earlier = '1 2001/01/01 00:00:00'
         ip = factory.make_ipv4_address()
-        old_owner = factory.getRandomMACAddress()
-        new_owner = factory.getRandomMACAddress()
+        old_owner = factory.make_mac_address()
+        new_owner = factory.make_mac_address()
         leases = [
             fake_parsed_lease(ip=ip, mac=new_owner),
             fake_parsed_lease(ip=ip, mac=old_owner, ends=earlier),
@@ -466,7 +466,7 @@
 
     def test_gather_hosts_follows_reassigned_host(self):
         ip = factory.make_ipv4_address()
-        new_owner = factory.getRandomMACAddress()
+        new_owner = factory.make_mac_address()
         hosts = [
             fake_parsed_host(ip=ip),
             fake_parsed_rubout(ip=ip),
@@ -477,7 +477,7 @@
     def test_is_lease_and_is_host_recognize_lease(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         [parsed_lease] = lease_parser.searchString(dedent("""\
             lease %(ip)s {
@@ -491,7 +491,7 @@
     def test_is_lease_and_is_host_recognize_host(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         [parsed_host] = lease_parser.searchString(dedent("""\
             host %(ip)s {
@@ -505,7 +505,7 @@
     def test_get_host_mac_returns_None_for_host(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         [parsed_host] = lease_parser.searchString(dedent("""\
             host %(ip)s {
@@ -526,7 +526,7 @@
     def test_get_host_mac_returns_None_for_rubout_even_with_mac(self):
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
         }
         [parsed_host] = lease_parser.searchString(dedent("""\
             host %(ip)s {
@@ -538,7 +538,7 @@
 
     def test_combine_entries_accepts_host_followed_by_expired_lease(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         earlier = '1 2001/01/01 00:00:00'
         entries = [
             fake_parsed_host(ip=ip, mac=mac),
@@ -548,7 +548,7 @@
 
     def test_combine_entries_accepts_expired_lease_followed_by_host(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         earlier = '1 2001/01/01 00:00:00'
         entries = [
             fake_parsed_lease(ip=ip, ends=earlier),
@@ -558,7 +558,7 @@
 
     def test_combine_entries_accepts_rubout_followed_by_current_lease(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         entries = [
             fake_parsed_host(ip=ip),
             fake_parsed_rubout(ip=ip),
@@ -568,7 +568,7 @@
 
     def test_combine_entries_ignores_rubout_followed_by_expired_lease(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         earlier = '1 2001/01/01 00:00:00'
         entries = [
             fake_parsed_host(ip=ip),
@@ -579,7 +579,7 @@
 
     def test_combine_entries_ignores_expired_lease_followed_by_rubout(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         earlier = '1 2001/01/01 00:00:00'
         entries = [
             fake_parsed_host(ip=ip),
@@ -590,7 +590,7 @@
 
     def test_combine_entries_accepts_valid_lease_followed_by_rubout(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         entries = [
             fake_parsed_host(ip=ip),
             fake_parsed_lease(ip=ip, mac=mac),
@@ -600,7 +600,7 @@
 
     def test_combine_entries_accepts_reassigned_host(self):
         ip = factory.make_ipv4_address()
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         entries = [
             fake_parsed_host(ip=ip),
             fake_parsed_rubout(ip=ip),
 
=== modified file 'src/provisioningserver/dhcp/tests/test_omshell.py'
--- src/provisioningserver/dhcp/tests/test_omshell.py	2014-09-15 14:28:28 +0000
+++ src/provisioningserver/dhcp/tests/test_omshell.py	2014-09-18 12:49:34 +0000
@@ -56,7 +56,7 @@
         server_address = factory.make_string()
         shared_key = factory.make_string()
         ip_address = factory.make_ipv4_address()
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         shell = Omshell(server_address, shared_key)
 
         # Instead of calling a real omshell, we'll just record the
@@ -95,7 +95,7 @@
         server_address = factory.make_string()
         shared_key = factory.make_string()
         ip_address = factory.make_ipv4_address()
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         shell = Omshell(server_address, shared_key)
 
         # Fake a call that results in a failure with random output.
@@ -113,7 +113,7 @@
         # success.
         params = {
             'ip': factory.make_ipv4_address(),
-            'mac': factory.getRandomMACAddress(),
+            'mac': factory.make_mac_address(),
             'hostname': factory.make_name('hostname')
         }
         shell = Omshell(factory.make_name('server'), factory.make_name('key'))
 
=== modified file 'src/provisioningserver/drivers/hardware/tests/test_mscm.py'
--- src/provisioningserver/drivers/hardware/tests/test_mscm.py	2014-07-03 20:08:45 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_mscm.py	2014-09-18 12:49:34 +0000
@@ -52,7 +52,7 @@
 
 def make_show_node_macaddr(length=10):
     """Make a fake return value for get_node_macaddr."""
-    return ''.join((factory.getRandomMACAddress() + ' ')
+    return ''.join((factory.make_mac_address() + ' ')
                    for _ in xrange(length))
 
 
 
=== modified file 'src/provisioningserver/drivers/hardware/tests/test_seamicro.py'
--- src/provisioningserver/drivers/hardware/tests/test_seamicro.py	2014-09-15 14:28:28 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_seamicro.py	2014-09-18 12:49:34 +0000
@@ -66,7 +66,7 @@
         self.nic = {}
 
     def add_fake_nic(self, id):
-        self.nic[id] = {'macAddr': factory.getRandomMACAddress()}
+        self.nic[id] = {'macAddr': factory.make_mac_address()}
 
     def get_fake_macs(self):
         return [nic['macAddr'] for nic in self.nic.values()]
@@ -313,22 +313,22 @@
             0: {
                 'serverId': '0/0',
                 'serverNIC': '0',
-                'serverMacAddr': factory.getRandomMACAddress(),
+                'serverMacAddr': factory.make_mac_address(),
                 },
             1: {
                 'serverId': '1/0',
                 'serverNIC': '0',
-                'serverMacAddr': factory.getRandomMACAddress(),
+                'serverMacAddr': factory.make_mac_address(),
                 },
             2: {
                 'serverId': '2/0',
                 'serverNIC': '0',
-                'serverMacAddr': factory.getRandomMACAddress(),
+                'serverMacAddr': factory.make_mac_address(),
                 },
             3: {
                 'serverId': '3/1',
                 'serverNIC': '1',
-                'serverMacAddr': factory.getRandomMACAddress(),
+                'serverMacAddr': factory.make_mac_address(),
                 },
             }
         self.patch(
 
=== modified file 'src/provisioningserver/drivers/hardware/tests/test_virsh.py'
--- src/provisioningserver/drivers/hardware/tests/test_virsh.py	2014-09-14 10:56:55 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_virsh.py	2014-09-18 12:49:34 +0000
@@ -169,7 +169,7 @@
         self.assertEqual(None, expected)
 
     def test_mac_addresses_returns_list(self):
-        macs = [factory.getRandomMACAddress() for _ in range(2)]
+        macs = [factory.make_mac_address() for _ in range(2)]
         output = SAMPLE_IFLIST % (macs[0], macs[1])
         conn = self.configure_virshssh(output)
         expected = conn.get_mac_addresses('')
@@ -220,7 +220,7 @@
         called_params = []
         fake_macs = []
         for machine in machines:
-            macs = [factory.getRandomMACAddress() for _ in range(3)]
+            macs = [factory.make_mac_address() for _ in range(3)]
             fake_macs.append(macs)
             called_params.append({
                 'power_address': poweraddr,
 
=== modified file 'src/provisioningserver/power/tests/test_poweraction.py'
--- src/provisioningserver/power/tests/test_poweraction.py	2014-09-12 01:27:55 +0000
+++ src/provisioningserver/power/tests/test_poweraction.py	2014-09-18 12:49:34 +0000
@@ -167,7 +167,7 @@
         pa = PowerAction('ether_wake')
         self.assertRaises(
             PowerActionFail,
-            pa.execute, power_change='off', mac=factory.getRandomMACAddress())
+            pa.execute, power_change='off', mac=factory.make_mac_address())
 
     def test_fence_cdu_checks_state(self):
         # We can't test the fence_cdu template in detail (and it may be
@@ -309,7 +309,7 @@
         find_ip_via_arp.return_value = sentinel.ip_address_from_mac
 
         power_action = self.make_stubbed_power_action()
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         result = power_action.execute(mac_address=mac_address)
         self.assertEqual("done", result)
         self.assertThat(
 
=== modified file 'src/provisioningserver/pserv_services/tests/test_lease_upload_service.py'
--- src/provisioningserver/pserv_services/tests/test_lease_upload_service.py	2014-09-13 11:38:50 +0000
+++ src/provisioningserver/pserv_services/tests/test_lease_upload_service.py	2014-09-18 12:49:34 +0000
@@ -54,13 +54,13 @@
 
 def make_random_lease():
     ip = factory.make_ipv4_address()
-    mac = factory.getRandomMACAddress()
+    mac = factory.make_mac_address()
     return {ip: mac}
 
 
 def make_random_mapping():
     ip = factory.make_ipv4_address()
-    mac = factory.getRandomMACAddress()
+    mac = factory.make_mac_address()
     mapping = {"ip": ip, "mac": mac}
     return mapping
 
 
=== modified file 'src/provisioningserver/pserv_services/tests/test_tftp.py'
--- src/provisioningserver/pserv_services/tests/test_tftp.py	2014-09-13 11:38:50 +0000
+++ src/provisioningserver/pserv_services/tests/test_tftp.py	2014-09-18 12:49:34 +0000
@@ -116,7 +116,7 @@
     def test_get_generator_url(self):
         # get_generator_url() merges the parameters obtained from the request
         # file path (arch, subarch, name) into the configured generator URL.
-        mac = factory.getRandomMACAddress("-")
+        mac = factory.make_mac_address("-")
         dummy = factory.make_name("dummy").encode("ascii")
         backend_url = b"http://example.com/?" + urlencode({b"dummy": dummy})
         backend = TFTPBackend(self.make_dir(), backend_url)
@@ -152,7 +152,7 @@
         cluster_uuid = factory.make_UUID()
         self.patch(tftp_module, 'get_cluster_uuid').return_value = (
             cluster_uuid)
-        mac = factory.getRandomMACAddress("-")
+        mac = factory.make_mac_address("-")
         config_path = compose_config_path(mac)
         backend = TFTPBackend(self.make_dir(), b"http://example.com/")
         # python-tx-tftp sets up call context so that backends can discover
@@ -193,7 +193,7 @@
         # `PXEBootMethod.get_reader`.
         backend = TFTPBackend(self.make_dir(), b"http://example.com/")
         # Fake configuration parameters, as discovered from the file path.
-        fake_params = {"mac": factory.getRandomMACAddress("-")}
+        fake_params = {"mac": factory.make_mac_address("-")}
         # Fake kernel configuration parameters, as returned from the API call.
         fake_kernel_params = make_kernel_parameters()
 
 
=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-17 11:02:19 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-18 12:49:34 +0000
@@ -1056,7 +1056,7 @@
         create_host_maps = self.patch(clusterservice, "create_host_maps")
         mappings = [
             {"ip_address": factory.make_ipv4_address(),
-             "mac_address": factory.getRandomMACAddress()}
+             "mac_address": factory.make_mac_address()}
             for _ in range(2)
         ]
         shared_key = factory.make_name("shared_key")
@@ -1198,7 +1198,7 @@
             clusterservice, 'find_ip_via_arp')
         find_ip_via_arp.return_value = factory.make_ipv4_address()
 
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         username = factory.make_name('user')
         password = factory.make_name('password')
         power_control = factory.make_name('power_control')
@@ -1219,7 +1219,7 @@
             clusterservice, 'find_ip_via_arp')
         find_ip_via_arp.return_value = None
 
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         username = factory.make_name('user')
         password = factory.make_name('password')
         power_control = factory.make_name('power_control')
@@ -1244,7 +1244,7 @@
             clusterservice, 'find_ip_via_arp')
         find_ip_via_arp.return_value = factory.make_ipv4_address()
 
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         username = factory.make_name('user')
         password = factory.make_name('password')
         power_control = factory.make_name('power_control')
 
=== modified file 'src/provisioningserver/rpc/tests/test_dhcp.py'
--- src/provisioningserver/rpc/tests/test_dhcp.py	2014-09-15 14:28:28 +0000
+++ src/provisioningserver/rpc/tests/test_dhcp.py	2014-09-18 12:49:34 +0000
@@ -165,7 +165,7 @@
         omshell_create = self.patch(Omshell, "create")
         mappings = [
             {"ip_address": factory.make_ipv4_address(),
-             "mac_address": factory.getRandomMACAddress()}
+             "mac_address": factory.make_mac_address()}
             for _ in range(5)
         ]
         dhcp.create_host_maps(mappings, sentinel.shared_key)
@@ -180,7 +180,7 @@
         omshell_create.side_effect = ExternalProcessError(
             returncode=2, cmd=("omshell",), output=error_message)
         ip_address = factory.make_ipv4_address()
-        mac_address = factory.getRandomMACAddress()
+        mac_address = factory.make_mac_address()
         mappings = [{"ip_address": ip_address, "mac_address": mac_address}]
         with FakeLogger("maas.dhcp") as logger:
             error = self.assertRaises(
 
=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2014-09-15 14:28:28 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2014-09-18 12:49:34 +0000
@@ -90,7 +90,7 @@
         self.assertEqual("192.168.0.1", ip_address_observed)
 
     def test__returns_consistent_output(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         ips = [
             '10.0.0.11',
             '10.0.0.99',
@@ -126,7 +126,7 @@
         if ip is None:
             ip = factory.make_ipv4_address()
         if mac is None:
-            mac = factory.getRandomMACAddress()
+            mac = factory.make_mac_address()
         if dev is None:
             dev = factory.make_name('eth', sep='')
         return "%(ip)s dev %(dev)s lladdr %(mac)s\n" % {
@@ -181,7 +181,7 @@
         self.assertIsNone(find_mac_via_arp('10.1.1.100'))
 
     def test__is_not_fooled_by_different_notations(self):
-        mac = factory.getRandomMACAddress()
+        mac = factory.make_mac_address()
         self.patch_call(self.make_output_line('9::0:05', mac=mac))
         self.assertEqual(mac, find_mac_via_arp('09:0::5'))
 
@@ -262,8 +262,8 @@
         patch_interfaces(self, {
             interface: {
                 AF_LINK: [{
-                    'addr': unicode(factory.getRandomMACAddress()),
-                    'peer': unicode(factory.getRandomMACAddress()),
+                    'addr': unicode(factory.make_mac_address()),
+                    'peer': unicode(factory.make_mac_address()),
                     }],
                 },
             })
 
=== modified file 'src/provisioningserver/utils/tests/test_utils.py'
--- src/provisioningserver/utils/tests/test_utils.py	2014-09-16 11:43:25 +0000
+++ src/provisioningserver/utils/tests/test_utils.py	2014-09-18 12:49:34 +0000
@@ -424,7 +424,7 @@
             {"system_id": factory.make_name("system-id")})
 
         uuid = 'node-' + factory.make_UUID()
-        macs = sorted(factory.getRandomMACAddress() for _ in range(3))
+        macs = sorted(factory.make_mac_address() for _ in range(3))
         arch = factory.make_name('architecture')
         power_type = factory.make_name('power_type')
         power_parameters = {
@@ -458,7 +458,7 @@
         get_cluster_uuid.return_value = 'cluster-' + factory.make_UUID()
 
         uuid = 'node-' + factory.make_UUID()
-        macs = sorted(factory.getRandomMACAddress() for _ in range(3))
+        macs = sorted(factory.make_mac_address() for _ in range(3))
         arch = factory.make_name('architecture')
         power_type = factory.make_name('power_type')
         power_parameters = {
@@ -495,7 +495,7 @@
         }
 
         # Create a list of MACs with one random duplicate.
-        macs = sorted(factory.getRandomMACAddress() for _ in range(3))
+        macs = sorted(factory.make_mac_address() for _ in range(3))
         macs_with_duplicate = macs + [choice(macs)]
 
         yield create_node(
@@ -518,7 +518,7 @@
         get_cluster_uuid.return_value = 'cluster-' + factory.make_UUID()
 
         uuid = 'node-' + factory.make_UUID()
-        macs = sorted(factory.getRandomMACAddress() for _ in range(3))
+        macs = sorted(factory.make_mac_address() for _ in range(3))
         arch = factory.make_name('architecture')
         power_type = factory.make_name('power_type')
         power_parameters = {