Merge lp:~jtv/maas/refresh-getRandomIPAddress-renaming into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Rename one use of getRandomIPAddress that was introduced since all pre-existing uses were converted to the new make_ipv4_address.

For self-approval. Maybe it's time to remove the compatibility stub, and start renaming the two remaining make_random_* factories to their fully new-style names.

Jeroen

[Julian Edwards (julian-edwards)]

Yep, get rid of the stub.

review: Approve

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-09-15 14:28:28 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-09-17 06:44:13 +0000
@@ -461,8 +461,10 @@
         node = factory.make_Node(owner=self.logged_in_user, disable_ipv4=False)
         nodegroup = node.nodegroup
         macs = [
-            factory.make_MACAddress(node=node).mac_address for _ in range(2)]
-        ips = [factory.getRandomIPAddress() for _ in range(2)]
+            factory.make_MACAddress(node=node).mac_address
+            for _ in range(2)
+            ]
+        ips = [factory.make_ipv4_address() for _ in range(2)]
         for mac, ip in zip(macs, ips):
             factory.make_DHCPLease(nodegroup=nodegroup, mac=mac, ip=ip)
         node_link = reverse('node-view', args=[node.system_id])