Merge lp:~mpontillo/maas/l2-spaces--phase1 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

L2 spaces: Phase 1

 * Add 'space' reference to VLAN.
 * Fix failing migration due to reference to maasserver.models.
 * Allow modification via the Web UI and REST API.

Note: constraints will be done in a future branch.

[Gavin Panella (allenap)]

Seems good to me!

review: Approve

[Mike Pontillo (mpontillo)]

Thanks for the review.

The oddities you pointed out in the diff are not unique to this diff. (That is, I made the new code consistent with code that was already in those files - so I won't go back and tweak those in this MP.)

=== modified file 'src/maasserver/api/tests/test_vlans.py'
--- src/maasserver/api/tests/test_vlans.py	2016-11-30 21:13:52 +0000
+++ src/maasserver/api/tests/test_vlans.py	2016-12-06 16:09:53 +0000
@@ -107,6 +107,50 @@
         self.assertEqual(mtu, response_data['mtu'])
         self.assertEqual(relay_vlan.vid, response_data['relay_vlan']['vid'])
 
+    def test_create_without_space(self):
+        self.become_admin()
+        fabric = factory.make_Fabric()
+        vlan_name = factory.make_name("fabric")
+        vid = random.randint(1, 1000)
+        mtu = random.randint(552, 1500)
+        uri = get_vlans_uri(fabric)
+        response = self.client.post(uri, {
+            "name": vlan_name,
+            "vid": vid,
+            "mtu": mtu,
+        })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        response_data = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertEqual(vlan_name, response_data['name'])
+        self.assertEqual(vid, response_data['vid'])
+        self.assertEqual(mtu, response_data['mtu'])
+        self.assertEqual(None, response_data['space'])
+
+    def test_create_with_space(self):
+        self.become_admin()
+        fabric = factory.make_Fabric()
+        vlan_name = factory.make_name("fabric")
+        vid = random.randint(1, 1000)
+        mtu = random.randint(552, 1500)
+        space = factory.make_Space()
+        uri = get_vlans_uri(fabric)
+        response = self.client.post(uri, {
+            "name": vlan_name,
+            "vid": vid,
+            "mtu": mtu,
+            "space": space.id,
+        })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        response_data = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertEqual(vlan_name, response_data['name'])
+        self.assertEqual(vid, response_data['vid'])
+        self.assertEqual(mtu, response_data['mtu'])
+        self.assertEqual(space.name, response_data['space'])
+
     def test_create_admin_only(self):
         fabric = factory.make_Fabric()
         vlan_name = factory.make_name("fabric")
@@ -176,6 +220,24 @@
             "resource_uri": Equals(get_vlan_uri(vlan)),
             }))
 
+    def test_read_with_space(self):
+        space = factory.make_Space()
+        vlan = factory.make_VLAN(space=space)
+        uri = get_vlan_uri(vlan, vlan.fabric)
+        response = self.client.get(uri)
+
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_vlan = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertThat(parsed_vlan, ContainsDict({
+            "id": Equals(vlan.id),
+            "name": Equals(vlan.get_name()),
+            "vid": Equals(vlan.vid),
+            "space": Equals(space.get_name()),
+            "resource_uri": Equals(get_vlan_uri(vlan)),
+        }))
+
     def test_read_404_when_bad_id(self):
         fabric = factory.make_Fabric()
         uri = reverse(
 
=== modified file 'src/maasserver/api/vlans.py'
--- src/maasserver/api/vlans.py	2016-11-30 21:13:52 +0000
+++ src/maasserver/api/vlans.py	2016-12-06 16:09:53 +0000
@@ -27,6 +27,7 @@
     'dhcp_on',
     'external_dhcp',
     'relay_vlan',
+    'space',
 )
 
 
@@ -55,6 +56,13 @@
         else:
             return None
 
