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

[LaMont Jones]

On the details page for the default VLAN of a fabric, do not offer "Drop VLAN" as an action.

On the details page for the default VLAN of a fabric, do not offer "Drop VLAN" as an action.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[LaMont Jones (lamont)]

replied to comment.

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1589587 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [94.5 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 189 kB in 0s (389 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr 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-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-netaddr python3-netifaces python3-novaclient 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-simplejson 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-2ubuntu3).
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
bzr is already the newest version (2.7.0-2ubuntu1).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
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-5ubuntu12).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubunt...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1589587 into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [94.5 kB]
Get:3 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 189 kB in 0s (445 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr 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-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-netaddr python3-netifaces python3-novaclient 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-simplejson 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-2ubuntu3).
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
bzr is already the newest version (2.7.0-2ubuntu1).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
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-5ubuntu12).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubunt...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1589587 into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [94.5 kB]
Hit:3 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 94.5 kB in 0s (193 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr 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-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-netaddr python3-netifaces python3-novaclient 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-simplejson 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-2ubuntu3).
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
bzr is already the newest version (2.7.0-2ubuntu1).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
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-5ubuntu12).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
pyth...

=== modified file 'src/maasserver/models/fabric.py'
--- src/maasserver/models/fabric.py	2016-04-27 20:18:20 +0000
+++ src/maasserver/models/fabric.py	2016-06-13 14:21:41 +0000
@@ -184,6 +184,8 @@
         return self.id == 0
 
     def get_default_vlan(self):
+        # This logic is replicated in the dehydrate() function of the
+        # websockets handler.
         return self.vlan_set.all().order_by('id').first()
 
     def get_name(self):

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-05-23 08:05:13 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-06-13 14:21:41 +0000
@@ -445,7 +445,7 @@
 
         // Return the default VLAN for a fabric.
         function getDefaultVLAN(fabric) {
-            return VLANsManager.getItemFromList(fabric.vlan_ids[0]);
+            return VLANsManager.getItemFromList(fabric.default_vlan_id);
         }
 
         // Return list of unused VLANs for an interface. Also remove the

=== modified file 'src/maasserver/static/js/angular/controllers/subnet_details.js'
--- src/maasserver/static/js/angular/controllers/subnet_details.js	2016-05-12 19:07:37 +0000
+++ src/maasserver/static/js/angular/controllers/subnet_details.js	2016-06-13 14:21:41 +0000
@@ -87,7 +87,7 @@
                 // Fabric changed, the websocket expects VLAN to be updated, so
                 // we set the VLAN to the default VLAN for the new fabric.
                 subnet.vlan = FabricsManager.getItemFromList(
-                    subnet.fabric).vlan_ids[0];
+                    subnet.fabric).default_vlan_id;
             }
             return subnet;
         };

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js	2016-06-09 19:38:53 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js	2016-06-13 14:21:41 +0000
@@ -181,6 +181,7 @@
             { id: 0, name:"subnet1", vlan: 1, space: 0, cidr: "10.20.0.0/16" }
         ];
         fabric.vlan_ids = [1];
+        fabric.default_vlan_id = 1;
         spaces[0].subnet_ids = [0];
         SpacesManager._items.push(spaces[0]);
         VLANsManager._items.push(vlans[0]);
