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

[Raphaël Badin]

Cope with malformed IP and netmask fields.

[Blake Rouse (blake-rouse)]

Looks good.

The fix worked on my machine.

review: Approve

[Raphaël Badin (rvb)]

Thanks for review Blake!

=== modified file 'src/maasserver/models/network.py'
--- src/maasserver/models/network.py	2014-11-20 23:15:21 +0000
+++ src/maasserver/models/network.py	2015-01-23 16:57:59 +0000
@@ -330,8 +330,19 @@
         """Validator for `vlan_tag`."""
         # Work out whether we're using IPv6 or v4. If we're using mixed
         # v6/v4 values, bail out.
-        ip_address = IPAddress(self.ip)
-        netmask_as_ip = IPAddress(self.netmask)
+        try:
+            ip_address = IPAddress(self.ip)
+        except AddrFormatError as e:
+            # The failure will be reported by the validation performed on
+            # the 'ip' field by MAASIPAddressField.
+            return
+        try:
+            netmask_as_ip = IPAddress(self.netmask)
+        except AddrFormatError as e:
+            # The failure will be reported by the validation performed on
+            # the 'netmask' field by MAASIPAddressField.
+            return
+
         if ip_address.version == 6 and netmask_as_ip.version == 6:
             check_ip = 'fc00:1:1::'
         elif ip_address.version == 4 and netmask_as_ip.version == 4:

=== modified file 'src/maasserver/tests/test_forms_network.py'
--- src/maasserver/tests/test_forms_network.py	2015-01-05 14:11:03 +0000
+++ src/maasserver/tests/test_forms_network.py	2015-01-23 16:57:59 +0000
@@ -51,6 +51,36 @@
         network_obj = Network.objects.get(name=name)
         self.assertAttributes(network_obj, definition)
 
+    def test_network_creation_fails_if_empty_IP(self):
+        network = factory.make_ipv4_network()
+        name = factory.make_name('network')
+        definition = {
+            'name': name,
+            'description': factory.make_string(),
+            'ip': "",
+            'netmask': "%s" % network.netmask,
+            'vlan_tag': factory.make_vlan_tag(),
+        }
+        form = NetworkForm(data=definition)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            ["This field is required."], form.errors['ip'])
+
+    def test_network_creation_fails_if_empty_netmask(self):
+        network = factory.make_ipv4_network()
+        name = factory.make_name('network')
+        definition = {
+            'name': name,
+            'description': factory.make_string(),
+            'ip': "%s" % network.cidr.ip,
+            'netmask': "",
+            'vlan_tag': factory.make_vlan_tag(),
+        }
+        form = NetworkForm(data=definition)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            ["This field is required."], form.errors['netmask'])
+
     def test_updates_network(self):
         network = factory.make_Network()
         new_description = factory.make_string()