+    @classmethod
+    def space(handler, vlan):
+        if vlan.space:
+            return vlan.space.get_name()
+        else:
+            return None
+
     def read(self, request, fabric_id):
         """List all VLANs belonging to fabric.
 
@@ -113,6 +121,13 @@
             return None
 
     @classmethod
+    def space(handler, vlan):
+        if vlan.space:
+            return vlan.space.get_name()
+        else:
+            return None
+
+    @classmethod
     def fabric(cls, vlan):
         """Return fabric name."""
         return vlan.fabric.get_name()
 
=== modified file 'src/maasserver/forms_vlan.py'
--- src/maasserver/forms_vlan.py	2016-11-30 16:42:37 +0000
+++ src/maasserver/forms_vlan.py	2016-12-06 16:09:53 +0000
@@ -11,7 +11,10 @@
 from django.core.exceptions import ValidationError
 from maasserver.fields import NodeChoiceField
 from maasserver.forms import MAASModelForm
-from maasserver.models import RackController
+from maasserver.models import (
+    RackController,
+    Space,
+)
 from maasserver.models.vlan import VLAN
 
 
@@ -21,6 +24,9 @@
     # Linux doesn't allow lower than 552 for the MTU.
     mtu = forms.IntegerField(min_value=552, required=False)
 
+    space = forms.ModelChoiceField(
+        queryset=Space.objects.all(), required=False)
+
     class Meta:
         model = VLAN
         fields = (
@@ -32,6 +38,7 @@
             'primary_rack',
             'secondary_rack',
             'relay_vlan',
+            'space',
             )
 
     def __init__(self, *args, **kwargs):
@@ -134,16 +141,20 @@
             "dhcp can only be turned on when a dynamic IP range is defined.")
 
     def save(self):
-        """Persist the interface into the database."""
-        interface = super(VLANForm, self).save(commit=False)
+        """Persist the VLAN into the database."""
+        vlan = super(VLANForm, self).save(commit=False)
         if self.fabric is not None:
-            interface.fabric = self.fabric
+            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.
-            interface.relay_vlan = None
-        if interface.dhcp_on:
-            # relay_vlan cannot be set when dhcp is on.
-            interface.relay_vlan = None
-        interface.save()
-        return interface
+            # 'relay_vlan' is being cleared.
+            vlan.relay_vlan = None
+        if vlan.dhcp_on:
+            # 'relay_vlan' cannot be set when dhcp is on.
+            vlan.relay_vlan = None
+        vlan.save()
+        return vlan
 
=== modified file 'src/maasserver/migrations/builtin/maasserver/0096_set_default_vlan_field.py'
--- src/maasserver/migrations/builtin/maasserver/0096_set_default_vlan_field.py	2016-12-05 14:56:57 +0000
+++ src/maasserver/migrations/builtin/maasserver/0096_set_default_vlan_field.py	2016-12-06 16:09:53 +0000
@@ -6,7 +6,6 @@
     models,
 )
 import django.db.models.deletion
-import maasserver.models.subnet
 
 
 class Migration(migrations.Migration):
@@ -19,6 +18,6 @@
         migrations.AlterField(
             model_name='subnet',
             name='vlan',
-            field=models.ForeignKey(to='maasserver.VLAN', default=maasserver.models.subnet.get_default_vlan, on_delete=django.db.models.deletion.PROTECT),
+            field=models.ForeignKey(to='maasserver.VLAN', default=lambda: 0, on_delete=django.db.models.deletion.PROTECT),
         ),
     ]
 
=== added file 'src/maasserver/migrations/builtin/maasserver/0098_add_space_to_vlan.py'
--- src/maasserver/migrations/builtin/maasserver/0098_add_space_to_vlan.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0098_add_space_to_vlan.py	2016-12-06 16:09:53 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+import django.db.models.deletion
+import maasserver.models.subnet
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0097_node_chassis_storage_hints'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vlan',
+            name='space',
+            field=models.ForeignKey(blank=True, null=True, to='maasserver.Space', on_delete=django.db.models.deletion.SET_NULL),
+        ),
+    ]
 
=== added file 'src/maasserver/migrations/builtin/maasserver/0099_set_default_vlan_field.py'
--- src/maasserver/migrations/builtin/maasserver/0099_set_default_vlan_field.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0099_set_default_vlan_field.py	2016-12-06 16:09:53 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+import django.db.models.deletion
+import maasserver.models.subnet
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0098_add_space_to_vlan'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subnet',
+            name='vlan',
+            field=models.ForeignKey(to='maasserver.VLAN', on_delete=django.db.models.deletion.PROTECT, default=maasserver.models.subnet.get_default_vlan),
+        ),
+    ]
 
=== modified file 'src/maasserver/models/vlan.py'
--- src/maasserver/models/vlan.py	2016-12-01 14:12:32 +0000
+++ src/maasserver/models/vlan.py	2016-12-06 16:09:53 +0000
@@ -19,6 +19,7 @@
     IntegerField,
     Manager,
     Q,
+    SET_NULL,
     TextField,
 )
 from django.db.models.query import QuerySet
@@ -174,6 +175,9 @@
         'self', null=True, blank=True, editable=True,
         related_name='relay_vlans', on_delete=deletion.SET_NULL)
 
+    space = ForeignKey(
+        'Space', editable=True, blank=True, null=True, on_delete=SET_NULL)
+
     def __str__(self):
         return "%s.%s" % (self.fabric.get_name(), self.get_name())
 
 
=== modified file 'src/maasserver/static/partials/vlan-details.html'
--- src/maasserver/static/partials/vlan-details.html	2016-12-06 07:32:14 +0000
+++ src/maasserver/static/partials/vlan-details.html	2016-12-06 16:09:53 +0000
@@ -232,6 +232,9 @@
                         label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
                     <maas-obj-field type="text" key="mtu" label="MTU" placeholder="VLAN MTU"
                         label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
+                    <maas-obj-field type="options" key="space" label="Space" placeholder="(not in a space)" placeholder-enabled="true"
+                        options="space.id as space.name for space in vlanDetails.spaces"
+                        label-width="two" input-width="three"></maas-obj-field>
                     <maas-obj-field type="textarea" key="description" label="Description" placeholder="VLAN description"
                         label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
                 </fieldset>
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2016-12-06 09:34:06 +0000
+++ src/maasserver/testing/factory.py	2016-12-06 16:09:53 +0000
@@ -1037,7 +1037,7 @@
             "Could not generate vid in fabric %s" % fabric)
 
     def make_VLAN(
-            self, name=None, vid=None, fabric=None, dhcp_on=False,
+            self, name=None, vid=None, fabric=None, dhcp_on=False, space=None,
             primary_rack=None, secondary_rack=None, relay_vlan=None):
         assert vid != 0, "VID=0 VLANs are auto-created"
         if fabric is None:
@@ -1046,7 +1046,7 @@
             # Don't create the vid=0 VLAN, it's auto-created.
             vid = self._get_available_vid(fabric)
         vlan = VLAN(
-            name=name, vid=vid, fabric=fabric, dhcp_on=dhcp_on,
+            name=name, vid=vid, fabric=fabric, dhcp_on=dhcp_on, space=space,
             primary_rack=primary_rack, secondary_rack=secondary_rack,
             relay_vlan=relay_vlan)
         vlan.save()
 
=== modified file 'src/maasserver/tests/test_forms_vlan.py'
--- src/maasserver/tests/test_forms_vlan.py	2016-11-30 16:42:37 +0000
+++ src/maasserver/tests/test_forms_vlan.py	2016-12-06 16:09:53 +0000
@@ -266,6 +266,39 @@
         vlan = reload_object(vlan)
         self.assertIsNone(vlan.relay_vlan)
 
+    def test_update_sets_space(self):
+        vlan = factory.make_VLAN()
+        space = factory.make_Space()
+        form = VLANForm(instance=vlan, data={
+            "space": space.id,
+        })
+        self.assertTrue(form.is_valid(), form.errors)
+        form.save()
+        vlan = reload_object(vlan)
+        self.assertEquals(space.id, vlan.space.id)
+
+    def test_update_clears_space_when_None(self):
+        space = factory.make_Space()
+        vlan = factory.make_VLAN(space=space)
+        form = VLANForm(instance=vlan, data={
+            "space": None,
+        })
+        self.assertTrue(form.is_valid(), form.errors)
+        form.save()
+        vlan = reload_object(vlan)
+        self.assertIsNone(vlan.space)
+
+    def test_update_clears_space_vlan_when_empty(self):
+        space = factory.make_Space()
+        vlan = factory.make_VLAN(space=space)
+        form = VLANForm(instance=vlan, data={
+            "space": "",
+        })
+        self.assertTrue(form.is_valid(), form.errors)
+        form.save()
+        vlan = reload_object(vlan)
+        self.assertIsNone(vlan.space)
+
     def test_update_disables_relay_vlan_when_dhcp_turned_on(self):
         relay_vlan = factory.make_VLAN()
         vlan = factory.make_VLAN(relay_vlan=relay_vlan)
 
=== modified file 'src/maasserver/websockets/handlers/tests/test_vlan.py'
--- src/maasserver/websockets/handlers/tests/test_vlan.py	2016-12-06 08:04:18 +0000
+++ src/maasserver/websockets/handlers/tests/test_vlan.py	2016-12-06 16:09:53 +0000
@@ -36,6 +36,7 @@
             "vid": vlan.vid,
             "mtu": vlan.mtu,
             "fabric": vlan.fabric_id,
+            "space": vlan.space_id,
             "updated": dehydrate_datetime(vlan.updated),
             "created": dehydrate_datetime(vlan.created),
             "dhcp_on": vlan.dhcp_on,