Merge lp:~ltrager/maas/prevent_assigning_ip_to_bonded_interface into lp:~maas-committers/maas/trunk

[Lee Trager]

Don't allow linking interfaces when they are in a bond

Blake was right this morning. We were properly resetting interfaces when they were added to a new bond but still allowed the user to link an interface which is part of a bond to a subnet. This patch prevents linking an interface if its part of a bond. I wasn't sure if there were other interface sets which we should check for so I'm only checking for bonds right now.

[Blake Rouse (blake-rouse)]

Looks good. Doing it only on bonds is correct all other interface modes will allow this.

review: Approve

=== modified file 'src/maasserver/forms_interface_link.py'
--- src/maasserver/forms_interface_link.py	2015-09-15 19:08:17 +0000
+++ src/maasserver/forms_interface_link.py	2015-11-05 20:08:52 +0000
@@ -27,8 +27,11 @@
     IPADDRESS_TYPE,
 )
 from maasserver.fields import CaseInsensitiveChoiceField
-from maasserver.models.interface import Interface
-from maasserver.models.staticipaddress import StaticIPAddress
+from maasserver.models import (
+    BondInterface,
+    Interface,
+    StaticIPAddress,
+)
 from maasserver.utils.forms import (
     compose_invalid_choice_text,
     set_form_error,
@@ -65,6 +68,12 @@
         self.fields['subnet'].queryset = self.instance.vlan.subnet_set.all()
 
     def clean(self):
+        for interface_set in self.instance.interface_set.all():
+            if isinstance(interface_set, BondInterface):
+                set_form_error(
+                    self, "bond",
+                    ("Cannot link interface(%s) when interface is in a "
+                     "bond(%s)." % (self.instance.name, interface_set.name)))
         cleaned_data = super(InterfaceLinkForm, self).clean()
         mode = cleaned_data.get("mode", None)
         if mode is None:

=== modified file 'src/maasserver/tests/test_forms_interface_link.py'
--- src/maasserver/tests/test_forms_interface_link.py	2015-09-15 19:08:17 +0000
+++ src/maasserver/tests/test_forms_interface_link.py	2015-11-05 20:08:52 +0000
@@ -433,6 +433,29 @@
                 "Cannot use in mode '%s'." % (INTERFACE_LINK_TYPE.LINK_UP)]
             }, form.errors)
 
+    def test_linking_when_no_bond_not_allowed(self):
+        node = factory.make_Node()
+        eth0 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        eth1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        bond0 = factory.make_Interface(
+            INTERFACE_TYPE.BOND, parents=[eth0, eth1], node=node)
+        subnet = factory.make_Subnet(vlan=eth0.vlan)
+        nodegroup = factory.make_NodeGroup(status=NODEGROUP_STATUS.ENABLED)
+        ngi = factory.make_NodeGroupInterface(
+            nodegroup, management=NODEGROUPINTERFACE_MANAGEMENT.DHCP,
+            subnet=subnet)
+        ip_in_static = IPAddress(ngi.get_static_ip_range().first)
+        form = InterfaceLinkForm(instance=eth0, data={
+            "mode": INTERFACE_LINK_TYPE.STATIC,
+            "subnet": subnet.id,
+            "ip_address": "%s" % ip_in_static,
+            })
+        self.assertFalse(form.is_valid())
+        self.assertEquals({
+            "bond": [("Cannot link interface(%s) when interface is in a "
+                      "bond(%s)." % (eth0.name, bond0.name))]},
+            form.errors)
+
 
 class TestInterfaceUnlinkForm(MAASServerTestCase):