Merge lp:~blake-rouse/maas/external-dhcp-api-and-ui into lp:~maas-committers/maas/trunk

[Blake Rouse]

Show external_dhcp over the API and on the VLAN details page. Allow saving the IP address of the external DHCP instead of whether it is present or not.

[LaMont Jones (lamont)]

lgtm

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/external-dhcp-api-and-ui into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash 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 postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.117ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
bind9 is already the newest version (1:9.10.3.dfsg.P4-5).
bind9utils is already the newest version (1:9.10.3.dfsg.P4-5).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
dh-apport is already the newest version (2.20.1-0ubuntu1).
dh-systemd is already the newest version (1.29ubuntu1).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P4-5).
firefox is already the newest version (45.0.1+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
isc-dhcp-common is already the newest version (4.3.3-5ubuntu11).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-jquery-hotke...

=== modified file 'src/maasserver/api/vlans.py'
--- src/maasserver/api/vlans.py	2016-02-17 16:12:30 +0000
+++ src/maasserver/api/vlans.py	2016-04-06 15:06:15 +0000
@@ -25,6 +25,7 @@
     'primary_rack',
     'secondary_rack',
     'dhcp_on',
+    'external_dhcp',
 )
 
 

=== modified file 'src/maasserver/migrations/builtin/maasserver/0049_add_external_dhcp_present_to_vlan.py'
--- src/maasserver/migrations/builtin/maasserver/0049_add_external_dhcp_present_to_vlan.py	2016-04-05 19:06:56 +0000
+++ src/maasserver/migrations/builtin/maasserver/0049_add_external_dhcp_present_to_vlan.py	2016-04-06 15:06:15 +0000
@@ -6,8 +6,6 @@
     models,
 )
 import django.db.models.deletion
-import maasserver.models.interface
-import maasserver.models.subnet
 
 
 class Migration(migrations.Migration):
@@ -25,11 +23,11 @@
         migrations.AlterField(
             model_name='interface',
             name='vlan',
-            field=models.ForeignKey(to='maasserver.VLAN', on_delete=django.db.models.deletion.PROTECT, default=maasserver.models.interface.get_default_vlan),
+            field=models.ForeignKey(to='maasserver.VLAN', on_delete=django.db.models.deletion.PROTECT, default=0),
         ),
         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),
+            field=models.ForeignKey(to='maasserver.VLAN', on_delete=django.db.models.deletion.PROTECT, default=0),
         ),
     ]

=== added file 'src/maasserver/migrations/builtin/maasserver/0050_modify_external_dhcp_on_vlan.py'
--- src/maasserver/migrations/builtin/maasserver/0050_modify_external_dhcp_on_vlan.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0050_modify_external_dhcp_on_vlan.py	2016-04-06 15:06:15 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+import django.db.models.deletion
+import maasserver.fields
+import maasserver.models.interface
+import maasserver.models.subnet
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0049_add_external_dhcp_present_to_vlan'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='vlan',
+            name='external_dhcp_present',
+        ),
+        migrations.AddField(
+            model_name='vlan',
+            name='external_dhcp',
+            field=maasserver.fields.MAASIPAddressField(null=True, editable=False, default=None, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='interface',
+            name='vlan',
+            field=models.ForeignKey(to='maasserver.VLAN', on_delete=django.db.models.deletion.PROTECT, default=maasserver.models.interface.get_default_vlan),
+        ),
+        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-04-05 16:36:13 +0000
+++ src/maasserver/models/vlan.py	2016-04-06 15:06:15 +0000
@@ -22,6 +22,7 @@
 )
 from django.db.models.query import QuerySet
 from maasserver import DefaultMeta
+from maasserver.fields import MAASIPAddressField
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.fabric import Fabric
 from maasserver.models.interface import VLANInterface
@@ -162,7 +163,8 @@
 
     dhcp_on = BooleanField(default=False, editable=True)
 
-    external_dhcp_present = BooleanField(default=False, editable=False)
+    external_dhcp = MAASIPAddressField(
+        null=True, editable=False, blank=True, default=None)
 
     primary_rack = ForeignKey(
         'RackController', null=True, blank=True, editable=True,

=== modified file 'src/maasserver/static/partials/vlan-details.html'
--- src/maasserver/static/partials/vlan-details.html	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/partials/vlan-details.html	2016-04-06 15:06:15 +0000
@@ -175,6 +175,12 @@
            </dl>
             <dl class="six-col last-col">
                 <dt class="two-col">DHCP</dt><dd class="four-col last-col">{$ vlanDetails.vlan.dhcp_on ? "Enabled" : "Disabled" $}</dd>
+                <div data-ng-if="vlanDetails.vlan.external_dhcp">
+                    <dt class="two-col">External DHCP</dt>
+                    <dd class="four-col last-col">{$ vlanDetails.vlan.external_dhcp $}
+                        <i class="icon warning tooltip" data-tooltip="Another DHCP server has been discovered on this VLAN. Enabling DHCP is not recommended."></i>
+                    </dd>
+                </div>
                 <div class="ng-hide" data-ng-show="vlanDetails.primaryRack">
                     <dt class="two-col">Primary controller</dt><dd class="four-col last-col">{$ vlanDetails.primaryRack.hostname $}</dd>
                 </div>

=== modified file 'src/maasserver/websockets/handlers/tests/test_vlan.py'
--- src/maasserver/websockets/handlers/tests/test_vlan.py	2016-04-05 20:12:59 +0000
+++ src/maasserver/websockets/handlers/tests/test_vlan.py	2016-04-06 15:06:15 +0000
@@ -32,7 +32,7 @@
             "updated": dehydrate_datetime(vlan.updated),
             "created": dehydrate_datetime(vlan.created),
             "dhcp_on": vlan.dhcp_on,
-            "external_dhcp_present": vlan.external_dhcp_present,
+            "external_dhcp": vlan.external_dhcp,
             "primary_rack": vlan.primary_rack,
             "secondary_rack": vlan.secondary_rack,
             "subnet_ids": sorted([