MAAS

Merge lp:~jtv/maas/rename-factory-make_random_mac_address into lp:~maas-committers/maas/trunk

  1. rename-factory-make_random_mac_address
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 3012
Proposed branch: lp:~jtv/maas/rename-factory-make_random_mac_address
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 43 lines (+6/-6)
2 files modified
src/maastesting/factory.py (+2/-2)
src/maastesting/tests/test_factory.py (+4/-4)
To merge this branch: bzr merge lp:~jtv/maas/rename-factory-make_random_mac_address
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+234931@code.launchpad.net

Commit message

Rename factory.make_random_mac_address (the replacement for the old getRandomMACAddress) to make_mac_address.

Description of the change

I didn't bother with a compatibility stub for the transitional name, since nobody seems to have used it yet.

Jeroen

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

 review: approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maastesting/factory.py'
2--- src/maastesting/factory.py 2014-09-15 14:28:28 +0000
3+++ src/maastesting/factory.py 2014-09-17 08:47:36 +0000
4@@ -267,12 +267,12 @@
5 network = self.make_ipv6_network()
6 return self.make_ip_range(network=network, but_not=but_not)
7
8- def make_random_mac_address(self, delimiter=":"):
9+ def make_mac_address(self, delimiter=":"):
10 assert isinstance(delimiter, unicode)
11 octets = islice(self.random_octets, 6)
12 return delimiter.join(format(octet, "02x") for octet in octets)
13
14- getRandomMACAddress = make_random_mac_address # DEPRECATED.
15+ getRandomMACAddress = make_mac_address # DEPRECATED.
16
17 def make_random_leases(self, num_leases=1):
18 """Create a dict of arbitrary ip-to-mac address mappings."""
19
20=== modified file 'src/maastesting/tests/test_factory.py'
21--- src/maastesting/tests/test_factory.py 2014-09-10 16:20:31 +0000
22+++ src/maastesting/tests/test_factory.py 2014-09-17 08:47:36 +0000
23@@ -166,16 +166,16 @@
24 def test_make_date_returns_datetime(self):
25 self.assertIsInstance(factory.make_date(), datetime)
26
27- def test_make_random_mac_address(self):
28- mac_address = factory.make_random_mac_address()
29+ def test_make_mac_address(self):
30+ mac_address = factory.make_mac_address()
31 self.assertIsInstance(mac_address, unicode)
32 self.assertEqual(17, len(mac_address))
33 for hex_octet in mac_address.split(":"):
34 self.assertTrue(0 <= int(hex_octet, 16) <= 255)
35
36- def test_make_random_mac_address_alternative_delimiter(self):
37+ def test_make_mac_address_alternative_delimiter(self):
38 self.patch(factory, "random_octets", count(0x3a))
39- mac_address = factory.make_random_mac_address(delimiter="-")
40+ mac_address = factory.make_mac_address(delimiter="-")
41 self.assertEqual("3a-3b-3c-3d-3e-3f", mac_address)
42
43 def test_make_random_leases_maps_ips_to_macs(self):