Merge lp:~lamont/maas/bug-1543707b into lp:~maas-committers/maas/trunk

[LaMont Jones]

Disallow blanks in fabric names.

Disallow blanks in fabric names.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/maasserver/models/fabric.py'
--- src/maasserver/models/fabric.py	2016-04-06 15:41:15 +0000
+++ src/maasserver/models/fabric.py	2016-04-07 13:53:44 +0000
@@ -33,7 +33,7 @@
     """Django validator: `value` must be either `None`, or valid."""
     if value is None:
         return
-    namespec = re.compile(r'^[ \w-]+$')
+    namespec = re.compile(r'^[\w-]+$')
     if not namespec.search(value):
         raise ValidationError("Invalid fabric name: %s." % value)
 

=== modified file 'src/maasserver/models/tests/test_fabric.py'
--- src/maasserver/models/tests/test_fabric.py	2016-04-05 20:01:58 +0000
+++ src/maasserver/models/tests/test_fabric.py	2016-04-07 13:53:44 +0000
@@ -179,6 +179,12 @@
         fabric = factory.make_Fabric(name='myfabric-33')
         self.assertEqual("myfabric-33", fabric.name)
 
+    def test_rejects_names_with_blanks(self):
+        self.assertRaises(
+            ValidationError,
+            factory.make_Fabric,
+            name=factory.make_name("Fabric "))
+
     def test_rejects_duplicate_names(self):
         fabric1 = factory.make_Fabric()
         self.assertRaises(

=== modified file 'src/maasserver/models/tests/test_space.py'
--- src/maasserver/models/tests/test_space.py	2016-04-05 20:01:58 +0000
+++ src/maasserver/models/tests/test_space.py	2016-04-07 13:53:44 +0000
@@ -166,6 +166,12 @@
         space = factory.make_Space(name='myspace-1999')
         self.assertEqual("myspace-1999", space.name)
 
+    def test_rejects_names_with_blanks(self):
+        self.assertRaises(
+            ValidationError,
+            factory.make_Space,
+            name=factory.make_name("Space "))
+
     def test_rejects_duplicate_names(self):
         space1 = factory.make_Space()
         self.assertRaises(