Merge lp:~rvb/maas/bug-1337190 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix test_updates_mac_cluster_interface: use different interfaces for all the MAC addresses to avoid generating clashing IP addresses.

The problem was that MAC addresses could be linked to the same interface because the interface was chosen at random in:
        mac_addresses = {
            factory.make_mac_address(): random.choice(interfaces)
            for i in range(4)
            }

As a consequence, the call to `get_random_ip_from_interface_range` could return the *same* IP twice in:
        leases = {
            get_random_ip_from_interface_range(interface): (
                mac_address.mac_address)
            for mac_address, interface in mac_addresses.items()
        }
The result was a failure of the whole test because the leases would be missing an entry.

My solution restricts a bit what the test actually tests but I don't think it's a problem in practice because what update_mac_cluster_interfaces() does do not depend on whether the IP addresses in the leases dictionary are on the same interface or not.

[Graham Binns (gmb)]

review: Approve

=== modified file 'src/maasserver/tests/test_api_nodegroup.py'
--- src/maasserver/tests/test_api_nodegroup.py	2014-06-25 16:51:34 +0000
+++ src/maasserver/tests/test_api_nodegroup.py	2014-07-03 09:29:42 +0000
@@ -832,13 +832,9 @@
 
     def test_updates_mac_cluster_interfaces(self):
         cluster = factory.make_node_group()
-        interfaces = [
-            factory.make_node_group_interface(nodegroup=cluster)
-            for i in range(4)
-            ]
-        interfaces.append(cluster.nodegroupinterface_set.first())
         mac_addresses = {
-            factory.make_mac_address(): random.choice(interfaces)
+            factory.make_mac_address(): factory.make_node_group_interface(
+                nodegroup=cluster)
             for i in range(4)
             }
         leases = {