Merge lp:~blake-rouse/maas/fix-15270528 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix get_interfaces_with_ip_on_vlan to actually check the VLAN.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/maasserver/dhcp.py'
--- src/maasserver/dhcp.py	2016-03-02 05:03:06 +0000
+++ src/maasserver/dhcp.py	2016-03-03 02:36:07 +0000
@@ -112,11 +112,15 @@
         for ip_address in interface.ip_addresses.all():
             if ip_address.alloc_type in [
                     IPADDRESS_TYPE.AUTO, IPADDRESS_TYPE.STICKY]:
-                if ip_is_version(ip_address, ip_version):
+                if (ip_is_version(ip_address, ip_version) and
+                        ip_address.subnet is not None and
+                        ip_address.subnet.vlan == vlan):
                     interfaces_with_static.append(interface)
                     break
             elif ip_address.alloc_type == IPADDRESS_TYPE.DISCOVERED:
-                if ip_is_version(ip_address, ip_version):
+                if (ip_is_version(ip_address, ip_version) and
+                        ip_address.subnet is not None and
+                        ip_address.subnet.vlan == vlan):
                     interfaces_with_discovered.append(interface)
                     break
     if len(interfaces_with_static) > 0:

=== modified file 'src/maasserver/tests/test_dhcp.py'
--- src/maasserver/tests/test_dhcp.py	2016-03-02 04:31:19 +0000
+++ src/maasserver/tests/test_dhcp.py	2016-03-03 02:36:07 +0000
@@ -254,6 +254,54 @@
             dhcp.get_interfaces_with_ip_on_vlan(
                 rack_controller, vlan, subnet.get_ipnetwork().version))
 
+    def test__returns_only_interfaces_on_vlan_ipv4(self):
+        rack_controller = factory.make_RackController()
+        vlan = factory.make_VLAN()
+        network = factory.make_ipv4_network()
+        subnet = factory.make_Subnet(cidr=str(network.cidr), vlan=vlan)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=rack_controller, vlan=vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            subnet=subnet, interface=interface)
+        other_vlan = factory.make_VLAN()
+        other_network = factory.make_ipv4_network()
+        other_subnet = factory.make_Subnet(
+            cidr=str(other_network.cidr), vlan=other_vlan)
+        other_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=rack_controller, vlan=other_vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            subnet=other_subnet, interface=other_interface)
+        self.assertEquals(
+            [interface],
+            dhcp.get_interfaces_with_ip_on_vlan(
+                rack_controller, vlan, subnet.get_ipnetwork().version))
+
+    def test__returns_only_interfaces_on_vlan_ipv6(self):
+        rack_controller = factory.make_RackController()
+        vlan = factory.make_VLAN()
+        network = factory.make_ipv6_network()
+        subnet = factory.make_Subnet(cidr=str(network.cidr), vlan=vlan)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=rack_controller, vlan=vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            subnet=subnet, interface=interface)
+        other_vlan = factory.make_VLAN()
+        other_network = factory.make_ipv6_network()
+        other_subnet = factory.make_Subnet(
+            cidr=str(other_network.cidr), vlan=other_vlan)
+        other_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=rack_controller, vlan=other_vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            subnet=other_subnet, interface=other_interface)
+        self.assertEquals(
+            [interface],
+            dhcp.get_interfaces_with_ip_on_vlan(
+                rack_controller, vlan, subnet.get_ipnetwork().version))
+
 
 class TestGetManagedVLANsFor(MAASServerTestCase):
     """Tests for `get_managed_vlans_for`."""