Merge ~bjornt/maas:clear-vlan-name into maas:master

[Björn Tillenius]

Allow VLAN names to be cleared in websocket and API.

Also ensure that you need to be an admin to edit the VLAN.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b clear-vlan-name lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 2fb8b64ede3d796bee001044ea27c5016284e6a6

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/forms/vlan.py b/src/maasserver/forms/vlan.py
index 41524c6..a456018 100644
--- a/src/maasserver/forms/vlan.py
+++ b/src/maasserver/forms/vlan.py
@@ -12,6 +12,7 @@ from maasserver.fields import NodeChoiceField, SpecifierOrModelChoiceField
 from maasserver.forms import MAASModelForm
 from maasserver.models import Fabric, RackController, Service, Space
 from maasserver.models.vlan import VLAN
+from maasserver.permissions import NodePermission
 
 
 class VLANForm(MAASModelForm):
@@ -42,6 +43,8 @@ class VLANForm(MAASModelForm):
             "space",
             "fabric",
         )
+        permission_create = NodePermission.admin
+        permission_edit = NodePermission.admin
 
     def __init__(self, *args, **kwargs):
         self.fabric = kwargs.pop("fabric", None)
@@ -201,14 +204,10 @@ class VLANForm(MAASModelForm):
         vlan = super().save(commit=False)
         if self.fabric is not None:
             vlan.fabric = self.fabric
-        if "space" in self.data and not self.cleaned_data.get("space"):
-            # 'space' is being cleared.
-            vlan.space = None
-        if "relay_vlan" in self.data and not self.cleaned_data.get(
-            "relay_vlan"
-        ):
-            # 'relay_vlan' is being cleared.
-            vlan.relay_vlan = None
+        for key in ["space", "relay_vlan", "name"]:
+            if key in self.data and not self.cleaned_data.get(key):
+                # key is being cleared.
+                setattr(vlan, key, None)
         if vlan.dhcp_on:
             # 'relay_vlan' cannot be set when dhcp is on.
             vlan.relay_vlan = None
diff --git a/src/maasserver/websockets/handlers/tests/test_vlan.py b/src/maasserver/websockets/handlers/tests/test_vlan.py
index 79927eb..1723dbe 100644
--- a/src/maasserver/websockets/handlers/tests/test_vlan.py
+++ b/src/maasserver/websockets/handlers/tests/test_vlan.py
@@ -109,6 +109,34 @@ class TestVLANHandler(MAASServerTestCase):
         )
 
 
+class TestVLANHandlerUpdate(MAASServerTestCase):
+    def test_update_as_user(self):
+        user = factory.make_User()
+        handler = VLANHandler(user, {}, None)
+        vlan = factory.make_VLAN()
+        old_name = vlan.name
+        with ExpectedException(HandlerPermissionError):
+            handler.update({"id": vlan.id, "name": "new-name"})
+        vlan = reload_object(vlan)
+        self.assertEqual(old_name, vlan.name)
+
+    def test_update_as_admin(self):
+        user = factory.make_admin()
+        handler = VLANHandler(user, {}, None)
+        vlan = factory.make_VLAN()
+        handler.update({"id": vlan.id, "name": "new-name"})
+        vlan = reload_object(vlan)
+        self.assertEqual("new-name", vlan.name)
+
+    def test_update_clear_name(self):
+        user = factory.make_admin()
+        handler = VLANHandler(user, {}, None)
+        vlan = factory.make_VLAN(name="my-name")
+        handler.update({"id": vlan.id, "name": ""})
+        vlan = reload_object(vlan)
+        self.assertIsNone(vlan.name)
+
+
 class TestVLANHandlerDelete(MAASServerTestCase):
     def test_delete_as_admin_success(self):
         user = factory.make_admin()