@@ -197,6 +198,7 @@
     it("updates $scope.rows with VLANs containing no subnet(s)", function() {
         var vlans = [ { id: 1, name: "vlan4", vid: 4, fabric: fabric.id } ];
         fabric.vlan_ids = [1];
+        fabric.default_vlan_id = 1;
         VLANsManager._items.push(vlans[0]);
         var controller = makeControllerResolveSetActiveItem();
         $rootScope.$digest();

=== 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	2016-05-23 08:05:13 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2016-06-13 14:21:41 +0000
@@ -1797,6 +1797,7 @@
             var controller = makeController();
             var fabric = {
                 id: 0,
+                default_vlan_id: 0,
                 vlan_ids: [0]
             };
             var vlan = {
@@ -1818,6 +1819,7 @@
             var controller = makeController();
             var fabric = {
                 id: 0,
+                default_vlan_id: 0,
                 vlan_ids: [0]
             };
             var vlan = {
@@ -3733,7 +3735,10 @@
         it("sets mode to create-physical", function() {
             var controller = makeController();
             var vlan = { id: 0, fabric: 0 };
-            var fabric = { id: 0, name: makeName("fabric"), vlan_ids: [0] };
+            var fabric = {
+                id: 0, name: makeName("fabric"),
+                default_vlan_id: 0, vlan_ids: [0]
+            };
             VLANsManager._items = [vlan];
             $scope.fabrics = [fabric];
             $scope.selectedMode = null;
@@ -3744,7 +3749,10 @@
         it("creates the newInterface", function() {
             var controller = makeController();
             var vlan = { id: 0, fabric: 0 };
-            var fabric = { id: 0, name: makeName("fabric"), vlan_ids: [0] };
+            var fabric = {
+                id: 0, name: makeName("fabric"),
+                default_vlan_id: 0, vlan_ids: [0]
+            };
             VLANsManager._items = [vlan];
             $scope.fabrics = [fabric];
             $scope.selectedMode = null;
@@ -3767,7 +3775,10 @@
         it("sets newInterface.vlan with new fabric", function() {
             var controller = makeController();
             var vlan = { id: 0, fabric: 0 };
-            var fabric = { id: 0, name: makeName("fabric"), vlan_ids: [0] };
+            var fabric = {
+                id: 0, name: makeName("fabric"),
+                default_vlan_id: 0, vlan_ids: [0]
+            };
             VLANsManager._items = [vlan];
             $scope.newInterface.fabric = fabric;
             $scope.newInterface.subnet = {};

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js	2016-05-12 19:07:37 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js	2016-06-13 14:21:41 +0000
@@ -256,6 +256,7 @@
             };
             var fabric = {
                 id: makeInteger(0, 100),
+                default_vlan_id: vlan.id,
                 vlan_ids: [vlan.id]
             };
             FabricsManager._items.push(fabric);

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_vlan_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_vlan_details.js	2016-04-22 17:28:15 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_vlan_details.js	2016-06-13 14:21:41 +0000
@@ -80,6 +80,7 @@
             system_id: sid,
             hostname: name,
             node_type: 2,
+            default_vlan_id: VLAN_ID,
             vlan_ids: [VLAN_ID]
         };
         ControllersManager._items.push(rack);

=== modified file 'src/maasserver/static/js/angular/controllers/vlan_details.js'
--- src/maasserver/static/js/angular/controllers/vlan_details.js	2016-05-12 19:07:37 +0000
+++ src/maasserver/static/js/angular/controllers/vlan_details.js	2016-06-13 14:21:41 +0000
@@ -420,7 +420,9 @@
                     vm.PROVIDE_DHCP_ACTION.title = "Provide DHCP";
                 }
                 vm.actionOptions.push(vm.PROVIDE_DHCP_ACTION);
-                vm.actionOptions.push(vm.DELETE_ACTION);
+                if(!vm.isFabricDefault) {
+                    vm.actionOptions.push(vm.DELETE_ACTION);
+                }
             }
         }
 
@@ -428,6 +430,7 @@
         function vlanLoaded(vlan) {
             vm.vlan = vlan;
             vm.fabric = FabricsManager.getItemFromList(vlan.fabric);
+            vm.isFabricDefault = vm.fabric.default_vlan_id === vm.vlan.id;
             vm.loaded = true;
 
             updateTitle();

=== modified file 'src/maasserver/websockets/handlers/fabric.py'
--- src/maasserver/websockets/handlers/fabric.py	2016-05-11 19:01:48 +0000
+++ src/maasserver/websockets/handlers/fabric.py	2016-06-13 14:21:41 +0000
@@ -44,6 +44,9 @@
             vlan.id
             for vlan in obj.vlan_set.all()
         ])
+        # Pass the default vlan id explicitly, so that we don't reproduce the
+        # logic in the javascript.
+        data["default_vlan_id"] = data["vlan_ids"][0]
         return data
 
     def delete(self, parameters):

=== modified file 'src/maasserver/websockets/handlers/tests/test_fabric.py'
--- src/maasserver/websockets/handlers/tests/test_fabric.py	2016-04-28 13:34:34 +0000
+++ src/maasserver/websockets/handlers/tests/test_fabric.py	2016-06-13 14:21:41 +0000
@@ -27,6 +27,7 @@
                 for vlan in fabric.vlan_set.all()
             ]),
         }
+        data["default_vlan_id"] = data["vlan_ids"][0]
         return data
 
     def test_get(self):