Merge lp:~blake-rouse/maas/fix-vlan-to-untagged into lp:~maas-committers/maas/trunk

[Blake Rouse]

Remove the requirement of names on fabric and vlan. Fix fabric name and vlan name based on the id and vid respectively. Fix the UI to not allow the VLAN editing on physical interfaces. Fix other small UI issues with node networking. Prevent the default VLAN from being editable on a fabric.

[Mike Pontillo (mpontillo)]

Just one minor comment - not sure it's desired to not allow any editing of the default VLAN.

It's a minor enough debate that I wouldn't block landing this, but please call it out in the commit message too.

review: Approve

[Blake Rouse (blake-rouse)]

Thanks for the review. I added it to the commit message.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-vlan-to-untagged into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [238 kB]
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [140 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [628 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [323 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en [305 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [170 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,868 kB in 4s (466 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted pytho...

=== modified file 'src/maasserver/api/fabrics.py'
--- src/maasserver/api/fabrics.py	2015-08-18 15:10:54 +0000
+++ src/maasserver/api/fabrics.py	2015-10-09 21:26:30 +0000
@@ -75,6 +75,11 @@
         return ('fabric_handler', (fabric_id,))
 
     @classmethod
+    def name(cls, fabric):
+        """Return the name of the fabric."""
+        return fabric.get_name()
+
+    @classmethod
     def vlans(cls, fabric):
         """Return VLANs within the specified fabric."""
         return fabric.vlan_set.all()
 
=== modified file 'src/maasserver/api/tests/test_fabrics.py'
--- src/maasserver/api/tests/test_fabrics.py	2015-08-13 19:29:08 +0000
+++ src/maasserver/api/tests/test_fabrics.py	2015-10-09 21:26:30 +0000
@@ -82,16 +82,6 @@
         self.assertEqual(
             httplib.FORBIDDEN, response.status_code, response.content)
 
-    def test_create_requires_name(self):
-        self.become_admin()
-        uri = get_fabrics_uri()
-        response = self.client.post(uri, {})
-        self.assertEqual(
-            httplib.BAD_REQUEST, response.status_code, response.content)
-        self.assertEqual({
-            "name": ["This field is required."],
-            }, json.loads(response.content))
-
 
 class TestFabricAPI(APITestCase):
 
@@ -112,7 +102,7 @@
         parsed_fabric = json.loads(response.content)
         self.assertThat(parsed_fabric, ContainsDict({
             "id": Equals(fabric.id),
-            "name": Equals(fabric.name),
+            "name": Equals(fabric.get_name()),
             }))
         self.assertItemsEqual([
             vlan.id
 
=== modified file 'src/maasserver/api/tests/test_vlans.py'
--- src/maasserver/api/tests/test_vlans.py	2015-08-15 00:08:54 +0000
+++ src/maasserver/api/tests/test_vlans.py	2015-10-09 21:26:30 +0000
@@ -93,7 +93,7 @@
         self.assertEqual(
             httplib.FORBIDDEN, response.status_code, response.content)
 
-    def test_create_requires_name_and_vid(self):
+    def test_create_requires_vid(self):
         self.become_admin()
         fabric = factory.make_Fabric()
         uri = get_vlans_uri(fabric)
@@ -101,7 +101,6 @@
         self.assertEqual(
             httplib.BAD_REQUEST, response.status_code, response.content)
         self.assertEqual({
-            "name": ["This field is required."],
             "vid": [
                 "This field is required.",
                 "Vid must be between 0 and 4095."],
@@ -128,9 +127,9 @@
         parsed_vlan = json.loads(response.content)
         self.assertThat(parsed_vlan, ContainsDict({
             "id": Equals(vlan.id),
-            "name": Equals(vlan.name),
+            "name": Equals(vlan.get_name()),
             "vid": Equals(vlan.vid),
-            "fabric": Equals(fabric.name),
+            "fabric": Equals(fabric.get_name()),
             "resource_uri": Equals(get_vlan_uri(vlan)),
             }))
 
 
=== modified file 'src/maasserver/api/vlans.py'
--- src/maasserver/api/vlans.py	2015-08-18 15:25:03 +0000
+++ src/maasserver/api/vlans.py	2015-10-09 21:26:30 +0000
@@ -90,7 +90,12 @@
     @classmethod
     def fabric(cls, vlan):
         """Return fabric name."""
-        return vlan.fabric.name
+        return vlan.fabric.get_name()
+
+    @classmethod
+    def name(cls, vlan):
+        """Return the VLAN name."""
+        return vlan.get_name()
 
     def read(self, request, fabric_id, vlan_id):
         """Read VLAN on fabric.
 
=== modified file 'src/maasserver/context_processors.py'
--- src/maasserver/context_processors.py	2015-09-30 22:30:55 +0000
+++ src/maasserver/context_processors.py	2015-10-09 21:26:30 +0000
@@ -76,6 +76,7 @@
             'js/angular/filters/by_fabric.js',
             'js/angular/filters/by_vlan.js',
             'js/angular/filters/by_space.js',
+            'js/angular/filters/remove_default_vlan.js',
             'js/angular/controllers/error.js',
             'js/angular/controllers/nodes_list.js',
             'js/angular/controllers/add_hardware.js',
 
=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml	2015-09-27 20:01:05 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml	2015-10-09 21:26:30 +0000
@@ -9484,11 +9484,11 @@
     updated: ! '2015-09-18 15:38:26.981744'}
   model: maasserver.event
   pk: 236
-- fields: {created: ! '2015-09-18 15:14:45.727015', name: Default fabric, updated: ! '2015-09-18
+- fields: {created: ! '2015-09-18 15:14:45.727015', updated: ! '2015-09-18
       15:14:45.727015'}
   model: maasserver.fabric
   pk: 0
-- fields: {created: ! '2015-09-18 15:14:45.727015', name: Extra fabric, updated: ! '2015-09-18
+- fields: {created: ! '2015-09-18 15:14:45.727015', updated: ! '2015-09-18
       15:14:45.727015'}
   model: maasserver.fabric
   pk: 1
@@ -9512,11 +9512,11 @@
 - fields: {filesystem_group: 4, uuid: 3a140acf-6a98-4572-aa2f-3de2ba56b818}
   model: maasserver.virtualblockdevice
   pk: 12
-- fields: {created: ! '2015-09-18 15:14:45.727015', fabric: 0, name: Default VLAN,
+- fields: {created: ! '2015-09-18 15:14:45.727015', fabric: 0,
     updated: ! '2015-09-18 15:14:45.727015', vid: 0}
   model: maasserver.vlan
   pk: 0
-- fields: {created: ! '2015-09-18 15:14:45.727015', fabric: 1, name: Extra VLAN,
+- fields: {created: ! '2015-09-18 15:14:45.727015', fabric: 1,
     updated: ! '2015-09-18 15:14:45.727015', vid: 0}
   model: maasserver.vlan
   pk: 1
 
=== modified file 'src/maasserver/forms_vlan.py'
--- src/maasserver/forms_vlan.py	2015-08-14 14:00:46 +0000
+++ src/maasserver/forms_vlan.py	2015-10-09 21:26:30 +0000
@@ -16,6 +16,7 @@
     "VLANForm",
 ]
 
+from django.core.exceptions import ValidationError
 from maasserver.forms import MAASModelForm
 from maasserver.models.vlan import VLAN
 
@@ -37,6 +38,13 @@
         if instance is None and self.fabric is None:
             raise ValueError("Form requires either a instance or a fabric.")
 
+    def clean(self):
+        cleaned_data = super(VLANForm, self).clean()
+        if self.instance.id is not None and self.instance.is_fabric_default():
+            raise ValidationError(
+                "Cannot modify the default VLAN for a fabric.")
+        return cleaned_data
+
     def save(self):
         """Persist the interface into the database."""
         interface = super(VLANForm, self).save(commit=False)
 
=== added file 'src/maasserver/migrations/0183_remove_required_name_from_vlan_and_fabric.py'
--- src/maasserver/migrations/0183_remove_required_name_from_vlan_and_fabric.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/0183_remove_required_name_from_vlan_and_fabric.py	2015-10-09 21:26:30 +0000
@@ -0,0 +1,519 @@
+from django.db import models
+from south.db import db
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Removing unique constraint on 'Fabric', fields ['name']
+        db.delete_unique(u'maasserver_fabric', ['name'])
+
+        # Removing unique constraint on 'VLAN', fields ['name', 'fabric']
+        db.delete_unique(u'maasserver_vlan', ['name', 'fabric_id'])
+
+
+        # Changing field 'VLAN.name'
+        db.alter_column(u'maasserver_vlan', 'name', self.gf('django.db.models.fields.CharField')(max_length=256, null=True))
+
+        # Changing field 'Fabric.name'
+        db.alter_column(u'maasserver_fabric', 'name', self.gf('django.db.models.fields.CharField')(max_length=256, null=True))
+
+    def backwards(self, orm):
+
+        # User chose to not deal with backwards NULL issues for 'VLAN.name'
+        raise RuntimeError("Cannot reverse this migration. 'VLAN.name' and its values cannot be restored.")
+        # Adding unique constraint on 'VLAN', fields ['name', 'fabric']
+        db.create_unique(u'maasserver_vlan', ['name', 'fabric_id'])
+
+
+        # User chose to not deal with backwards NULL issues for 'Fabric.name'
+        raise RuntimeError("Cannot reverse this migration. 'Fabric.name' and its values cannot be restored.")
+        # Adding unique constraint on 'Fabric', fields ['name']
+        db.create_unique(u'maasserver_fabric', ['name'])
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'maasserver.blockdevice': {
+            'Meta': {'ordering': "[u'id']", 'unique_together': "((u'node', u'name'),)", 'object_name': 'BlockDevice'},
+            'block_size': ('django.db.models.fields.IntegerField', [], {}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'id_path': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
+            'size': ('django.db.models.fields.BigIntegerField', [], {}),
+            'tags': ('djorm_pgarray.fields.ArrayField', [], {'default': '[]', 'dbtype': "u'text'", 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.bootresource': {
+            'Meta': {'unique_together': "((u'name', u'architecture'),)", 'object_name': 'BootResource'},
+            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'extra': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'rtype': ('django.db.models.fields.IntegerField', [], {'max_length': '10'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.bootresourcefile': {
+            'Meta': {'unique_together': "((u'resource_set', u'filetype'),)", 'object_name': 'BootResourceFile'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'extra': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'filetype': ('django.db.models.fields.CharField', [], {'default': "u'root-tgz'", 'max_length': '20'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'largefile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.LargeFile']"}),
+            'resource_set': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'files'", 'to': u"orm['maasserver.BootResourceSet']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.bootresourceset': {
+            'Meta': {'unique_together': "((u'resource', u'version'),)", 'object_name': 'BootResourceSet'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'resource': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'sets'", 'to': u"orm['maasserver.BootResource']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'maasserver.bootsource': {
+            'Meta': {'object_name': 'BootSource'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}),
+            'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'maasserver.bootsourcecache': {
+            'Meta': {'object_name': 'BootSourceCache'},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'os': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'release': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'subarch': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.bootsourceselection': {
+            'Meta': {'unique_together': "((u'boot_source', u'os', u'release'),)", 'object_name': 'BootSourceSelection'},
+            'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'os': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.cacheset': {
+            'Meta': {'object_name': 'CacheSet'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.candidatename': {
+            'Meta': {'unique_together': "((u'name', u'position'),)", 'object_name': 'CandidateName'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'position': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'maasserver.componenterror': {
+            'Meta': {'object_name': 'ComponentError'},
+            'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.config': {
+            'Meta': {'object_name': 'Config'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
+        },
+        u'maasserver.downloadprogress': {
+            'Meta': {'object_name': 'DownloadProgress'},
+            'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
+            'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.event': {
+            'Meta': {'object_name': 'Event'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'default': "u''", 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.EventType']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.eventtype': {
+            'Meta': {'object_name': 'EventType'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'level': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.fabric': {
+            'Meta': {'object_name': 'Fabric'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.fannetwork': {
+            'Meta': {'object_name': 'FanNetwork'},
+            'bridge': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'dhcp': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'host_reserve': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'off': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}),
+            'overlay': ('maasserver.fields.IPv4CIDRField', [], {'unique': 'True'}),
+            'underlay': ('maasserver.fields.IPv4CIDRField', [], {'unique': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.filestorage': {
+            'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'},
+            'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'default': "u'a1d75a4c-6e44-11e5-a1dc-c48e8ffbb365'", 'unique': 'True', 'max_length': '36'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.filesystem': {
+            'Meta': {'unique_together': "((u'partition', u'acquired'), (u'block_device', u'acquired'))", 'object_name': 'Filesystem'},
+            'acquired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'block_device': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BlockDevice']", 'null': 'True', 'blank': 'True'}),
+            'cache_set': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'filesystems'", 'null': 'True', 'to': u"orm['maasserver.CacheSet']"}),
+            'create_params': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'filesystem_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'filesystems'", 'null': 'True', 'to': u"orm['maasserver.FilesystemGroup']"}),
+            'fstype': ('django.db.models.fields.CharField', [], {'default': "u'ext4'", 'max_length': '20'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'mount_params': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'mount_point': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'partition': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Partition']", 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '36'})
+        },
+        u'maasserver.filesystemgroup': {
+            'Meta': {'object_name': 'FilesystemGroup'},
+            'cache_mode': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'cache_set': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.CacheSet']", 'null': 'True', 'blank': 'True'}),
+            'create_params': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'group_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
+        },
+        u'maasserver.interface': {
+            'Meta': {'ordering': "(u'created',)", 'object_name': 'Interface'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['maasserver.StaticIPAddress']", 'null': 'True', 'blank': 'True'}),
+            'ipv4_params': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+            'ipv6_params': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+            'mac_address': ('maasserver.fields.MACAddressField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']", 'null': 'True', 'blank': 'True'}),
+            'params': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+            'parents': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['maasserver.Interface']", 'null': 'True', 'through': u"orm['maasserver.InterfaceRelationship']", 'blank': 'True'}),
+            'tags': ('djorm_pgarray.fields.ArrayField', [], {'default': '[]', 'dbtype': "u'text'", 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.VLAN']", 'on_delete': 'models.PROTECT'})
+        },
+        u'maasserver.interfacerelationship': {
+            'Meta': {'object_name': 'InterfaceRelationship'},
+            'child': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'parent_relationships'", 'to': u"orm['maasserver.Interface']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'children_relationships'", 'to': u"orm['maasserver.Interface']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.largefile': {
+            'Meta': {'object_name': 'LargeFile'},
+            'content': ('maasserver.fields.LargeObjectField', [], {}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sha256': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}),
+            'total_size': ('django.db.models.fields.BigIntegerField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.licensekey': {
+            'Meta': {'unique_together': "((u'osystem', u'distro_series'),)", 'object_name': 'LicenseKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'distro_series': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'license_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.node': {
+            'Meta': {'object_name': 'Node'},
+            'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31', 'null': 'True', 'blank': 'True'}),
+            'bios_boot_method': ('django.db.models.fields.CharField', [], {'max_length': '31', 'null': 'True', 'blank': 'True'}),
+            'block_poweroff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'boot_cluster_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'boot_disk': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'+'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['maasserver.PhysicalBlockDevice']", 'blank': 'True', 'null': 'True'}),
+            'boot_interface': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'+'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['maasserver.Interface']", 'blank': 'True', 'null': 'True'}),
+            'boot_type': ('django.db.models.fields.CharField', [], {'default': "u'fastpath'", 'max_length': '20'}),
+            'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'disable_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'enable_ssh': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'error_description': ('django.db.models.fields.TextField', [], {'default': "u''", 'blank': 'True'}),
+            'gateway_link_ipv4': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'+'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['maasserver.StaticIPAddress']", 'blank': 'True', 'null': 'True'}),
+            'gateway_link_ipv6': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'+'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': u"orm['maasserver.StaticIPAddress']", 'blank': 'True', 'null': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}),
+            'hwe_kernel': ('django.db.models.fields.CharField', [], {'max_length': '31', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'installable': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+            'license_key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'min_hwe_kernel': ('django.db.models.fields.CharField', [], {'max_length': '31', 'null': 'True', 'blank': 'True'}),
+            'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
+            'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "u'children'", 'null': 'True', 'blank': 'True', 'to': u"orm['maasserver.Node']"}),
+            'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'max_length': '32768', 'blank': 'True'}),
+            'power_state': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '10'}),
+            'power_state_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+            'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
+            'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}),
+            'skip_networking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'skip_storage': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
+            'swap_size': ('django.db.models.fields.BigIntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-a1d55db4-6e44-11e5-a1dc-c48e8ffbb365'", 'unique': 'True', 'max_length': '41'}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'})
+        },
+        u'maasserver.nodegroup': {
+            'Meta': {'object_name': 'NodeGroup'},
+            'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
+            'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}),
+            'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'default_disable_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'name': ('maasserver.models.nodegroup.DomainNameField', [], {'max_length': '80', 'blank': 'True'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
+        },
+        u'maasserver.nodegroupinterface': {
+            'Meta': {'unique_together': "((u'nodegroup', u'name'),)", 'object_name': 'NodeGroupInterface'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'foreign_dhcp_ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39'}),
+            'ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
+            'static_ip_range_high': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'static_ip_range_low': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'subnet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Subnet']", 'null': 'True', 'on_delete': 'models.PROTECT', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.VLAN']", 'on_delete': 'models.PROTECT'})
+        },
+        u'maasserver.partition': {
+            'Meta': {'object_name': 'Partition'},
+            'bootable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'partition_table': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'partitions'", 'to': u"orm['maasserver.PartitionTable']"}),
+            'size': ('django.db.models.fields.BigIntegerField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '36', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.partitiontable': {
+            'Meta': {'object_name': 'PartitionTable'},
+            'block_device': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BlockDevice']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'table_type': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '20'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.physicalblockdevice': {
+            'Meta': {'ordering': "[u'id']", 'object_name': 'PhysicalBlockDevice', '_ormbases': [u'maasserver.BlockDevice']},
+            u'blockdevice_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['maasserver.BlockDevice']", 'unique': 'True', 'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'serial': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        u'maasserver.space': {
+            'Meta': {'object_name': 'Space'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.sshkey': {
+            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        },
+        u'maasserver.sslkey': {
+            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSLKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        },
+        u'maasserver.staticipaddress': {
+            'Meta': {'object_name': 'StaticIPAddress'},
+            'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('maasserver.fields.MAASIPAddressField', [], {'default': 'None', 'max_length': '39', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'subnet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Subnet']", 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'maasserver.subnet': {
+            'Meta': {'unique_together': "((u'name', u'space'),)", 'object_name': 'Subnet'},
+            'cidr': ('maasserver.fields.CIDRField', [], {'unique': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'dns_servers': ('djorm_pgarray.fields.ArrayField', [], {'default': '[]', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
+            'gateway_ip': ('maasserver.fields.MAASIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'space': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Space']", 'on_delete': 'models.PROTECT'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.VLAN']", 'on_delete': 'models.PROTECT'})
+        },
+        u'maasserver.tag': {
+            'Meta': {'object_name': 'Tag'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'maasserver.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
+        },
+        u'maasserver.virtualblockdevice': {
+            'Meta': {'ordering': "[u'id']", 'object_name': 'VirtualBlockDevice', '_ormbases': [u'maasserver.BlockDevice']},
+            u'blockdevice_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['maasserver.BlockDevice']", 'unique': 'True', 'primary_key': 'True'}),
+            'filesystem_group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'virtual_devices'", 'to': u"orm['maasserver.FilesystemGroup']"}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
+        },
+        u'maasserver.vlan': {
+            'Meta': {'unique_together': "((u'vid', u'fabric'),)", 'object_name': 'VLAN'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'fabric': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Fabric']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'vid': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'maasserver.zone': {
+            'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'piston.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"})
+        },
+        u'piston.token': {
+            'Meta': {'object_name': 'Token'},
+            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1444367666L'}),
+            'token_type': ('django.db.models.fields.IntegerField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        }
+    }
+
+    complete_apps = ['maasserver']
 \ No newline at end of file
 
=== modified file 'src/maasserver/models/fabric.py'
--- src/maasserver/models/fabric.py	2015-08-13 23:00:22 +0000
+++ src/maasserver/models/fabric.py	2015-10-09 21:26:30 +0000
@@ -101,7 +101,7 @@
     objects = FabricManager()
 
     name = CharField(
-        max_length=256, unique=True, editable=True,
+        max_length=256, editable=True, null=True, blank=True,
         validators=[FABRIC_NAME_VALIDATOR])
 
     def __unicode__(self):
@@ -114,6 +114,13 @@
     def get_default_vlan(self):
         return self.vlan_set.all().order_by('id').first()
 
+    def get_name(self):
+        """Return the name of the fabric."""
+        if self.name:
+            return self.name
+        else:
+            return "fabric-%s" % self.id
+
     def delete(self):
         if self.is_default():
             raise ValidationError(
 
=== modified file 'src/maasserver/models/tests/test_fabric.py'
--- src/maasserver/models/tests/test_fabric.py	2015-08-28 02:34:50 +0000
+++ src/maasserver/models/tests/test_fabric.py	2015-10-09 21:26:30 +0000
@@ -90,6 +90,15 @@
 
 class TestFabric(MAASServerTestCase):
 
+    def test_get_name_for_empty_name(self):
+        fabric = factory.make_Fabric()
+        self.assertEquals("fabric-%s" % fabric.id, fabric.get_name())
+
+    def test_get_name_for_set_name(self):
+        name = factory.make_name('name')
+        fabric = factory.make_Fabric(name=name)
+        self.assertEquals(name, fabric.get_name())
+
     def test_creates_fabric_with_default_vlan(self):
         name = factory.make_name('name')
         fabric = factory.make_Fabric(name=name)
 
=== modified file 'src/maasserver/models/tests/test_vlan.py'
--- src/maasserver/models/tests/test_vlan.py	2015-08-28 02:34:50 +0000
+++ src/maasserver/models/tests/test_vlan.py	2015-10-09 21:26:30 +0000
@@ -34,6 +34,15 @@
 
 class VLANTest(MAASServerTestCase):
 
+    def test_get_name_for_default_vlan_is_untagged(self):
+        fabric = factory.make_Fabric()
+        self.assertEquals("untagged", fabric.get_default_vlan().get_name())
+
+    def test_get_name_for_set_name(self):
+        name = factory.make_name('name')
+        vlan = factory.make_VLAN(name=name)
+        self.assertEquals(name, vlan.get_name())
+
     def test_creates_vlan(self):
         name = factory.make_name('name')
         vid = random.randint(3, 55)
 
=== modified file 'src/maasserver/models/vlan.py'
--- src/maasserver/models/vlan.py	2015-06-19 09:53:30 +0000
+++ src/maasserver/models/vlan.py	2015-10-09 21:26:30 +0000
@@ -66,19 +66,18 @@
         verbose_name_plural = "VLANs"
         unique_together = (
             ('vid', 'fabric'),
-            ('name', 'fabric'),
         )
 
     name = CharField(
-        max_length=256, editable=True, validators=[VLAN_NAME_VALIDATOR])
+        max_length=256, editable=True, null=True, blank=True,
+        validators=[VLAN_NAME_VALIDATOR])
 
     vid = IntegerField(editable=True)
 
     fabric = ForeignKey('Fabric', blank=False, editable=True)
 
     def __unicode__(self):
-        return "name=%s, vid=%d, fabric=%s" % (
-            self.name, self.vid, self.fabric.name)
+        return "%s.%s" % (self.fabric.get_name(), self.get_name())
 
     def clean_vid(self):
         if self.vid < 0 or self.vid > 4095:
@@ -93,6 +92,13 @@
         """Is this the default VLAN in the fabric?"""
         return self.fabric.get_default_vlan() == self
 
+    def get_name(self):
+        """Return the name of the VLAN."""
+        if self.is_fabric_default():
+            return "untagged"
+        else:
+            return self.name
+
     def manage_connected_interfaces(self):
         """Deal with connected interfaces:
 
 
=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2015-10-06 05:50:44 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2015-10-09 21:26:30 +0000
@@ -61,6 +61,26 @@
 });
 
 
+// Filter that is specific to the NodeNetworkingController. Remove the default
+// VLAN if the interface is a VLAN interface.
+angular.module('MAAS').filter('removeDefaultVLANIfVLAN', function() {
+    return function(vlans, interfaceType) {
+        if(!angular.isString(interfaceType)) {
+            return vlans;
+        }
+        var filtered = [];
+        angular.forEach(vlans, function(vlan) {
+            if(interfaceType !== "vlan") {
+                filtered.push(vlan);
+            } else if(vlan.vid !== 0) {
+                filtered.push(vlan);
+            }
+        });
+        return filtered;
+    };
+});
+
+
 angular.module('MAAS').controller('NodeNetworkingController', [
     '$scope', '$filter', 'FabricsManager', 'VLANsManager', 'SubnetsManager',
     'NodesManager', 'GeneralManager', 'ManagerHelperService',
@@ -332,7 +352,8 @@
         // Return list of unused VLANs for an interface. Also remove the
         // ignoreVLANs from the returned list.
         function getUnusedVLANs(nic, ignoreVLANs) {
-            var vlans = $filter('filterByFabric')($scope.vlans, nic.fabric);
+            var vlans = $filter('removeDefaultVLAN')($scope.vlans);
+            vlans = $filter('filterByFabric')(vlans, nic.fabric);
             vlans = $filter('filterByUnusedForInterface')(
                 vlans, nic, $scope.originalInterfaces);
 
@@ -413,7 +434,9 @@
                 return "";
             }
 
-            if(angular.isString(vlan.name) && vlan.name.length > 0) {
+            if(vlan.vid === 0) {
+                return "untagged";
+            } else if(angular.isString(vlan.name) && vlan.name.length > 0) {
                 return vlan.vid + " (" + vlan.name + ")";
             } else {
                 return vlan.vid;
@@ -624,7 +647,8 @@
         // Return True if the interface IP address that the user typed is
         // invalid.
         $scope.isIPAddressInvalid = function(nic) {
-            return (nic.ip_address.length === 0 ||
+            return (!angular.isString(nic.ip_address) ||
+                nic.ip_address.length === 0 ||
                 !ValidationService.validateIP(nic.ip_address) ||
                 !ValidationService.validateIPInNetwork(
                     nic.ip_address, nic.subnet.cidr));
@@ -907,6 +931,7 @@
             } else {
                 $scope.selectedMode = SELECTION_MODE.NONE;
                 $scope.selectedInterfaces = [];
+                $scope.newInterface = {};
             }
         };
 
 
=== modified file 'src/maasserver/static/js/angular/controllers/subnets_list.js'
--- src/maasserver/static/js/angular/controllers/subnets_list.js	2015-10-06 22:24:06 +0000
+++ src/maasserver/static/js/angular/controllers/subnets_list.js	2015-10-09 21:26:30 +0000
@@ -104,7 +104,9 @@
         // Return the name name for the VLAN.
         function getVLANName(vlan) {
             var name = vlan.vid;
-            if(angular.isString(vlan.name) && vlan.name !== "") {
+            if(vlan.vid === 0) {
+                name = "untagged";
+            } else if(angular.isString(vlan.name) && vlan.name !== "") {
                 name += " (" + vlan.name + ")";
             }
             return name;
 
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2015-10-06 05:50:44 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2015-10-09 21:26:30 +0000
@@ -26,7 +26,7 @@
         expect(filterByUnusedForInterface(vlans)).toEqual([]);
     });
 
-    it("returns empty if undefined originalInterfaces", function() {
+    it("returns only free vlans", function() {
         var i, vlan, used_vlans = [], free_vlans = [], all_vlans = [];
         for(i = 0; i < 3; i++) {
             vlan = {
@@ -125,6 +125,48 @@
 });
 
 
+describe("removeDefaultVLANIfVLAN", function() {
+
+    // Load the MAAS module.
+    beforeEach(module("MAAS"));
+
+    // Load the removeDefaultVLANIfVLAN.
+    var removeDefaultVLANIfVLAN;
+    beforeEach(inject(function($filter) {
+        removeDefaultVLANIfVLAN = $filter("removeDefaultVLANIfVLAN");
+    }));
+
+    it("returns vlans if undefined type", function() {
+        var i, vlan, vlans = [];
+        for(i = 0; i < 3; i++) {
+            vlan = {
+                id: i,
+                vid: i,
+                fabric: 0
+            };
+            vlans.push(vlan);
+        }
+        expect(removeDefaultVLANIfVLAN(vlans)).toEqual(vlans);
+    });
+
+    it("removes default vlans from vlans", function() {
+        var i, vlan, vlans = [];
+        for(i = 0; i < 3; i++) {
+            vlan = {
+                id: i,
+                vid: i,
+                fabric: 0
+            };
+            vlans.push(vlan);
+        }
+
+        expect(
+            removeDefaultVLANIfVLAN(
+                vlans, "vlan")).toEqual([vlans[1], vlans[2]]);
+    });
+});
+
+
 describe("NodeNetworkingController", function() {
     // Load the MAAS module.
     beforeEach(module("MAAS"));
@@ -2498,10 +2540,11 @@
             var parent = {
                 id: makeInteger(0, 100)
             };
+            var subnet = {};
             $scope.newInterface = {
                 type: "alias",
                 mode: "auto",
-                subnet: {},
+                subnet: subnet,
                 parent: parent
             };
             $scope.selectedInterfaces = [{}];
@@ -2511,11 +2554,12 @@
             expect($scope.saveInterfaceLink).toHaveBeenCalledWith({
                 id: parent.id,
                 mode: "auto",
-                subnet: $scope.newInterface.subnet,
+                subnet: subnet,
                 ip_address: ""
             });
             expect($scope.selectedMode).toBeNull();
             expect($scope.selectedInterfaces).toEqual([]);
+            expect($scope.newInterface).toEqual({});
         });
 
         it("calls createVLANInterface with correct params", function() {
@@ -2523,16 +2567,18 @@
             var parent = {
                 id: makeInteger(0, 100)
             };
+            var vlan = {
+                id: makeInteger(0, 100)
+            };
+            var subnet = {
+                id: makeInteger(0, 100)
+            };
             $scope.newInterface = {
                 type: "vlan",
                 mode: "auto",
                 parent: parent,
-                vlan: {
-                    id: makeInteger(0, 100)
-                },
-                subnet: {
-                    id: makeInteger(0, 100)
-                }
+                vlan: vlan,
+                subnet: subnet
             };
             $scope.selectedInterfaces = [{}];
             $scope.selectedMode = "add";
@@ -2543,12 +2589,13 @@
             expect(NodesManager.createVLANInterface).toHaveBeenCalledWith(
                 node, {
                     parent: parent.id,
-                    vlan: $scope.newInterface.vlan.id,
+                    vlan: vlan.id,
                     mode: "auto",
-                    subnet: $scope.newInterface.subnet.id
+                    subnet: subnet.id
                 });
             expect($scope.selectedMode).toBeNull();
             expect($scope.selectedInterfaces).toEqual([]);
+            expect($scope.newInterface).toEqual({});
         });
 
         it("calls add again with type", function() {
 
=== added file 'src/maasserver/static/js/angular/filters/remove_default_vlan.js'
--- src/maasserver/static/js/angular/filters/remove_default_vlan.js	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/js/angular/filters/remove_default_vlan.js	2015-10-09 21:26:30 +0000
@@ -0,0 +1,17 @@
+/* Copyright 2015 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * MAAS Filter to remove the default VLAN as an option.
+ */
+
+angular.module('MAAS').filter('removeDefaultVLAN', function() {
+    return function(vlans) {
+        var filtered = [];
+        angular.forEach(vlans, function(vlan) {
+            if(vlan.vid !== 0) {
+                filtered.push(vlan);
+            }
+        });
+        return filtered;
+    };
+});
 
=== added file 'src/maasserver/static/js/angular/filters/tests/test_remove_default_vlan.js'
--- src/maasserver/static/js/angular/filters/tests/test_remove_default_vlan.js	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/js/angular/filters/tests/test_remove_default_vlan.js	2015-10-09 21:26:30 +0000
@@ -0,0 +1,30 @@
+/* Copyright 2015 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Unit tests for removeDefaultVLAN.
+ */
+
+describe("removeDefaultVLAN", function() {
+
+    // Load the MAAS module.
+    beforeEach(module("MAAS"));
+
+    // Load the removeDefaultVLAN.
+    var removeDefaultVLAN;
+    beforeEach(inject(function($filter) {
+        removeDefaultVLAN = $filter("removeDefaultVLAN");
+    }));
+
+    it("only returns vlans without vid 0", function() {
+        var i, vlan, vlans = [];
+        for(i = 0; i < 3; i++) {
+            vlan = {
+                id: i,
+                vid: i,
+                fabric: 0
+            };
+            vlans.push(vlan);
+        }
+        expect(removeDefaultVLAN(vlans)).toEqual([vlans[1], vlans[2]]);
+    });
+});
 
=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-10-09 07:58:28 +0000
+++ src/maasserver/static/partials/node-details.html	2015-10-09 21:26:30 +0000
@@ -340,9 +340,9 @@
                                     <label class="checkbox-label" for="{$ getUniqueKey(interface) $}"></label>
                                 </div>
                                 <div class="table__data table__column--15" data-ng-show="column == 'name'">
-                                    <span class="ng-hide" data-ng-show="interface.type == 'alias'">{$ interface.name $}</span>
+                                    <span class="ng-hide" data-ng-show="interface.type == 'alias' || interface.type == 'vlan'">{$ interface.name $}</span>
                                     <input type="text" class="table__input"
-                                        data-ng-show="interface.type != 'alias'"
+                                        data-ng-show="interface.type != 'alias' && interface.type != 'vlan'"
                                         data-ng-model="interface.name"
                                         data-maas-enter-blur
                                         data-ng-focus="setFocusInterface(interface)"
@@ -368,7 +368,7 @@
                                 <div class="table__data table__column--14">
                                     <select class="table__input" name="fabric" id="fabric"
                                         data-ng-model="interface.fabric"
-                                        data-ng-disabled="interface.type == 'alias'"
+                                        data-ng-disabled="interface.type == 'alias' || interface.type == 'vlan'"
                                         data-ng-change="fabricChanged(interface)"
                                         data-ng-options="fabric as fabric.name for fabric in fabrics">
                                     </select>
@@ -376,9 +376,9 @@
                                 <div class="table__data table__column--14">
                                     <select class="table__input" name="vlan" id="vlan"
                                         data-ng-model="interface.vlan"
-                                        data-ng-disabled="interface.type == 'alias'"
+                                        data-ng-disabled="interface.type == 'alias' || interface.vlan.vid === 0"
                                         data-ng-change="saveInterface(interface)"
-                                        data-ng-options="vlan as getVLANText(vlan) for vlan in vlans | filterByFabric:interface.fabric">
+                                        data-ng-options="vlan as getVLANText(vlan) for vlan in vlans | removeDefaultVLANIfVLAN:interface.type | filterByFabric:interface.fabric">
                                     </select>
                                 </div>
                                 <div class="table__data table__column--18">
@@ -453,7 +453,7 @@
                                             <select class="table__input" name="vlan" id="vlan"
                                                 data-ng-model="newInterface.vlan"
                                                 data-ng-disabled="newInterface.type == 'alias'"
-                                                data-ng-options="vlan as getVLANText(vlan) for vlan in vlans | filterByFabric:newInterface.parent.fabric | filterByUnusedForInterface:newInterface.parent:originalInterfaces"
+                                                data-ng-options="vlan as getVLANText(vlan) for vlan in vlans | removeDefaultVLAN | filterByFabric:newInterface.parent.fabric | filterByUnusedForInterface:newInterface.parent:originalInterfaces"
                                                 data-ng-show="newInterface.type === 'vlan'"
                                                 data-ng-change="addVLANChanged()">
                                             </select>
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/testing/factory.py	2015-10-09 21:26:30 +0000
@@ -709,8 +709,6 @@
         return fannetwork
 
     def make_Fabric(self, name=None):
-        if name is None:
-            name = self.make_name('fabric')
         fabric = Fabric(name=name)
         fabric.save()
         return fabric
@@ -727,8 +725,6 @@
 
     def make_VLAN(self, name=None, vid=None, fabric=None):
         assert vid != 0, "VID=0 VLANs are auto-created"
-        if name is None:
-            name = self.make_name('vlan')
         if fabric is None:
             fabric = Fabric.objects.get_default_fabric()
         if vid is None:
 
=== modified file 'src/maasserver/tests/test_forms_fabric.py'
--- src/maasserver/tests/test_forms_fabric.py	2015-08-13 19:29:08 +0000
+++ src/maasserver/tests/test_forms_fabric.py	2015-10-09 21:26:30 +0000
@@ -22,13 +22,6 @@
 
 class TestFabricForm(MAASServerTestCase):
 
-    def test__requires_name(self):
-        form = FabricForm({})
-        self.assertFalse(form.is_valid(), form.errors)
-        self.assertEquals({
-            "name": ["This field is required."]
-            }, form.errors)
-
     def test__creates_fabric(self):
         fabric_name = factory.make_name("fabric")
         form = FabricForm({
 
=== modified file 'src/maasserver/tests/test_forms_space.py'
--- src/maasserver/tests/test_forms_space.py	2015-09-01 18:29:48 +0000
+++ src/maasserver/tests/test_forms_space.py	2015-10-09 21:26:30 +0000
@@ -39,13 +39,13 @@
         self.assertEquals(space_name, space.name)
 
     def test__doest_require_name_on_update(self):
-        space = factory.make_Fabric()
+        space = factory.make_Space()
         form = SpaceForm(instance=space, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
     def test__updates_space(self):
         new_name = factory.make_name("space")
-        space = factory.make_Fabric()
+        space = factory.make_Space()
         form = SpaceForm(instance=space, data={
             "name": new_name,
         })
 
=== modified file 'src/maasserver/tests/test_forms_vlan.py'
--- src/maasserver/tests/test_forms_vlan.py	2015-08-18 15:55:43 +0000
+++ src/maasserver/tests/test_forms_vlan.py	2015-10-09 21:26:30 +0000
@@ -24,12 +24,11 @@
 
 class TestVLANForm(MAASServerTestCase):
 
-    def test__requires_name(self):
+    def test__requires_vid(self):
         fabric = factory.make_Fabric()
         form = VLANForm(fabric=fabric, data={})
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEquals({
-            "name": ["This field is required."],
             "vid": [
                 "This field is required.",
                 "Vid must be between 0 and 4095.",
@@ -55,6 +54,16 @@
         form = VLANForm(instance=vlan, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
+    def test__cannot_edit_default_vlan(self):
+        fabric = factory.make_Fabric()
+        form = VLANForm(instance=fabric.get_default_vlan(), data={})
+        self.assertFalse(form.is_valid(), form.errors)
+        self.assertEquals({
+            "__all__": [
+                "Cannot modify the default VLAN for a fabric.",
+                ],
+            }, form.errors)
+
     def test__updates_vlan(self):
         vlan = factory.make_VLAN()
         new_name = factory.make_name("vlan")
 
=== modified file 'src/maasserver/websockets/handlers/fabric.py'
--- src/maasserver/websockets/handlers/fabric.py	2015-10-04 22:28:33 +0000
+++ src/maasserver/websockets/handlers/fabric.py	2015-10-09 21:26:30 +0000
@@ -35,6 +35,7 @@
             ]
 
     def dehydrate(self, obj, data, for_list=False):
+        data["name"] = obj.get_name()
         data["vlan_ids"] = [
             vlan.id
             for vlan in obj.vlan_set.all()
 
=== modified file 'src/maasserver/websockets/handlers/tests/test_fabric.py'
--- src/maasserver/websockets/handlers/tests/test_fabric.py	2015-09-16 20:59:38 +0000
+++ src/maasserver/websockets/handlers/tests/test_fabric.py	2015-10-09 21:26:30 +0000
@@ -26,7 +26,7 @@
     def dehydrate_fabric(self, fabric):
         data = {
             "id": fabric.id,
-            "name": fabric.name,
+            "name": fabric.get_name(),
             "updated": dehydrate_datetime(fabric.updated),
             "created": dehydrate_datetime(fabric.created),
             "vlan_ids": [
 
=== modified file 'src/maasserver/websockets/handlers/tests/test_vlan.py'
--- src/maasserver/websockets/handlers/tests/test_vlan.py	2015-09-16 20:59:38 +0000
+++ src/maasserver/websockets/handlers/tests/test_vlan.py	2015-10-09 21:26:30 +0000
@@ -26,7 +26,7 @@
     def dehydrate_vlan(self, vlan):
         data = {
             "id": vlan.id,
-            "name": vlan.name,
+            "name": vlan.get_name(),
             "vid": vlan.vid,
             "fabric": vlan.fabric_id,
             "updated": dehydrate_datetime(vlan.updated),
 
=== modified file 'src/maasserver/websockets/handlers/vlan.py'
--- src/maasserver/websockets/handlers/vlan.py	2015-09-16 20:59:38 +0000
+++ src/maasserver/websockets/handlers/vlan.py	2015-10-09 21:26:30 +0000
@@ -36,6 +36,7 @@
             ]
 
     def dehydrate(self, obj, data, for_list=False):
+        data["name"] = obj.get_name()
         data["subnet_ids"] = [
             subnet.id
             for subnet in obj.subnet_set.all()