Merge ~andreserl/maas:2.3_chassis_config_on_power_on into maas:master

[Andres Rodriguez]

Unmerged commits

8c67adc... by Andres Rodriguez on 2018-04-09

Only issue ipmi_chassis_config on power on.

914c0b2... by Mike Pontillo on 2018-04-11

LP: #1753493 - Make region IP addresses consistent for HA.

Backports: 5000bb58ea91af41b2465dc3d17aa2388a5edbaa

f745516... by Andres Rodriguez on 2018-04-06

Open 2.3.3; Update changelog to reflect release

e93e044... by Lee Trager on 2018-04-05

Backport: 89f12d9 LP: #1738127 Add favicon to the UI

c948da2... by Andres Rodriguez on 2018-04-04

Backport c70ed068a and 84a9fd27e

LP: #1750622 - Add ability to force the BIOS boot method, and auto discover it during enlistment/commissioning

7b7104a... by Mike Pontillo on 2018-04-04

Fix random failures in test_stats.py.

007a4fe... by Andres Rodriguez on 2018-04-04

Backport d2f6dd9cff9072c27549fd9aff6e82994a5f0ebe from master

Calculate the total amount of machine resources.-

7eb70a8... by Mike Pontillo on 2018-04-03

LP: #1704501 - Allow users to change which Fabric a VLAN is on.

Backports: 4083dc0635958109a28ef44a84df63e855007335

06b71f4... by Mike Pontillo on 2018-04-03

LP #1755587 - Allow moving a subnet to a different fabric in the UI.

Backports: 544aaae99fdb5954762980c2d93f5ae5b12d0b8a

13492bb... by Andres Rodriguez on 2018-03-31

debian/changelog: Update to correctly create dailybuilds

diff --git a/debian/changelog b/debian/changelog
index 35034de..725fbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 maas (2.4.0~beta2-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
@@ -36,6 +37,27 @@ maas (2.4.0~alpha1-6573-g12ee2331b-0ubuntu1) bionic; urgency=medium
  -- Andres Rodriguez <[e-mail]>  Fri, 09 Feb 2018 18:50:10 -0500
 
 maas (2.3.0-6434-gd354690-0ubuntu1) bionic; urgency=medium
+=======
+maas (2.3.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * UNRELEASED
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 06 Apr 2018 09:56:53 -0400
+
+maas (2.3.2-6485-ge93e044-0ubuntu1) artful; urgency=medium
+
+  * New upstream release, MAAS 2.3.2
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 06 Apr 2018 09:55:14 -0400
+
+maas (2.3.1-6470-g036d646-0ubuntu1) artful; urgency=medium
+
+  * New upstream release, MAAS 2.3.1
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 05 Mar 2018 10:25:44 -0500
+
+maas (2.3.0-6434-gd354690-0ubuntu1) artful; urgency=medium
+>>>>>>> debian/changelog
 
   * New upstream release, MAAS 2.3.0:
     - Add support for CentOS & Windows networking.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 913fb0b..e277a0c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -131,6 +131,15 @@ parts:
     source: src/maasserver/static
     organize:
       '*': usr/share/maas/web/static/
+<<<<<<< snap/snapcraft.yaml
+=======
+  twisted-plugins:
+    plugin: dump
+    source: twisted/plugins
+    organize:
+      maasrackd.py: usr/lib/python3/dist-packages/twisted/plugins/maasrackd.py
+      maasregiond.py: usr/lib/python3/dist-packages/twisted/plugins/maasregiond.py
+>>>>>>> snap/snapcraft.yaml
   snap:
     plugin: dump
     source: snap
diff --git a/src/maasserver/bootsources.py b/src/maasserver/bootsources.py
index f71040f..1e11784 100644
--- a/src/maasserver/bootsources.py
+++ b/src/maasserver/bootsources.py
@@ -26,7 +26,10 @@ from maasserver.models import (
     Config,
     Notification,
 )
+<<<<<<< src/maasserver/bootsources.py
 from maasserver.models.timestampedmodel import now
+=======
+>>>>>>> src/maasserver/bootsources.py
 from maasserver.utils import get_maas_user_agent
 from maasserver.utils.orm import transactional
 from maasserver.utils.threads import deferToDatabase
diff --git a/src/maasserver/models/tests/test_userprofile.py b/src/maasserver/models/tests/test_userprofile.py
index 8a0efac..4bf4730 100644
--- a/src/maasserver/models/tests/test_userprofile.py
+++ b/src/maasserver/models/tests/test_userprofile.py
@@ -139,6 +139,7 @@ class UserProfileTest(MAASServerTestCase):
         self.assertEqual(reload_object(node).owner, new_user)
         self.assertEqual(reload_object(ipaddress).user, new_user)
         self.assertEqual(reload_object(iprange).user, new_user)
+<<<<<<< src/maasserver/models/tests/test_userprofile.py
 
     def test_transfer_resources_missing_target_access(self):
         user = factory.make_User()
@@ -153,6 +154,8 @@ class UserProfileTest(MAASServerTestCase):
             " resource pool(s)")
         # owner didn't change
         self.assertEqual(reload_object(node).owner, user)
+=======
+>>>>>>> src/maasserver/models/tests/test_userprofile.py
 
     def test_manager_all_users(self):
         users = set(factory.make_User() for _ in range(3))
diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 5b5f1de..9a51bf3 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -280,10 +280,15 @@ def get_config(
             osystem = configs['commissioning_osystem']
             series = configs['commissioning_distro_series']
         else:
+<<<<<<< src/maasserver/rpc/boot.py
             osystem = machine.get_osystem(
                 default=configs['default_osystem'])
             series = machine.get_distro_series(
                 default=configs['default_distro_series'])
+=======
+            osystem = machine.get_osystem()
+            series = machine.get_distro_series()
+>>>>>>> src/maasserver/rpc/boot.py
             # XXX: roaksoax LP: #1739761 - Since the switch to squashfs (and
             # drop of iscsi), precise is no longer deployable. To address a
             # squashfs image is made available allowing it to be deployed in
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js b/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
index 90845d5..101cefd 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
@@ -1584,6 +1584,7 @@ describe("NodesListController", function() {
             it("sets showing_confirmation with testOptions",
                 function() {
                     var controller = makeController();
+<<<<<<< src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
                     var object = makeObject("machines");
                     object.status_code = 6;
                     var spy = spyOn(
@@ -1598,6 +1599,22 @@ describe("NodesListController", function() {
                             true);
                     expect($scope.tabs[
                         "machines"].actionProgress.affected_nodes).toBe(1);
+=======
+                    var object = makeObject("nodes");
+                    object.status_code = 6;
+                    var spy = spyOn(
+                        $scope.tabs.nodes.manager,
+                        "performAction").and.returnValue(
+                            $q.defer().promise);
+                    $scope.tabs.nodes.actionOption = { name: "test" };
+                    $scope.tabs.nodes.selectedItems = [object];
+                    $scope.actionGo("nodes");
+                    expect($scope.tabs[
+                        "nodes"].actionProgress.showing_confirmation).toBe(
+                            true);
+                    expect($scope.tabs[
+                        "nodes"].actionProgress.affected_nodes).toBe(1);
+>>>>>>> src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
                     expect(spy).not.toHaveBeenCalled();
             });
 
diff --git a/src/maasserver/static/partials/ipranges.html b/src/maasserver/static/partials/ipranges.html
index b159b50..a8cb02b 100755
--- a/src/maasserver/static/partials/ipranges.html
+++ b/src/maasserver/static/partials/ipranges.html
@@ -15,6 +15,7 @@
         <tbody>
             <tr data-ng-repeat="iprange in (subnetIPRanges = ipranges | filterBySubnetOrVlan:subnet:vlan) | orderBy:ipRangeSort"
                 data-ng-class="{ 'is-active': isIPRangeInEditMode(iprange) || isIPRangeInDeleteMode(iprange)}">
+<<<<<<< src/maasserver/static/partials/ipranges.html
                 <td class="col-2" aria-label="Start IP Address">{$ iprange.start_ip $}</td>
                 <td class="col-2" aria-label="End IP Address">{$ iprange.end_ip $}</td>
                 <td class="col-1" aria-label="Owner">{$ iprange.type == "dynamic" ? "MAAS" : iprange.user $}</td>
@@ -30,6 +31,22 @@
                             data-ng-click="toggleMenu(); ipRangeEnterDeleteMode(iprange)">
                             <i class="p-icon--delete">Remove</i>
                         </button>
+=======
+                <div class="table__data table-col--20" aria-label="Start IP Address">{$ iprange.start_ip $}</div>
+                <div class="table__data table-col--20" aria-label="End IP Address">{$ iprange.end_ip $}</div>
+                <div class="table__data table-col--10" aria-label="Owner">{$ iprange.type == "dynamic" ? "MAAS" : iprange.user $}</div>
+                <div class="table__data table-col--10" aria-label="Type">{$ iprange.type == "dynamic" ? "Dynamic" : "Reserved" $}</div>
+                <div class="table__data table-col--31" aria-label="Comment">{$ iprange.type == "dynamic" ? "Dynamic" : iprange.comment $}</div>
+                <div class="table__data table-col--9 table--mobile-controls">
+                    <div class="table__controls" toggle-ctrl data-ng-if="ipRangeCanBeModified(iprange)">
+                        <button class="table__controls-toggle" data-ng-click="toggleMenu()">View actions</button>
+                        <div class="table__controls-menu" role="menu" data-ng-show="isToggled">
+                            <button class="table__controls-action" aria-label="Edit row"
+                                data-ng-click="toggleMenu(); ipRangeToggleEditMode(iprange)">Edit reserved range</button>
+                            <button class="table__controls-action u-text--error" aria-label="Remove"
+                                data-ng-click="toggleMenu(); ipRangeEnterDeleteMode(iprange)">Remove range</button>
+                        </div>
+>>>>>>> src/maasserver/static/partials/ipranges.html
                     </div>
                 </td>
                 <td class="is-active p-table-expanding__panel col-12" col-span="6" data-ng-if="isIPRangeInDeleteMode(iprange)">
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index ed62f6f..c52716d 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -98,6 +98,7 @@
                                 </ul>
                             </div>
 
+<<<<<<< src/maasserver/static/partials/node-details.html
                             <div class="col-12 u-no-margin--left" data-ng-show="action.option.name === 'deploy' || action.option.name === 'release'">
                                 <div class="ng-hide" data-ng-show="action.option.name === 'deploy'">
                                     <div data-maas-os-select="osinfo" data-ng-model="osSelection"></div>
@@ -235,6 +236,139 @@
                 </div>
             </div>
         </div>
+=======
+            <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+             <div class="page-header__dropdown" data-ng-class="{ 'is-open': action.option }">
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-if="!isDevice && !node.dhcp_on">
+                       <p class="page-header__message page-header__message--warning">MAAS is not providing DHCP.</p>
+                 </div>
+
+                 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(action.option.name)">
+                     <form class="form form--inline u-display--inline">
+                         <fieldset class="form__fieldset ng-hide" data-ng-show="action.option.name === 'commission' || action.option.name === 'test'">
+                             <div class="form__group">
+                                 <input class="checkbox" id="enableSSH" type="checkbox"
+                                     data-ng-model="commissionOptions.enableSSH">
+                                 <label for="enableSSH">Allow SSH access and prevent machine from powering off</label>
+                             </div>
+                         </fieldset>
+                         <fieldset class="form__fieldset ng-hide" data-ng-show="action.option.name === 'commission'">
+                             <div class="form__group">
+                                 <input class="checkbox" id="skipNetworking" type="checkbox"
+                                     data-ng-model="commissionOptions.skipNetworking">
+                                 <label for="skipNetworking">Retain network configuration</label>
+                             </div>
+                             <div class="form__group">
+                                 <input class="checkbox" id="skipStorage" type="checkbox"
+                                     data-ng-model="commissionOptions.skipStorage">
+                                 <label for="skipStorage">Retain storage configuration</label>
+                             </div>
+                         </fieldset>
+                         <fieldset class="form__fieldset ng-hide" data-ng-show="action.option.name === 'deploy'">
+                             <div class="form__group">
+                                 <label class="form__group-label">Choose your image</label>
+                                 <div class="form__group-input" data-maas-os-select="osinfo" data-ng-model="osSelection"></div>
+                             </div>
+                         </fieldset>
+                         <fieldset class="form__fieldset" data-ng-if="action.option.name === 'release'">
+                             <div class="form__group">
+                                 <div data-maas-release-options="releaseOptions"></div>
+                             </div>
+                         </fieldset>
+                         <div class="page-header__controls" data-ng-if="action.option.name !== 'commission' && action.option.name !== 'test'">
+                             <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
+                             <button class="button--inline" data-ng-class="action.option.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">
+                                 <span data-ng-if="action.option.name === 'acquire'">Acquire {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'deploy'">Deploy {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'release'">Release {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'set-zone'">Set zone for {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'on'">Power on {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'off'">Power off {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'abort'">Abort action on {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'rescue-mode'">Rescue {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'exit-rescue-mode'">Exit rescue mode</span>
+                                 <span data-ng-if="action.option.name === 'mark-broken'">Mark {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'mark-fixed'">Mark {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'override-failed-testing'">Override failed testing</span>
+                                 <span data-ng-if="action.option.name === 'delete'">Delete {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'import-images'">Import images</span>
+                             </button>
+                         </div>
+                     </form>
+                 </div>
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(action.option.name) || action.option.name !== 'commission'" data-ng-if="hasCustomCommissioningScripts()">
+                     <form class="form form--stack">
+                         <fieldset class="form__fieldset eight-col u-margin--bottom-small">
+                             <div class="form__group">
+                                 <label for="commissioning-scripts">Additional commissioning scripts</label>
+                                 <span id="commissioning-scripts" data-maas-script-select="script" data-script-type="0" data-ng-model="commissioningSelection" class="tags--inline"></span>
+                             </div>
+                         </fieldset>
+                     </form>
+                 </div>
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(action.option.name) || (action.option.name !== 'commission' && action.option.name !== 'test')">
+                     <form class="form form--stack">
+                         <fieldset class="form__fieldset eight-col u-margin--bottom-small">
+                             <div class="form__group">
+                                 <label>Hardware tests</label>
+                                 <span id="testing-scripts" data-maas-script-select="script" data-script-type="2" data-ng-model="testSelection" class="tags--inline"></span>
+                             </div>
+                         </fieldset>
+                     </form>
+                 </div>
+                 <div class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(action.option.name)" data-ng-if="action.option.name === 'commission' || action.option.name === 'test'">
+                     <form class="form form--inline">
+                         <div class="page-header__controls">
+                             <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
+                             <button class="button--inline" data-ng-class="action.option.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">
+                                 <span data-ng-if="action.option.name === 'commission'">Commission {$ type_name $}</span>
+                                 <span data-ng-if="action.option.name === 'test'">Test {$ type_name $}</span>
+                             </button>
+                         </div>
+                     </form>
+                 </div>
+		 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="action.showing_confirmation && action.option.name === 'test'">
+                     <p class="page-header__message page-header__message--warning">
+                         Node is currently deployed. Are you sure you want to continue to test hardware?
+                     </p>
+                     <div class="page-header__controls">
+                         <button class="button--base button--inline" data-ng-click="actionCancel()">No</button>
+                         <button class="button--secondary button--inline" data-ng-click="actionGo()">Yes</button>
+                     </div>
+                 </div>
+                 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError()">
+                     <p class="page-header__message page-header__message--error">
+                         Node failed to be {$ action.option.sentence $}, because of the following error: {$ action.error $}
+                     </p>
+                     <div class="page-header__controls">
+                         <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
+                         <button class="button--secondary button--inline" data-ng-click="actionGo()">Retry</button>
+                     </div>
+                 </div>
+
+                 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isDeployError()">
+                     <p class="page-header__message page-header__message--error">
+                         Node cannot be {$ action.option.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="images/">images page</a>.
+                     </p>
+                     <div class="page-header__controls">
+                         <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
+                     </div>
+                 </div>
+
+                 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionPowerError(action.option.name)">
+                     <p class="page-header__message page-header__message--error">
+                         Node cannot be {$ action.option.sentence $}, because power control software for the
+                         node is missing from its rack controller. To proceed, install the
+                         {$ getPowerErrors() $} on the rack controller.
+                     </p>
+                     <div class="page-header__controls">
+                         <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
+                     </div>
+                 </div>
+>>>>>>> src/maasserver/static/partials/node-details.html
 
         <nav class="p-tabs">
             <ul class="p-tabs__list" role="tablist" data-ng-class="{ 'u-hide': action.option }">
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index d49f11c..e0ff5be 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -1,3 +1,4 @@
+<<<<<<< src/maasserver/static/partials/nodes-list.html
 <header class="p-strip--light is-shallow is-bordered page-header" media-query="min-width: 769px">
     <div class="row">
         <div class="col-8">
@@ -1072,3 +1073,1019 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
             on-check-all="toggleCheckAll('switches')" on-check="toggleChecked($switch_, 'switches')"></maas-switches-table>
     </div>
 </div>
+=======
+<header class="page-header u-margin--bottom-none" sticky media-query="min-width: 769px">
+    <div class="wrapper--inner">
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <h1 class="page-header__title">Nodes</h1>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <p class="page-header__status" data-ng-show="loading"><span class="u-text--loading"><i class="icon icon--loading u-animation--spin"></i> Loading...</span></p>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__controls u-float--right ng-hide" data-ng-show="currentpage === 'nodes'">
+            <div data-ng-hide="tabs.nodes.selectedItems.length">
+                <div data-maas-cta="addHardwareOptions"
+                    data-ng-model="addHardwareOption"
+                    data-ng-change="addHardwareOptionChanged()" data-default-title="Add hardware">
+                </div>
+            </div>
+            <div class="ng-hide" data-ng-show="tabs.nodes.selectedItems.length">
+                <a class="u-display--inline u-margin--right" data-ng-click="showSelected('nodes')">{$ tabs.nodes.selectedItems.length $} Selected</a>
+                <div data-maas-cta="tabs.nodes.takeActionOptions"
+                    data-ng-model="tabs.nodes.actionOption"
+                    data-ng-change="actionOptionSelected('nodes')">
+                </div>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__controls u-float--rightng-hide" data-ng-show="currentpage === 'devices'">
+            <div data-ng-hide="tabs.devices.selectedItems.length">
+                <button class="button--secondary button--inline"
+                    data-ng-click="addDevice()"
+                    data-ng-hide="addDeviceScope.viewable">Add device</button>
+                <button class="button--secondary button--inline ng-hide"
+                    data-ng-click="cancelAddDevice()"
+                    data-ng-show="addDeviceScope.viewable">Cancel add device</button>
+            </div>
+            <div data-ng-show="tabs.devices.selectedItems.length">
+                <a class="u-display--inline u-margin--right" data-ng-click="showSelected('devices')">{$ tabs.devices.selectedItems.length $} Selected</a>
+                <div data-maas-cta="tabs.devices.takeActionOptions"
+                    data-ng-model="tabs.devices.actionOption"
+                    data-ng-change="actionOptionSelected('devices')">
+                </div>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__controls u-float--rightng-hide" data-ng-show="currentpage === 'controllers'">
+            <div data-ng-if="!tabs.controllers.selectedItems.length">
+                <button class="button--secondary button--inline"
+                    data-ng-click="tabs.controllers.addController = true"
+                    data-ng-hide="tabs.controllers.addController">Add rack controller</button>
+                <button class="button--secondary button--inline ng-hide"
+                    data-ng-click="tabs.controllers.addController = false"
+                        data-ng-show="tabs.controllers.addController">Close add rack controller</button>
+            </div>
+            <div data-ng-show="tabs.controllers.selectedItems.length">
+                <a class="u-display--inline u-margin--right" data-ng-click="showSelected('controllers')">{$ tabs.controllers.selectedItems.length $} Selected</a>
+                <div data-maas-cta="tabs.controllers.takeActionOptions"
+                    data-ng-model="tabs.controllers.actionOption"
+                    data-ng-change="actionOptionSelected('controllers')">
+                </div>
+            </div>
+        </div>
+
+        <div class="page-header__controls u-float--right ng-hide" data-ng-show="currentpage === 'switches'">
+            <div class="ng-hide" data-ng-show="tabs.switches.selectedItems.length">
+                <a class="u-display--inline u-margin--right" data-ng-click="showSelected('switches')">{$ tabs.switches.selectedItems.length $} Selected</a>
+                <div data-maas-cta="tabs.switches.takeActionOptions"
+                    data-ng-model="tabs.switches.actionOption"
+                    data-ng-change="actionOptionSelected('switches')">
+                </div>
+            </div>
+        </div>
+
+       <div data-ng-repeat="tab in ['nodes', 'switches']" data-ng-show="currentpage == tab">
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs[tab].actionOption }">
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError(tab) || hasActionsInProgress(tab)">
+                <form class="form form--inline u-display--inline">
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs[tab].actionOption.name === 'commission' || tabs[tab].actionOption.name === 'test'">
+                        <div class="form__group">
+                            <input class="form__group-label" id="{$ tab $}-enableSSH" type="checkbox"
+                                data-ng-model="tabs[tab].commissionOptions.enableSSH">
+                            <label class="checkbox-label" for="{$ tab $}-enableSSH">Allow SSH access and prevent machine from powering off</label>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs[tab].actionOption.name === 'commission'">
+                        <div class="form__group">
+                            <input class="form__group-label" id="{$ tab $}-skipNetworking" type="checkbox"
+                                data-ng-model="tabs[tab].commissionOptions.skipNetworking">
+                            <label class="checkbox-label" for="{$ tab $}-skipNetworking">Retain network configuration</label>
+                        </div>
+                        <div class="form__group">
+                            <input class="form__group-label" id="{$ tab $}-skipStorage" type="checkbox"
+                                data-ng-model="tabs[tab].commissionOptions.skipStorage">
+                            <label class="checkbox-label" for="{$ tab $}-skipStorage">Retain storage configuration</label>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs[tab].actionOption.name === 'deploy'">
+                        <div class="form__group">
+                            <label for="image" class="form__group-label">Choose your image</label>
+                            <div class="form__group-input" data-maas-os-select="osinfo" data-ng-model="tabs[tab].osSelection"></div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset" data-ng-if="tabs[tab].actionOption.name === 'release'">
+                        <div class="form__group">
+                            <div data-maas-release-options="tabs[tab].releaseOptions"></div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs[tab].actionOption.name === 'set-zone'">
+                        <div class="form__group">
+                            <label for="{$ tab $}-zone3" class="form__group-label">Select Zone</label>
+                            <div class="form__group-input">
+                                <select name="zone" id="{$ tab $}-zone3"
+                                    data-ng-model="tabs[tab].zoneSelection"
+                                    data-ng-options="zone as zone.name for zone in zones">
+                                    <option value="" disabled="disabled">Choose a zone</option>
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                </form>
+                <div class="page-header__controls" data-ng-if="tabs[tab].actionOption.name !== 'commission' && tabs[tab].actionOption.name !== 'test'">
+                    <button class="button--base button--inline" data-ng-click="actionCancel(tab)">Cancel</button>
+                    <button class="button--inline" data-ng-class="tabs[tab].actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo(tab)" data-ng-hide="hasActionsFailed(tab)">
+                        <span data-ng-if="tabs[tab].actionOption.name === 'acquire'">Acquire {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'deploy'">Deploy {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'release'">Release {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'set-zone'">Set zone for {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'on'">Power on {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'off'">Power off {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'abort'">Abort action for {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'rescue-mode'">Set rescue mode for {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'exit-rescue-mode'">Exit rescue mode for {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'mark-broken'">Mark {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span> as broken
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'mark-fixed'">Mark {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span> as fixed
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'override-failed-testing'">Override failed testing on {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'delete'">Delete {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                    </button>
+                    <button class="button--secondary button--inline" data-ng-click="actionGo(tab)" data-ng-show="hasActionsFailed(tab)">Retry</button>
+                </div>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError(tab) || hasActionsInProgress(tab)" data-ng-if="tabs[tab].actionOption.name === 'commission' && hasCustomCommissioningScripts()">
+              <form class="form form--stack">
+                    <fieldset class="form__fieldset eight-col u-margin--bottom-small">
+                        <div class="form__group">
+			    <label for="{$ tab $}-commissiong-scripts">Additional commissioning Scripts</label>
+                            <span id="{$ tab $}-commissioning-scripts" data-maas-script-select="script" data-script-type="0" data-ng-model="tabs[tab].commissioningSelection" class="tags--inline"></span>
+                        </div>
+                    </fieldset>
+                </form>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError(tab) || hasActionsInProgress(tab)" data-ng-if="tabs[tab].actionOption.name === 'commission' || tabs[tab].actionOption.name ==='test'">
+              <form class="form form--stack">
+                    <fieldset class="form__fieldset eight-col u-margin--bottom-small">
+                        <div class="form__group">
+			    <label for="{$ tab $}-testing-scripts">Hardware Tests</label>
+                            <span id="{$ tab $}-testing-scripts" data-maas-script-select="script" data-script-type="2" data-ng-model="tabs[tab].testSelection" class="tags--inline"></span>
+                        </div>
+                    </fieldset>
+                </form>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError(tab) || hasActionsInProgress(tab)" data-ng-if="tabs[tab].actionOption.name === 'commission' || tabs[tab].actionOption.name === 'test'">
+                <div class="page-header__controls">
+                    <button class="button--base button--inline" data-ng-click="actionCancel(tab)">Cancel</button>
+                    <button class="button--inline" data-ng-class="tabs[tab].actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo(tab)" data-ng-hide="hasActionsFailed(tab)">
+                        <span data-ng-if="tabs[tab].actionOption.name === 'commission'">Commission {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                        <span data-ng-if="tabs[tab].actionOption.name === 'test'">Test {$ tabs[tab].selectedItems.length $}
+                            <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
+                        </span>
+                    </button>
+                    <button class="button--secondary button--inline" data-ng-click="actionGo(tab)" data-ng-show="hasActionsFailed(tab)">Retry</button>
+                </div>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError(tab)">
+                <p data-ng-hide="isDeployError(tab) || isSSHKeyError(tab)"
+                   class="page-header__message page-header__message--error ng-hide">
+                   {$ tabs[tab].actionErrorCount $}
+                   <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                   cannot be {$ tabs[tab].actionOption.sentence $}. To proceed, update your selection.
+                </p>
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="isDeployError(tab)">
+                    {$ tabs[tab].selectedItems.length $}
+                    <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                    cannot be {$ tabs[tab].actionOption.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="#/images">images page</a>.
+                </p>
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="isSSHKeyError(tab)">
+                    {$ tabs[tab].selectedItems.length $}
+                    <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                    cannot be {$ tabs[tab].actionOption.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.
+                </p>
+            </section>
+	    <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="tabs[tab].actionProgress.showing_confirmation">
+	        <p class="page-header__message page-header__message--warning">
+		  {$ tabs[tab].actionProgress.affected_nodes $} of {$ tabs[tab].selectedItems.length $} are in a deployed state. Are you sure you want to continue to test hardware?
+                </p>
+		<div class="page-header__controls">
+		  <button class="button--base button--inline" data-ng-click="actionCancel(tab)">No</button>
+		  <button class="button--secondary button--inline" data-ng-click="actionGo(tab)">Yes</button>
+		</div>
+            </section>
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionsInProgress(tab) || hasActionsFailed(tab)">
+                <p class="page-header__message" data-ng-show="hasActionsInProgress(tab)">
+                    <i class="icon icon--loading u-animation--spin"></i>
+                    {$ tabs[tab].actionProgress.completed $} of {$ tabs[tab].actionProgress.total $}
+                    nodes are transitioning to {$ tabs[tab].actionOption.sentence $}.
+                </p>
+                <p class="page-header__message page-header__message--error"
+                   data-ng-repeat="(error, nodes) in tabs[tab].actionProgress.errors">
+                    The {$ tabs[tab].actionOption.title.toLowerCase() $} action for {$ nodes.length $}
+                    <span data-ng-pluralize count="nodes.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                    failed with error: {$ error $}
+                </p>
+            </section>
+        </div>
+
+       </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': addHardwareScope.viewable }" data-ng-controller="AddHardwareController">
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showMachine()">
+                <h3 class="page-header__dropdown-title">Add machine</h3>
+                <form class="form form--stack">
+                    <fieldset class="form__fieldset six-col">
+                        <div class="form__group">
+                            <label for="machine-name" class="form__label two-col">Machine name</label>
+                            <div class="form__group-input three-col">
+                                <input type="text" id="machine-name" placeholder="Choose a machine name (optional)"
+                                       data-ng-model="machine.name">
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="domain" class="form__group-label two-col">Domain</label>
+                            <div class="form__group-input three-col">
+                                <select name="domain" id="domain"
+                                    data-ng-model="machine.domain"
+                                    data-ng-options="domain as domain.name for domain in domains">
+                                    <option value="" disabled>Choose a domain</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="architecture" class="form__group-label two-col">Architecture</label>
+                            <div class="form__group-input three-col">
+                                <select name="architecture" id="architecture"
+                                    data-ng-model="machine.architecture"
+                                    data-ng-options="arch for arch in architectures">
+                                    <option value="" disabled>Choose an architecture</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="min_hwe_kernel" class="form__group-label two-col">Minimum Kernel</label>
+                            <div class="form__group-input three-col">
+                                <select name="min_hwe_kernel" id="min_hwe_kernel"
+                                    data-ng-model="machine.min_hwe_kernel"
+                                    data-ng-options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels">
+                                    <option value="">No minimum kernel</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <label for="zone4" class="form__group-label two-col">Zone</label>
+                            <select name="zone" id="zone4" class="three-col"
+                                data-ng-model="machine.zone"
+                                data-ng-options="zone as zone.name for zone in zones">
+                            </select>
+                        </div>
+                        <div class="form__group" data-ng-repeat="mac in machine.macs">
+                            <label for="mac-address" class="form__group-label two-col"><span data-ng-hide="mac !== machine.macs[0]">MAC Address</span>&nbsp;</label>
+                            <div class="form__group-input three-col">
+                                <input type="text" id="mac-address" placeholder="00:00:00:00:00:00"
+                                       maxlength="17"
+                                       data-ng-class="{ 'has-error': mac.error }"
+                                       data-ng-model="mac.mac"
+                                       data-ng-pattern="macAddressRegex"
+                                       data-ng-change="validateMac(mac)"
+                                       mac-address>
+                                <span class="form__group-remove" title="Delete MAC"
+                                    data-ng-hide="mac === machine.macs[0]" data-ng-click="removeMac(mac)"></span>
+                            </div>
+                        </div>
+                        <div class="form__group">
+                            <div class="five-col">
+                                <button class="button--secondary button--inline u-float--right" data-ng-click="addMac()">+ Add MAC Address</a>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset six-col last-col"
+                        data-maas-power-parameters="power_types"
+                        data-ng-model="machine.power">
+                    </fieldset>
+                </form>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showChassis()">
+                <h3 class="page-header__dropdown-title">Add chassis</h3>
+                <form action="post" class="form form--stack">
+                    <fieldset class="form__fieldset six-col"
+                        data-maas-power-parameters="chassisPowerTypes"
+                        data-ng-model="chassis.power">
+                    </fieldset>
+                    <fieldset class="form__fieldset six-col last-col">
+                        <div class="form__group">
+                            <label for="domain2" class="form__group-label two-col">Domain</label>
+                            <div class="form__group-input three-col">
+                                <select name="domain" id="domain2"
+                                    data-ng-model="chassis.domain"
+                                    data-ng-options="domain as domain.name for domain in domains">
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                </form>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-show="showMachine()">
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
+                <div class="page-header__controls">
+                    <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
+                    <button class="button--secondary button--inline"
+                        data-ng-disabled="machineHasError()"
+                        data-ng-click="saveMachine(true)">Save and add another</button>
+                    <button class="button--positive button--inline"
+                        data-ng-disabled="machineHasError()"
+                        data-ng-click="saveMachine(false)">Save machine</button>
+                </div>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showChassis()">
+                <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
+                <div class="page-header__controls">
+                    <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
+                    <button class="button--secondary button--inline"
+                        data-ng-disabled="chassisHasErrors()"
+                        data-ng-click="saveChassis(true)">Save and add another</button>
+                    <button class="button--positive button--inline"
+                        data-ng-disabled="chassisHasErrors()"
+                        data-ng-click="saveChassis(false)">Save chassis</button>
+                </div>
+            </section>
+
+            <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+            <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="architectures.length">
+                <p class="page-header__message page-header__message--error">
+                    Cannot add {$ mode $} until boot images have been imported. To fix, visit the <a href="#/images">images page</a>.
+                </p>
+            </section>
+        </div>
+
+        <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.devices.actionOption }">
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError('devices') || hasActionsInProgress('devices')">
+                 <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+                <form class="form form--inline u-display--inline">
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.devices.actionOption.name === 'set-zone'">
+                        <div class="form__group">
+                            <label class="form__group-label" for="zone1">Set zone</label>
+                            <select name="zone" id="zone1"
+                                data-ng-model="tabs.devices.zoneSelection"
+                                data-ng-options="zone as zone.name for zone in zones">
+                                <option value="" disabled="disabled">Choose a zone</option>
+                            </select>
+                        </div>
+                    </fieldset>
+                    <div class="page-header__controls">
+                        <button class="button--base button--inline" data-ng-click="actionCancel('devices')">Cancel</button>
+                        <button class="button--positive button--inline" data-ng-click="actionGo('devices')">
+                            <span data-ng-if="tabs.devices.actionOption.name === 'set-zone'">Set zone for {$ tabs.devices.selectedItems.length $}
+                                <span data-ng-pluralize count="tabs.devices.selectedItems.length" when="{'one': 'device', 'other': 'devices'}"></span>
+                            </span>
+                            <span data-ng-if="tabs.devices.actionOption.name === 'delete'">Delete {$ tabs.devices.selectedItems.length $}
+                                <span data-ng-pluralize count="tabs.devices.selectedItems.length" when="{'one': 'device', 'other': 'devices'}"></span>
+                            </span>
+                        </button>
+                    </div>
+                </form>
+            </div>
+
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError('devices')">
+                <p class="page-header__message page-header__message--error">
+                    {$ tabs.devices.actionErrorCount $}
+                    <span data-ng-pluralize count="tabs.devices.selectedItems.length" when="{'one': 'device', 'other': 'devices'}"></span>
+                    cannot be {$ tabs.devices.actionOption.sentence $}. To proceed, update your selection.
+                </p>
+            </div>
+
+            <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionsInProgress('devices') || hasActionsFailed('devices')">
+                <p class="page-header__message" data-ng-show="hasActionsInProgress('devices')">
+                    <i class="icon icon--loading u-animation--spin"></i>
+                    {$ tabs.devices.actionProgress.completed $} of {$ tabs.devices.actionProgress.total $}
+                    devices have been {$ tabs.devices.actionOption.sentence $}.
+                </p>
+                <p class="page-header__message page-header__message--error"
+                    data-ng-repeat="(error, devices) in tabs.devices.actionProgress.errors">
+                    The {$ tabs.devices.actionOption.title.toLowerCase() $} action for {$ devices.length $}
+                    <span data-ng-pluralize count="devices.length" when="{'one': 'device', 'other': 'devices'}"></span>
+                    failed with error: {$ error $}
+                </p>
+            </div>
+        </div>
+
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': addDeviceScope.viewable }" data-ng-controller="AddDeviceController">
+            <section class="page-header__section twelve-col u-margin--bottom-none">
+                <h3 class="page-header__dropdown-title">Add device</h3>
+                <form class="form form--stack">
+                    <fieldset class="form__fieldset six-col">
+                        <div class="form__group">
+                            <label for="device-name" class="form__group-label two-col">Name</label>
+                            <div class="form__group-input three-col">
+                                <input type="text" id="device-name" placeholder="Name your device"
+                                    data-ng-model="device.name"
+                                    data-ng-class="{ 'has-error': nameHasError() }">
+                            </div>
+
+                        </div>
+                        <div class="form__group">
+                            <label for="domain3" class="form__group-label two-col">Domain</label>
+                            <div class="form__group-input three-col">
+                                <select name="domain" id="domain3"
+                                    data-ng-model="device.domain"
+                                    data-ng-options="domain as domain.name for domain in domains">
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                </form>
+                <table>
+                    <thead>
+                        <tr>
+                            <th class="table-col--20">MAC address</th>
+                            <th class="table-col--20">IP assignment</th>
+                            <th class="table-col--20">Subnet</th>
+                            <th class="table-col--35">IP address</th>
+                            <th class="table-col--5"></th>
+                        </tr>
+                    </thead>
+                    <tbody vs-repeat vs-scroll-parent="window">
+                        <tr data-ng-repeat="interface in device.interfaces">
+                            <td class="table-col--20" aria-label="MAC address">
+                                <input type="text" id="mac-address1" placeholder="00:00:00:00:00:00"
+                                    data-ng-model="interface.mac"
+                                    data-ng-class="{ 'has-error': macHasError(interface) }">
+                            </td>
+                            <td class="table-col--20" aria-label="IP assignment">
+                                <select name="ip-assignment" id="ip-assignment"
+                                    data-ng-model="interface.ipAssignment"
+                                    data-ng-options="assigment.title for assigment in ipAssignments">
+                                    <option value="" disabled selected>Select IP assignment</option>
+                                </select>
+                            </td>
+                            <td class="table-col--20" aria-label="Subnet">
+                                <select name="subnet" id="subnet"
+                                    data-ng-model="interface.subnetId"
+                                    data-ng-options="subnet.id as subnet.name for subnet in subnets"
+                                    data-ng-show="interface.ipAssignment.name === 'static'">
+                                    <option value="" disabled selected>Select subnet</option>
+                                </select>
+                            </td>
+                            <td class="table-col--35" aria-label="IP address">
+                                <input type="text" id="ip-address" placeholder="000.000.000.000"
+                                    data-ng-model="interface.ipAddress"
+                                    data-ng-class="{ 'has-error': ipHasError(interface) }"
+                                    data-ng-show="interface.ipAssignment.name === 'external'">
+                                <input type="text" id="ip-address"
+                                    data-ng-model="interface.ipAddress"
+                                    data-ng-class="{ 'has-error': ipHasError(interface) }"
+                                    data-ng-show="interface.ipAssignment.name === 'static'">
+                            </td>
+                            <td class="table-col--5 u-u-align---right table--mobile-controls">
+                                <!-- space needed to set correct height -->
+                                <span data-ng-show="isPrimaryInterface(interface)">&nbsp;</span>
+                                <a title="Delete" class="icon icon--remove u-display--desktop"
+                                    data-ng-click="deleteInterface(interface)"
+                                    data-ng-hide="isPrimaryInterface(interface)">delete</a>
+                                <button class="button--secondary u-display--mobile"
+                                    data-ng-click="deleteInterface(interface)"
+                                    data-ng-hide="isPrimaryInterface(interface)">delete</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <button class="button--secondary button--inline" data-ng-click="addInterface()">+ Add another interface</button>
+            </section>
+            <section class="page-header__section twelve-col u-margin--bottom-none twelve-col u-margin--bottom-none">
+                <form class="form form--inline">
+                    <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
+                    <div class="page-header__controls">
+                        <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
+                        <button class="button--secondary button--inline"
+                            data-ng-class="{ disabled: deviceHasError() }"
+                            data-ng-click="save(true)">Save and add another</button>
+                        <button class="button--positive button--inline"
+                            data-ng-class="{ disabled: deviceHasError() }"
+                            data-ng-click="save(false)">Save device</button>
+                    </div>
+                </form>
+            </section>
+        </div>
+
+        <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.controllers.actionOption }">
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError('controllers') || hasActionsInProgress('controllers')">
+                 <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+                <form class="form form--inline u-display--inline">
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.controllers.actionOption.name === 'set-zone'">
+                        <div class="form__group">
+                            <label for="zone2" class="form__group-label">Select Zone</label>
+                            <div class="form__group-input">
+                                <select name="zone" id="zone2"
+                                    data-ng-model="tabs.controllers.zoneSelection"
+                                    data-ng-options="zone as zone.name for zone in zones">
+                                    <option value="" disabled="disabled">Choose a zone</option>
+                                </select>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="form__fieldset ng-hide" data-ng-show="tabs.controllers.actionOption.name === 'test'">
+                        <div class="form__group">
+                            <input class="form__group-label" id="enable_SSH" type="checkbox"
+                                data-ng-model="tabs.controllers.commissionOptions.enableSSH">
+                            <label class="checkbox-label" for="enable_SSH">Allow SSH access and prevent machine from powering off</label>
+                        </div>
+                    </fieldset>
+                </form>
+                <div class="page-header__controls" data-ng-if="tabs.controllers.actionOption.name !== 'test'">
+                    <button class="button--base button--inline" data-ng-click="actionCancel('controllers')">Cancel</button>
+                    <button class="button--positive button--inline" data-ng-click="actionGo('controllers')">
+                        <span data-ng-if="tabs.controllers.actionOption.name === 'set-zone'">Set zone for {$ tabs.controllers.selectedItems.length $}
+                            <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        </span>
+                        <span data-ng-if="tabs.controllers.actionOption.name === 'on'">Power on {$ tabs.controllers.selectedItems.length $}
+                            <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        </span>
+                        <span data-ng-if="tabs.controllers.actionOption.name === 'off'">Power off {$ tabs.controllers.selectedItems.length $}
+                            <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        </span>
+                        <span data-ng-if="tabs.controllers.actionOption.name === 'delete'">Delete {$ tabs.controllers.selectedItems.length $}
+                            <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        </span>
+                        <span data-ng-if="tabs.controllers.actionOption.name === 'import-images'">Import images for {$ tabs.controllers.selectedItems.length $}
+                            <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        </span>
+                    </button>
+                </div>
+            </div>
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-hide="isActionError('controllers') || hasActionsInProgress('controllers')" data-ng-if="tabs.controllers.actionOption.name === 'test'">
+                <form class="form form--stack">
+                    <fieldset class="form__fieldset eight-col u-margin--bottom-small">
+                        <div class="form__group">
+                            <label for="testing-scripts">Hardware Tests</label>
+                            <span id="testing-scripts" data-maas-script-select="script" data-script-type="2" data-ng-model="tabs.nodes.testSelection" class="tags--inline"></span>
+                        </div>
+                    </fieldset>
+                </form>
+            </div>
+            <div class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError('controllers') || hasActionsInProgress('controllers')" data-ng-if="tabs.controllers.actionOption.name === 'test'">
+                <div class="page-header__controls">
+                    <button class="button--base button--inline" data-ng-click="actionCancel('controllers')">Cancel</button>
+                    <button class="button--positive button--inline" data-ng-click="actionGo('controllers')">
+                        <span>Test {$ tabs.controllers.selectedItems.length $}
+                            <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        </span>
+                    </button>
+                </div>
+            </div>
+
+            <!-- XXX blake_r 2015-04-02 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="isActionError('controllers')">
+                <form class="form form--inline">
+                    <p class="page-header__message page-header__message--error">
+                        {$ tabs.controllers.actionErrorCount $}
+                        <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        cannot be {$ tabs.controllers.actionOption.sentence $}. To proceed, update your selection.
+                    </p>
+                </form>
+            </div>
+
+            <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="hasActionsInProgress('controllers') || hasActionsFailed('controllers')">
+                <form class="form form--inline">
+                    <p class="page-header__message" data-ng-show="hasActionsInProgress('controllers')">
+                        <i class="icon icon--loading u-animation--spin u-margin--right-small"></i>
+                        {$ tabs.controllers.actionProgress.completed $} of {$ tabs.controllers.actionProgress.total $}
+                        controllers have been {$ tabs.controllers.actionOption.sentence $}.
+                    </p>
+                    <p class="page-header__message page-header__message--error"
+                        data-ng-repeat="(error, controllers) in tabs.controllers.actionProgress.errors">
+                        The {$ tabs.controllers.actionOption.title.toLowerCase() $} action for {$ controllers.length $}
+                        <span data-ng-pluralize count="controllers.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
+                        failed with error: {$ error $}
+                    </p>
+                </form>
+            </div>
+        </div>
+
+        <div class="page-header__dropdown" data-ng-class="{ 'is-open': tabs.controllers.addController }">
+            <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="tabs.controllers.addController">
+                <h3 class="page-header__dropdown-title">Add rack controller</h3>
+                <pre class="u-margin--none">
+                    <code># To add a new rack controller, SSH into the rack controller.
+# Install the maas-rack-controller package.
+sudo apt install maas-rack-controller
+# Register the rack controller with this MAAS. If the rack controller (and machines)
+# don't have access to the URL, use a different IP address to allow connection.
+sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tabs.controllers.registerSecret $}</code>
+                </pre>
+            </div>
+            <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="tabs.controllers.addController">
+                <form class="form form--inline">
+                    <div class="page-header__controls">
+                      <button class="button--secondary button--inline"
+                          data-ng-click="tabs.controllers.addController = false">Close</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</header>
+<div sticky media-query="min-width: 769px" offset="89" class="page-navigation" data-ng-class="{ 'u-visibility--hidden': tabs.nodes.actionOption || addHardwareScope.viewable || tabs.devices.actionOption || addDeviceScope.viewable || tabs.controllers.actionOption || tabs.controllers.addController }">
+    <div class="wrapper--inner">
+        <nav class="page-navigation__links">
+            <button class="page-navigation__link tooltip tooltip--right"
+                aria-label="A deployable node managed by MAAS."
+                data-ng-class="{ 'is-active': currentpage === 'nodes'}"
+                data-ng-click="toggleTab('nodes')">{$ nodes.length $} <ng-pluralize count="nodes.length" when="{'one': 'Machine', 'other': 'Machines'}"></ng-pluralize></button>
+            <button class="page-navigation__link tooltip"
+                aria-label="A node known to MAAS, but is not deployable."
+                data-ng-class="{ 'is-active': currentpage === 'devices'}"
+                data-ng-click="toggleTab('devices')">{$ devices.length $} <ng-pluralize count="devices.length" when="{'one': 'Device', 'other': 'Devices'}"></ng-pluralize></button>
+            <button class="page-navigation__link tooltip"
+                data-ng-if="isSuperUser()"
+                aria-label="A node that provides MAAS services."
+                data-ng-class="{ 'is-active': currentpage === 'controllers'}"
+                data-ng-click="toggleTab('controllers')">{$ controllers.length $} <ng-pluralize count="controllers.length" when="{'one': 'Controller', 'other': 'Controllers'}"></ng-pluralize></button>
+            <button class="page-navigation__link tooltip"
+                data-ng-if="showswitches"
+                aria-label="A node that is a network switch."
+                data-ng-class="{ 'is-active': currentpage === 'switches'}"
+                data-ng-click="toggleTab('switches')">{$ switches.length $} <ng-pluralize count="switches.length" when="{'one': 'Switch', 'other': 'Switches'}"></ng-pluralize></button>
+        </nav>
+    </div>
+</div>
+<div class="u-padding--top row">
+    <div class="wrapper--inner">
+        <maas-notifications></maas-notifications>
+        <aside class="three-col">
+            <div class="accordion maas-accordion ng-hide" data-ng-show="currentpage === 'nodes'"
+                data-ng-class="{ 'is-disabled': tabs.nodes.actionOption }">
+                <h3 class="accordion__title"
+                data-ng-class="{'is-active': isActive}"
+                data-ng-init="isActive = false"
+                data-ng-click="isActive = !isActive">Filter by</h3>
+                <div class="accordion__content">
+                    <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.status.length">
+                        <button class="accordion__tab-title maas-accordion-tab is-active">Status</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                                <li class="accordion__tab-item" data-ng-repeat="status in tabs.nodes.metadata.status | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('status', status.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('status', status.name, 'nodes')">{$ status.name $} ({$ status.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.owner.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Owner</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="owner in tabs.nodes.metadata.owner | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('owner', owner.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('owner', owner.name, 'nodes')">{$ owner.name $} ({$ owner.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.architecture.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Architectures</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="architecture in tabs.nodes.metadata.architecture | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('architecture', architecture.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('architecture', architecture.name, 'nodes')"><span data-maas-release-name="architecture.name"></span> ({$ architecture.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.release.length">
+                        <button class="accordion__tab-title maas-accordion-tab">OS/Release</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="release in tabs.nodes.metadata.release | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('release', release.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('release', release.name, 'nodes')"><span data-maas-release-name="release.name"></span> ({$ release.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.tags.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Tags</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.tags | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('tags', tag.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.storage_tags.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Storage Tags</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="tag in tabs.nodes.metadata.storage_tags | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('storage_tags', tag.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('storage_tags', tag.name, 'nodes')">{$ tag.name $} ({$ tag.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.subnets.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Subnets</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="subnet in tabs.nodes.metadata.subnets | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('subnets', subnet.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('subnets', subnet.name, 'nodes')">{$ subnet.name $} ({$ subnet.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.fabrics.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Fabrics</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="fabric in tabs.nodes.metadata.fabrics | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('fabrics', fabric.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('fabrics', fabric.name, 'nodes')">{$ fabric.name $} ({$ fabric.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.spaces.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Spaces</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="space in tabs.nodes.metadata.spaces | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('spaces', space.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('spaces', space.name, 'nodes')">{$ space.name $} ({$ space.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.zone.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Zones</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="zone in tabs.nodes.metadata.zone | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('zone', zone.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('zone', zone.name, 'nodes')">{$ zone.name $} ({$ zone.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="accordion three-col maas-accordion ng-hide" data-ng-show="currentpage === 'devices'"
+                data-ng-class="{ 'is-disabled': tabs.devices.actionOption }">
+                <h3 class="accordion__title">Filter by</h3>
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                <div class="ng-hide accordion__tab" data-ng-show="tabs.devices.metadata.owner.length">
+                    <button class="accordion__tab-title maas-accordion-tab active">Owner</button>
+                    <div class="accordion__tab-content">
+                        <ul class="accordion__tab-list">
+                            <li class="accordion__tab-item" data-ng-repeat="owner in tabs.devices.metadata.owner | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('owner', owner.name, 'devices') }">
+                                <button class="accordion__tab-link" data-ng-click="toggleFilter('owner', owner.name, 'devices')">{$ owner.name $} ({$ owner.count $})</button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="ng-hide accordion__tab" data-ng-show="tabs.devices.metadata.tags.length">
+                    <button class="accordion__tab-title maas-accordion-tab">Tags</button>
+                    <div class="accordion__tab-content">
+                        <ul class="accordion__tab-list">
+                            <li class="accordion__tab-item" data-ng-repeat="tag in tabs.devices.metadata.tags | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('tags', tag.name, 'devices') }">
+                                <button class="accordion__tab-link" data-ng-click="toggleFilter('tags', tag.name, 'devices')">{$ tag.name $} ({$ tag.count $})</button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="ng-hide accordion__tab" data-ng-show="tabs.devices.metadata.zone.length">
+                    <button class="accordion__tab-title maas-accordion-tab">Zones</button>
+                    <div class="accordion__tab-content">
+                        <ul class="accordion__tab-list">
+                            <li class="accordion__tab-item" data-ng-repeat="zone in tabs.devices.metadata.zone | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('zone', zone.name, 'devices') }">
+                                <button class="accordion__tab-link" data-ng-click="toggleFilter('zone', zone.name, 'devices')">{$ zone.name $} ({$ zone.count $})</button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </aside>
+        <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+        <div class="nine-col last-col ng-hide" data-ng-show="currentpage === 'nodes'">
+            <form>
+                <div id="search-bar" class="search nine-col">
+                    <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
+                    <input
+                        type="search" placeholder="Search nodes" class="search__input"
+                        data-ng-model="tabs.nodes.search" data-ng-change="updateFilters('nodes')"
+                        data-ng-class="{ error: !tabs.nodes.searchValid }"
+                        data-ng-disabled="tabs.nodes.actionOption" />
+                    <input type="reset" class="search__submit"
+                        data-ng-class="{ 'search__submit--close': tabs.nodes.search.length > 0 }"
+                        data-ng-click="clearSearch('nodes')" />
+                </div>
+                <maas-machines-table id="nodes-listing" search="tabs.nodes.search" ng-disabled="hasActionsInProgress('nodes')"
+                  machine-has-error="!supportsAction($machine, 'nodes')" on-listing-change="onNodeListingChanged($machines, 'nodes')"
+                  on-check-all="toggleCheckAll('nodes')" on-check="toggleChecked($machine, 'nodes')"></maas-machines-table>
+            </form>
+        </div>
+        <div class="nine-col last-col" class="ng-hide" data-ng-show="currentpage === 'devices'">
+            <div class="search nine-col">
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                <input
+                    type="search" placeholder="Search devices" class="search__input"
+                    data-ng-model="tabs.devices.search" data-ng-change="updateFilters('devices')"
+                    data-ng-class="{ error: !tabs.devices.searchValid }"
+                    data-ng-disabled="tabs.devices.actionOption" />
+                <input type="reset" class="search__submit"
+                    data-ng-class="{ 'search__submit--close': tabs.devices.search.length > 0 }"
+                    data-ng-click="clearSearch('devices')" />
+            </div>
+            <table>
+            <thead>
+                <tr>
+                    <th class="table-col--3">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleCheckAll('devices')" data-ng-checked="tabs.devices.allViewableChecked" id="check-all-devices" data-ng-disabled="hasActionsInProgress('devices')" />
+                        <label for="check-all-devices" class="checkbox-label"></label>
+                    </th>
+                    <th class="table-col--24">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <a href="" data-ng-click="sortTable('fqdn', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'fqdn', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">
+                            <span title="Fully Qualified Domain Name">FQDN</span>
+                        </a>
+                    </th>
+                    <th class="table-col--25">
+                        <a href="" data-ng-click="sortTable('primary_mac', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'primary_mac', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">
+                            <span title="Media Access Control addresses">MAC</span>
+                        </a>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('ip_assignment', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'ip_assignment', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">IP Assignment</a>
+                    </th>
+                    <th class="table-col--20">
+                        <a href="" data-ng-click="sortTable('ip_address', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'ip_address', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">IP Address</a>
+                    </th>
+                    <th class="table-col--12">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <a href="" data-ng-click="sortTable('owner', 'devices')" data-ng-class="{'is-sorted': tabs.devices.predicate === 'owner', 'sort-asc': tabs.devices.reverse === false, 'sort-desc': tabs.devices.reverse === true}">Owner</a>
+                    </th>
+                </tr>
+            </thead>
+            <tbody vs-repeat vs-scroll-parent="window">
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. This really needs lots of tests. -->
+                <tr
+                    data-ng-repeat="device in tabs.devices.filtered_items = (devices | nodesFilter:tabs.devices.search | orderBy:tabs.devices.predicate:tabs.devices.reverse) track by device.system_id"
+                    data-ng-class="{ 'table--error': !supportsAction(device, 'devices'), selected: device.$selected }">
+                    <td class="table-col--3" aria-label="Select device">
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleChecked(device, 'devices')" data-ng-checked="device.$selected" id="{$ device.fqdn $}" data-ng-disabled="hasActionsInProgress('devices')"/>
+                        <label for="{$ device.fqdn $}" class="checkbox-label"></label>
+                    </td>
+                    <td class="table-col--24" aria-label="FQDN">
+                        <a href="#/node/device/{$ device.system_id $}">{$ device.fqdn $}</a>
+                    </td>
+                    <td class="table-col--25" aria-label="MAC">
+                        {$ device.primary_mac $}
+                        <span class="extra-macs" data-ng-show="device.extra_macs.length">(+{$ device.extra_macs.length $})</span>
+                    </td>
+                    <td class="table-col--15" aria-label="IP Assignment">{$ getDeviceIPAssignment(device.ip_assignment) $}</td>
+                    <td class="table-col--20" aria-label="IP Address">{$ device.ip_address $}</td>
+                    <td class="table-col--12" aria-label="Owner">{$ device.owner $}</td>
+                </tr>
+            </tbody>
+        </table>
+        </div>
+        <div class="twelve-col last-col" class="ng-hide" data-ng-show="currentpage === 'controllers'">
+            <div class="search twelve-col">
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                <input
+                    type="search" placeholder="Search controllers" class="search__input"
+                    data-ng-model="tabs.controllers.search" data-ng-change="updateFilters('controllers')"
+                    data-ng-class="{ error: !tabs.controllers.searchValid }"
+                    data-ng-disabled="tabs.controllers.actionOption" />
+                <input type="submit" class="search__submit"
+                    data-ng-class="{ 'search__submit--close': tabs.controllers.search.length > 0 }"
+                    data-ng-click="clearSearch('controllers')" />
+            </div>
+            <table>
+            <thead>
+                <tr>
+                    <th class="table-col--2">
+                        <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleCheckAll('controllers')" data-ng-checked="tabs.controllers.allViewableChecked" id="check-all-controllers" data-ng-disabled="hasActionsInProgress('controllers')" />
+                        <label for="check-all-controllers" class="checkbox-label"></label>
+                    </th>
+                    <th class="table-col--19">
+                        <a href="" data-ng-click="sortTable('fqdn', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'fqdn', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">
+                            <span title="Fully Qualified Domain Name">Name</span>
+                        </a>
+                    </th>
+                    <th class="table-col--4 u-align--center">
+                        <span title="Status">Status</span>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('node_type_display', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'node_type_display', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">
+                            <span title="Controller Type">Type</span>
+                        </a>
+                    </th>
+                    <th class="table-col--10">
+                        <a href="" data-ng-click="sortTable('node_type_display', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'version', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">
+                            <span title="Version">Version</span>
+                        </a>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('updated', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'updated', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">Last Image Sync</a>
+                    </th>
+                    <th class="table-col--15">
+                        <a href="" data-ng-click="sortTable('updated', 'controllers')" data-ng-class="{'is-sorted': tabs.controllers.predicate === 'updated', 'sort-asc': tabs.controllers.reverse === false, 'sort-desc': tabs.controllers.reverse === true}">Images Status</a>
+                    </th>
+                </tr>
+            </thead>
+            <tbody vs-repeat vs-scroll-parent="window">
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. This really needs lots of tests. -->
+                <tr
+                    data-ng-repeat="controller in tabs.controllers.filtered_items = (controllers | nodesFilter:tabs.controllers.search | orderBy:tabs.controllers.predicate:tabs.controllers.reverse) track by controller.system_id"
+                    data-ng-class="{ 'table--error': !supportsAction(controller, 'controllers'), selected: controller.$selected }">
+                    <td class="table-col--2" aria-label="Select controller">
+                        <input type="checkbox" class="checkbox" data-ng-click="toggleChecked(controller, 'controllers')" data-ng-checked="controller.$selected" id="{$ controller.fqdn $}" data-ng-disabled="hasActionsInProgress('controllers')"/>
+                        <label for="{$ controller.fqdn $}" class="checkbox-label"></label>
+                    </td>
+                    <td class="table-col--19" aria-label="FQDN">
+                        <a href="#/node/controller/{$ controller.system_id $}">{$ controller.fqdn $}</a>
+                    </td>
+                    <td class="table-col--4 u-align--center" data-maas-controller-status="controller" data-maas-services="services" aria-label="Status"></td>
+                    <td class="table-col--15" aria-label="Type">{$ controller.node_type_display $}</td>
+                    <td class="table-col--10" aria-label="Version">
+                        <div data-ng-show="controller.version">
+                            {$ controller.version__short $}
+                        </div>
+                        <div data-ng-show="!controller.version" class="u-text--subtle">
+                            Unknown
+                            <i class="icon icon--info u-margin--left-tiny tooltip"
+                               aria-label="Less than 2.3.0"></i>
+                        </div>
+                    </td>
+                    <td class="table-col--15" aria-label="Last image sync">{$ controller.last_image_sync || 'Never' $}</td>
+                    <td class="table-col--15" aria-label="Image status">
+                        <maas-controller-image-status system-id="controller.system_id"></maas-controller-image-status>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        </div>
+        <div class="twelve-col last-col" class="ng-hide" data-ng-show="currentpage === 'switches'">
+            <div class="search twelve-col">
+                <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
+                <input
+                    type="search" placeholder="Search switches" class="search__input"
+                    data-ng-model="tabs.switches.search" data-ng-change="updateFilters('switches')"
+                    data-ng-class="{ error: !tabs.switches.searchValid }"
+                    data-ng-disabled="tabs.switches.actionOption" />
+                <input type="submit" class="search__submit"
+                    data-ng-class="{ 'search__submit--close': tabs.switches.search.length > 0 }"
+                    data-ng-click="clearSearch('switches')" />
+            </div>
+            <maas-switches-table id="switches-listing" search="tabs.switches.search" ng-disabled="hasActionsInProgress('switches')"
+              switch-has-error="!supportsAction($switch_, 'switches')" on-listing-change="onNodeListingChanged($switches, 'switches')"
+              on-check-all="toggleCheckAll('switches')" on-check="toggleChecked($switch_, 'switches')"></maas-switches-table>
+        </div>
+    </div>
+</div>
+>>>>>>> src/maasserver/static/partials/nodes-list.html
diff --git a/src/maasserver/static/partials/script-results-list.html b/src/maasserver/static/partials/script-results-list.html
index 12d1175..bcf7b40 100644
--- a/src/maasserver/static/partials/script-results-list.html
+++ b/src/maasserver/static/partials/script-results-list.html
@@ -4,6 +4,7 @@
             <p class="u-text--loading"><i class="p-icon--spinner u-animation--spin"></i>&nbsp;&nbsp;Loading...</p>
         </div>
     </div>
+<<<<<<< src/maasserver/static/partials/script-results-list.html
     <div class="row">
         <div data-ng-repeat="hardware_type in results">
             <div data-ng-if="resultsLoaded && (hardware_type.results | json) != '{}'">
@@ -49,12 +50,59 @@
                                                 <button class="p-contextual-menu__link" aria-label="Hide previous {$ result.result_section $}" data-ng-if="result.showing_history" data-ng-click="toggleMenu(); result.showing_results = false; result.showing_history = false">Hide previous {$ result.result_section $}</button>
                                             </div>
                                         </div>
+=======
+    <div data-ng-repeat="hardware_type in results">
+        <div data-ng-if="resultsLoaded && (hardware_type.results | json) != '{}'">
+        <h2 data-ng-if="hardware_type.title !== 'null'">{$ hardware_type.title $}</h2>
+        <div data-ng-repeat="(title, results) in hardware_type.results">
+            <h3 data-ng-if="title !== 'null'">{$ title $}</h3>
+            <section class="table u-margin--bottom">
+                <header class="table__head">
+                    <div class="table__row">
+                        <div class="table__header table-col--2 u-padding--left-none"></div>
+                        <div class="table__header table-col--24">Name</div>
+                        <div class="table__header table-col--22">Tags</div>
+                        <div class="table__header table-col--15">Runtime</div>
+                        <div class="table__header table-col--20">Date</div>
+                        <div class="table__header table-col--12">Result</div>
+                        <div class="table__header table-col--5 u-align--right">Actions</div>
+                    </div>
+                </header>
+                <main class="table__body">
+                    <div data-ng-repeat="result in results">
+                        <div class="table__row" data-ng-class="{'is-active': result.showing_results || result.showing_history}">
+                            <div class="table__data table-col--2 u-padding--left-none" aria-label="Status">
+                                <span data-maas-script-status="script-status" data-script-status="result.status"></span>
+                            </div>
+                            <div class="table__data table-col--24" data-ng-click="result.showing_results = !result.showing_results" aria-label="Name">
+                                {$ result.name $}
+                                <button class="icon u-margin--top-tiny u-float--right" data-ng-class="{'icon--open': !result.showing_results, 'icon--close': result.showing_results}" data-ng-if="!result.showing_history"></button>
+                            </div>
+                            <div class="table__data table-col--22" aria-label="Tags"><span data-ng-hide="result.showing_history">{$ result.tags $}</span></div>
+                            <div class="table__data table-col--15" aria-label="Runtime"><span data-ng-hide="result.showing_history" data-maas-script-run-time="script-runtime" data-start-time="result.starttime" data-run-time="{{result.runtime}}" data-estimated-run-time="{{result.estimated_runtime}}" data-script-status="result.status"></span></div>
+                            <div class="table__data table-col--20" aria-label="Date"><span data-ng-hide="result.showing_history">{$ result.updated $}</span></div>
+                            <div class="table__data table-col--12" aria-label="Status">
+                                <span data-ng-hide="result.showing_history">
+                                    <!-- Only link to the testing result when we've received it. This is indicated with status 2(passed), 3(failed), 4(timedout), 6(degraded), 8(failed installing)-->
+                                    {$ result.status_name $} <a data-ng-if="result.status === 2 || result.status === 3 || result.status === 4 || result.status === 6 || result.status === 8" href="#/node/{$ type_name $}/{$ node.system_id $}/{$ section.area $}/{$ result.id $}">View log</a>
+                                </span>
+                            </div>
+                            <div class="table__data table-col--5 table--mobile-controls">
+                                <div class="table__controls u-align--right" toggle-ctrl>
+                                    <button class="table__controls-toggle" data-ng-click="toggleMenu()">View actions</button>
+                                    <div class="table__controls-menu ng-hide" role="menu" data-ng-show="isToggled">
+                                        <button class="table__controls-action" aria-label="View metrics" data-ng-if="!result.showing_results" data-ng-click="toggleMenu(); result.showing_history = false; result.showing_results = true">View metrics</button>
+                                        <button class="table__controls-action" aria-label="Hide metrics" data-ng-if="result.showing_results" data-ng-click="toggleMenu(); result.showing_history = false; result.showing_results = false">Hide metrics</button>
+                                        <button class="table__controls-action" aria-label="View previous {$ result.result_section $}" data-ng-if="!result.showing_history" data-ng-click="toggleMenu(); result.showing_results = false; result.showing_history = true">View previous {$ result.result_section $}</button>
+                                        <button class="table__controls-action" aria-label="Hide previous {$ result.result_section $}" data-ng-if="result.showing_history" data-ng-click="toggleMenu(); result.showing_results = false; result.showing_history = false">Hide previous {$ result.result_section $}</button>
+>>>>>>> src/maasserver/static/partials/script-results-list.html
                                     </div>
                                 </td>
                                 <td class="p-table-expanding__panel col-12" aria-label="results" data-ng-if="result.showing_results && !result.showing_history">
                                     <div class="row">
                                         <div class="col-12" data-ng-if="result.results.length === 0">No metrics provided</div>
                                     </div>
+<<<<<<< src/maasserver/static/partials/script-results-list.html
                                     <div class="row" data-ng-if="result.results">
                                         <dl data-ng-repeat="item in result.results">
                                             <dt class="p-tooltip p-tooltip--top-center">
@@ -68,6 +116,34 @@
                                 <td class="p-table-expanding__panel col-12" aria-label="loading history" data-ng-if="result.loading_history">
                                     <div class="col-12">
                                         <p class="u-text--loading"><i class="p-icon--spinner u-animation--spin"></i>&nbsp;&nbsp;Loading...</p>
+=======
+                                </div>
+                            </div>
+
+                            <div class="table__dropdown" aria-label="history" data-ng-if="result.showing_history">
+                                <div class="table__row is-active">
+                                    <div class="table__data table-col--100">
+                                        <section class="table u-margin--bottom">
+                                            <main class="table__body">
+                                                <div class="table__row is-active u-border--none" data-ng-repeat="item in result.history_list">
+                                                    <div class="table__data table-col--2 u-padding--left-none" aria-label="Status">
+                                                        <span data-maas-script-status="script-status" data-script-status="item.status"></span>
+                                                    </div>
+                                                    <div class="table__data table-col--24" aria-label="Name">{$ result.name $}</div>
+                                                    <div class="table__data table-col--24" aria-label="Tags">{$ result.tags $}</div>
+                                                    <div class="table__data table-col--15" aria-label="Runtime"><span data-maas-script-run-time="script-runtime" data-start-time="item.starttime" data-run-time="{{item.runtime}}" data-estimated-run-time="{{item.estimated_runtime}}" data-script-status="item.status"></span></div>
+                                                    <div class="table__data table-col--20" aria-label="Date">{$ item.updated $}</div>
+                                                    <div class="table__data table-col--10" aria-label="Status">
+                                                        <!-- Only link to the testing result when we've received it. This is indicated with status 2(passed), 3(failed), 4(timedout), 6(degraded), 8(failed installing)-->
+                                                        {$ item.status_name $} <a data-ng-if="item.status === 2 || item.status === 3 || item.status === 4 || item.status === 6 || item.status === 8" href="#/node/{$ type_name $}/{$ node.system_id $}/{$ section.area $}/{$ item.id $}">View log</a>
+                                                    </div>
+                                                </div>
+                                            </main>
+                                        </section>
+                                        <p class="u-align--center u-margin--bottom">
+                                            <button class="button--secondary button--inline" data-ng-click="result.showing_history = false">Hide previous {$ result.result_section $}</button>
+                                        </p>
+>>>>>>> src/maasserver/static/partials/script-results-list.html
                                     </div>
                                 </div>
                                 <td class="p-table-expanding__panel col-12" aria-label="history" data-ng-if="result.showing_history">
diff --git a/src/maasserver/static/partials/subnet-details.html b/src/maasserver/static/partials/subnet-details.html
index dc22777..5415f96 100755
--- a/src/maasserver/static/partials/subnet-details.html
+++ b/src/maasserver/static/partials/subnet-details.html
@@ -201,6 +201,7 @@
                         <maas-obj-field type="text" key="cidr" label="CIDR" placeholder="Subnet CIDR"
                             label-width="2" input-width="4"></maas-obj-field>
                         <maas-obj-field type="text" key="gateway_ip" label="Gateway IP" placeholder="Gateway IP"
+<<<<<<< src/maasserver/static/partials/subnet-details.html
                             label-width="2" input-width="4"></maas-obj-field>
                         <maas-obj-field type="text" key="dns_servers" label="DNS" placeholder="DNS nameservers for subnet"
                             label-width="2" input-width="4"></maas-obj-field>
@@ -237,6 +238,45 @@
                                 <p>Space</p>
                             </div>
                             <div class="p-form__control">
+=======
+                            label-width="two" input-width="three" class="u-margin--bottom-none"></maas-obj-field>
+                    </maas-obj-field-group>
+                    <maas-obj-field type="text" key="dns_servers" label="DNS" placeholder="DNS nameservers for subnet"
+                        label-width="two" input-width="three"></maas-obj-field>
+                    <maas-obj-field type="textarea" key="description" label="Description" placeholder="Subnet description"
+                        label-width="two" input-width="three"></maas-obj-field>
+                </fieldset>
+                <fieldset class="form__fieldset six-col last-col">
+                    <maas-obj-field type="onoffswitch" key="managed" label="Managed allocation"
+                                    label-width="two" input-width="three"
+                                    label-info="When enabled, MAAS will assume it may take full control of DHCP and&#xa;IP address management on this subnet. When disabled, MAAS will only&#xa;allocate addresses from reserved IP ranges on this subnet, and will not&#xa;include this subnet's dynamic ranges in the DHCP configuration.">
+
+                    </maas-obj-field>
+                    <span data-ng-if="subnet.$maasForm.getValue('managed') != subnet.managed">
+                        <div class="form__group-label two-col">&nbsp;</div>
+                        <div class="form__group-input three-col last-col">
+                            <span data-ng-if="subnet.$maasForm.getValue('managed') == false" class="u-text--subtle">
+                                <i class="icon icon--warning"></i>
+                                <b>Warning:</b> MAAS will now start allocating IP addresses from reserved ranges. If a reserved range has been defined to prevent MAAS from allocating IP addresses, this behavior will change.
+                            </span>
+                            <span data-ng-if="subnet.$maasForm.getValue('managed') == true" class="u-text--subtle">
+                                <i class="icon icon--warning"></i>
+                                <b>Warning:</b> MAAS will now allocate IP addresses from the entire subnet, excluding any reserved ranges.
+                            </span>
+                        </div>
+                    </span>
+                    <maas-obj-field data-ng-if="subnet.version === 4" type="onoffswitch" key="active_discovery" label="Active mapping"
+                        label-width="two" input-width="three" label-info="When enabled, MAAS will scan this subnet {$ active_discovery_interval | lowercase $}&#xa;to discover hosts that have not been discovered passively."></maas-obj-field>
+                    <maas-obj-field type="options" key="fabric" label="Fabric" placeholder="Choose fabric"
+                        options="fabric.id as fabric.name for fabric in fabrics | orderBy:'name'"
+                        label-width="two" input-width="three"></maas-obj-field>
+                    <maas-obj-field type="options" key="vlan" class="u-margin--bottom" label="VLAN" placeholder="Choose VLAN"
+                        options="v.id as getVLANName(v) for v in vlans | filterByFabric:subnet.$maasForm.getValue('fabric')"
+                        label-width="two" input-width="three"></maas-obj-field>
+                    <dl>
+                        <dt class="two-col u-text--subtle">Space</dt>
+                            <dd class="four-col last-col">
+>>>>>>> src/maasserver/static/partials/subnet-details.html
                                 <a data-ng-if="space !== null" href="#/space/{$ space.id $}">{$ space.name $}</a>
                                 <span data-ng-if="space === null">
                                     (undefined)
diff --git a/src/maasserver/static/partials/vlan-details.html b/src/maasserver/static/partials/vlan-details.html
index 8a2826a..404a6e6 100644
--- a/src/maasserver/static/partials/vlan-details.html
+++ b/src/maasserver/static/partials/vlan-details.html
@@ -231,9 +231,15 @@
             <!-- End of "Take action" dropdown -->
         </div>
     </header>
+<<<<<<< src/maasserver/static/partials/vlan-details.html
     <section class="p-strip is-bordered">
         <div class="row">
             <div class="col-6">
+=======
+    <section class="row">
+        <fieldset class="wrapper--inner">
+            <div class="twelve-col">
+>>>>>>> src/maasserver/static/partials/vlan-details.html
                 <h2 class="u-float--left">VLAN Summary</h2>
             </div>
             <div class="col-6">
@@ -310,6 +316,7 @@
         </div>
         <div class="row">
             <maas-obj-form obj="vlanDetails.vlan" manager="vlanDetails.vlanManager" data-ng-disabled="!vlanDetails.isSuperUser()" data-ng-if="vlanDetails.editSummary"
+<<<<<<< src/maasserver/static/partials/vlan-details.html
             table-form="true" save-on-blur="false" after-save="vlanDetails.exitEditSummary">
                 <div class="row">
                     <div class="col-6">
@@ -337,11 +344,35 @@
                                 </span></p>
                             </div>
                             <div class="p-form__control">
+=======
+              table-form="true" save-on-blur="false" after-save="vlanDetails.exitEditSummary">
+                <fieldset class="form__fieldset six-col">
+                    <maas-obj-field type="text" key="vid" label="VID" placeholder="VLAN VID"
+                        label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
+                    <maas-obj-field type="text" key="name" label="Name" placeholder="VLAN name"
+                        label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
+                    <maas-obj-field type="text" key="mtu" label="MTU" placeholder="VLAN MTU"
+                        label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
+                    <maas-obj-field type="options" key="space" label="Space" placeholder="(undefined)" placeholder-enabled="true"
+                        options="space.id as space.name for space in vlanDetails.spaces"
+                        label-width="two" input-width="three"></maas-obj-field>
+                    <maas-obj-field type="textarea" key="description" label="Description" placeholder="VLAN description"
+                        label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
+                </fieldset>
+                <fieldset class="form__fieldset six-col last-col">
+                    <dl>
+                        <maas-obj-field type="options" key="fabric" label="Fabric" label-width="two" input-width="three"
+                                        options="fabric.id as fabric.name for fabric in vlanDetails.fabrics"></maas-obj-field>
+                        <div data-ng-if="vlanDetails.relatedControllers">
+                            <dt class="two-col">Rack controllers <span class="icon icon--help tooltip" aria-label="A rack controller controls hosts and images and runs network services&#xa;like DHCP for connected VLANs."></span></dt>
+                            <dd class="four-col last-col">
+>>>>>>> src/maasserver/static/partials/vlan-details.html
                                 <span data-ng-repeat="rack in vlanDetails.relatedControllers">
                                     <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>,
                                 </span>
                             </div>
                         </div>
+<<<<<<< src/maasserver/static/partials/vlan-details.html
                     </div>
                 </div>
                 <div class="row u-no-margin--top">
@@ -353,6 +384,17 @@
                         data-ng-click="vlanDetails.exitEditSummary()">Cancel</button>
                         <button class="p-button--positive" maas-obj-save>Save summary</button>
                     </div>
+=======
+                    </dl>
+                </fieldset>
+                <div class="six-col">
+                    <maas-obj-errors></maas-obj-errors>
+                </div>
+                <div class="six-col last-col u-align--right">
+                    <button class="button--base button--inline"
+                       data-ng-click="vlanDetails.exitEditSummary()">Cancel</button>
+                    <button class="button--positive button--inline" maas-obj-save>Save summary</button>
+>>>>>>> src/maasserver/static/partials/vlan-details.html
                 </div>
             </maas-obj-form>
         </div>
diff --git a/src/maasserver/tests/test_bootsources.py b/src/maasserver/tests/test_bootsources.py
index a83c9c1..3629529 100644
--- a/src/maasserver/tests/test_bootsources.py
+++ b/src/maasserver/tests/test_bootsources.py
@@ -44,7 +44,10 @@ from maasserver.testing.testcase import (
 )
 from maasserver.tests.test_bootresources import SimplestreamsEnvFixture
 from maasserver.utils import get_maas_user_agent
+<<<<<<< src/maasserver/tests/test_bootsources.py
 from maastesting.djangotestcase import count_queries
+=======
+>>>>>>> src/maasserver/tests/test_bootsources.py
 from maastesting.matchers import MockCalledOnceWith
 from provisioningserver.config import DEFAULT_IMAGES_URL
 from provisioningserver.import_images import (
diff --git a/src/maasserver/tests/test_stats.py b/src/maasserver/tests/test_stats.py
index d0200f7..43aae70 100644
--- a/src/maasserver/tests/test_stats.py
+++ b/src/maasserver/tests/test_stats.py
@@ -69,7 +69,7 @@ class TestMAASStats(MAASServerTestCase):
                 "total_storage": total_storage,
             },
         }
-        self.assertEquals(stats, json.dumps(compare))
+        self.assertEquals(json.loads(stats), compare)
 
     def test_get_request_params_returns_params(self):
         factory.make_RegionRackController()
diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
index 5e69c2d..5594db9 100644
--- a/src/maasserver/triggers/tests/test_websocket_listener.py
+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
@@ -1714,8 +1714,13 @@ class TestIPRangeListener(
             self.create_subnet, {'cidr': str(network)})
         params = {
             'subnet': subnet,
+<<<<<<< src/maasserver/triggers/tests/test_websocket_listener.py
             'start_ip': IPAddress(network.first + 2),
             'end_ip': IPAddress(network.last - 1)}
+=======
+            'start_ip': str(IPAddress(network.first + 2)),
+            'end_ip': str(IPAddress(network.last - 1))}
+>>>>>>> src/maasserver/triggers/tests/test_websocket_listener.py
         yield listener.startService()
         try:
             iprange = yield deferToDatabase(
diff --git a/src/metadataserver/user_data/templates/commissioning.template b/src/metadataserver/user_data/templates/commissioning.template
index 1ba2510..a1f6ce9 100644
--- a/src/metadataserver/user_data/templates/commissioning.template
+++ b/src/metadataserver/user_data/templates/commissioning.template
@@ -31,6 +31,10 @@ main() {
     # the BMC username and password.
     signal WORKING "Starting [maas-bmc-autodetect]" || exit 1
 
+    # LP:1730524 - Make sure we can signal the metadata service before updating
+    # the BMC username and password.
+    signal WORKING "Starting [maas-bmc-autodetect]" || exit 1
+
     # Install IPMI deps
     aptget install freeipmi-tools openipmi ipmitool sshpass
 
diff --git a/src/provisioningserver/drivers/power/ipmi.py b/src/provisioningserver/drivers/power/ipmi.py
index e3b1561..3783152 100644
--- a/src/provisioningserver/drivers/power/ipmi.py
+++ b/src/provisioningserver/drivers/power/ipmi.py
@@ -219,7 +219,11 @@ class IPMIPowerDriver(PowerDriver):
     @staticmethod
     def _issue_ipmi_chassis_config_command(
             command, power_change, power_address, power_boot_type=None):
+<<<<<<< src/provisioningserver/drivers/power/ipmi.py
         env = shell.get_env_with_locale()
+=======
+        env = shell.select_c_utf8_locale()
+>>>>>>> src/provisioningserver/drivers/power/ipmi.py
         with NamedTemporaryFile("w+", encoding="utf-8") as tmp_config:
             # Write out the chassis configuration.
             if (power_boot_type is None or
diff --git a/src/provisioningserver/import_images/boot_resources.py b/src/provisioningserver/import_images/boot_resources.py
index f985df6..0a5b3c2 100644
--- a/src/provisioningserver/import_images/boot_resources.py
+++ b/src/provisioningserver/import_images/boot_resources.py
@@ -9,6 +9,7 @@ __all__ = [
     ]
 
 from argparse import ArgumentParser
+import copy
 import errno
 from io import StringIO
 import os
@@ -41,6 +42,18 @@ from provisioningserver.utils.fs import (
     read_text_file,
     tempdir,
 )
+<<<<<<< src/provisioningserver/import_images/boot_resources.py
+=======
+from provisioningserver.utils.service_monitor import ServiceActionError
+from provisioningserver.utils.shell import (
+    call_and_check,
+    ExternalProcessError,
+)
+from provisioningserver.utils.snappy import (
+    get_snap_data_path,
+    running_in_snap,
+)
+>>>>>>> src/provisioningserver/import_images/boot_resources.py
 from twisted.internet.defer import inlineCallbacks
 from twisted.python.filepath import FilePath
 
@@ -109,6 +122,54 @@ def write_snapshot_metadata(snapshot, meta_file_content):
     atomic_write(meta_file_content.encode("ascii"), meta_file, mode=0o644)
 
 
+<<<<<<< src/provisioningserver/import_images/boot_resources.py
+=======
+def write_targets_conf(snapshot):
+    """Write "maas.tgt" file."""
+    targets_conf = os.path.join(snapshot, 'maas.tgt')
+    targets_conf_content = compose_targets_conf(snapshot)
+    atomic_write(targets_conf_content, targets_conf, mode=0o644)
+
+
+def update_targets_conf(snapshot):
+    """Runs tgt-admin to update the new targets from "maas.tgt"."""
+    # Ensure that tgt is running before tgt-admin is used.
+    try:
+        service_monitor.ensureService("tgt").wait(30)
+    except ServiceActionError:
+        msg = "Unable to start tgt"
+        try_send_rack_event(EVENT_TYPES.RACK_IMPORT_WARNING, msg)
+        maaslog.warning(msg)
+        return
+
+    # Update the tgt config.
+    targets_conf = os.path.join(snapshot, 'maas.tgt')
+
+    # The targets_conf may not exist in the event the BootSource is broken
+    # and images havn't been imported yet. This fixes LP:1655721
+    if not os.path.exists(targets_conf):
+        return
+
+    try:
+        env = copy.deepcopy(os.environ)
+        # LP:1718706 - When TGT is run in a snap the socket is stored in the
+        # SNAP_DATA path. Define it before calling tgt-admin otherwise the
+        # standard path is used and the call will fail.
+        if running_in_snap():
+            env['TGT_IPC_SOCKET'] = os.path.join(
+                get_snap_data_path(), 'tgtd-socket')
+        call_and_check(sudo([
+            get_path('/usr/sbin/tgt-admin'),
+            '--conf', targets_conf,
+            '--update', 'ALL',
+            ]), env=env)
+    except ExternalProcessError as e:
+        msg = "Unable to update TGT config: %s" % e
+        try_send_rack_event(EVENT_TYPES.RACK_IMPORT_WARNING, msg)
+        maaslog.warning(msg)
+
+
+>>>>>>> src/provisioningserver/import_images/boot_resources.py
 def read_sources(sources_yaml):
     """Read boot resources config file.
 
diff --git a/src/provisioningserver/import_images/tests/test_boot_resources.py b/src/provisioningserver/import_images/tests/test_boot_resources.py
index 28635e7..31fa955 100644
--- a/src/provisioningserver/import_images/tests/test_boot_resources.py
+++ b/src/provisioningserver/import_images/tests/test_boot_resources.py
@@ -43,7 +43,18 @@ from provisioningserver.testing.config import (
     BootSourcesFixture,
     ClusterConfigurationFixture,
 )
+<<<<<<< src/provisioningserver/import_images/tests/test_boot_resources.py
 from provisioningserver.utils.fs import write_text_file
+=======
+from provisioningserver.utils.fs import (
+    tempdir,
+    write_text_file,
+)
+from provisioningserver.utils.service_monitor import ServiceActionError
+from provisioningserver.utils.shell import ExternalProcessError
+from testtools.content import Content
+from testtools.content_type import UTF8_TEXT
+>>>>>>> src/provisioningserver/import_images/tests/test_boot_resources.py
 from testtools.matchers import (
     DirExists,
     FileExists,
@@ -477,6 +488,87 @@ class TestMain(MAASTestCase):
             boot_resources.NoConfigFile,
             boot_resources.main, self.make_args(sources="", sources_file=""))
 
+<<<<<<< src/provisioningserver/import_images/tests/test_boot_resources.py
+=======
+    def test_update_targets_conf_ensures_tgt_service(self):
+        mock_ensureService = self.patch(
+            boot_resources.service_monitor, "ensureService")
+        self.patch(boot_resources, "call_and_check")
+        boot_resources.update_targets_conf(factory.make_name("snapshot"))
+        self.assertThat(mock_ensureService, MockCalledOnceWith("tgt"))
+
+    def test_update_targets_conf_logs_tgt_service_check_error(self):
+        # Regression test for LP:1735025
+        mock_ensureService = self.patch(
+            boot_resources.service_monitor, "ensureService")
+        mock_ensureService.side_effect = ServiceActionError()
+        mock_try_send_rack_event = self.patch(
+            boot_resources, 'try_send_rack_event')
+        mock_maaslog = self.patch(boot_resources.maaslog, 'warning')
+        boot_resources.update_targets_conf(factory.make_name("snapshot"))
+        self.assertThat(mock_try_send_rack_event, MockCalledOnce())
+        self.assertThat(mock_maaslog, MockCalledOnce())
+
+    def test_update_targets_conf_logs_error(self):
+        self.patch(boot_resources.service_monitor, "ensureService")
+        mock_try_send_rack_event = self.patch(
+            boot_resources, 'try_send_rack_event')
+        mock_maaslog = self.patch(boot_resources.maaslog, 'warning')
+        self.patch(boot_resources.os.path, 'exists').return_value = True
+        self.patch(boot_resources, 'call_and_check').side_effect = (
+            ExternalProcessError(
+                returncode=2, cmd=('tgt-admin',), output='error'))
+        snapshot = factory.make_name("snapshot")
+        boot_resources.update_targets_conf(snapshot)
+        self.assertThat(mock_try_send_rack_event, MockCalledOnce())
+        self.assertThat(mock_maaslog, MockCalledOnce())
+        self.assertThat(
+            boot_resources.call_and_check,
+            MockCalledOnceWith([
+                'sudo', '-n', '/usr/sbin/tgt-admin',
+                '--conf', os.path.join(snapshot, 'maas.tgt'),
+                '--update', 'ALL'], env=os.environ))
+
+    def test_update_targets_only_runs_when_conf_exists(self):
+        # Regression test for LP:1655721
+        temp_dir = self.useFixture(TempDirectory()).path
+        self.useFixture(ClusterConfigurationFixture(tftp_root=temp_dir))
+        mock_ensureService = self.patch(
+            boot_resources.service_monitor, "ensureService")
+        mock_call_and_check = self.patch(boot_resources, "call_and_check")
+        mock_path_exists = self.patch(boot_resources.os.path, 'exists')
+        mock_path_exists.return_value = False
+        boot_resources.update_targets_conf(temp_dir)
+        self.assertThat(mock_ensureService, MockCalledOnceWith("tgt"))
+        self.assertThat(
+            mock_path_exists,
+            MockCalledOnceWith(os.path.join(temp_dir, 'maas.tgt')))
+        self.assertThat(mock_call_and_check, MockNotCalled())
+
+    def test_update_targets_conf_sets_env_var_in_snap(self):
+        # Regression test for LP:1718706
+        self.patch(boot_resources.service_monitor, "ensureService")
+        self.patch(boot_resources.os.path, 'exists').return_value = True
+        self.patch(boot_resources, 'call_and_check')
+        self.patch(boot_resources, 'running_in_snap').return_value = True
+        snap_data_path = factory.make_name('snap_data_path')
+        self.patch(boot_resources, 'get_snap_data_path').return_value = (
+            snap_data_path)
+        snapshot = factory.make_name("snapshot")
+        boot_resources.update_targets_conf(snapshot)
+        self.assertThat(
+            boot_resources.call_and_check,
+            MockCalledOnceWith([
+                'sudo', '-n', '/usr/sbin/tgt-admin',
+                '--conf', os.path.join(snapshot, 'maas.tgt'),
+                '--update', 'ALL'
+                ], env={
+                    'TGT_IPC_SOCKET': os.path.join(
+                        snap_data_path, 'tgtd-socket'),
+                    **os.environ,
+                }))
+
+>>>>>>> src/provisioningserver/import_images/tests/test_boot_resources.py
 
 class TestMetaContains(MAASTestCase):
     """Tests for the `meta_contains` function."""
diff --git a/src/provisioningserver/import_images/tests/test_download_resources.py b/src/provisioningserver/import_images/tests/test_download_resources.py
index 9f40e29..81bc3c1 100644
--- a/src/provisioningserver/import_images/tests/test_download_resources.py
+++ b/src/provisioningserver/import_images/tests/test_download_resources.py
@@ -359,6 +359,41 @@ class TestRepoWriter(MAASTestCase):
                 label=product['label'], subarches={'ga-16.04', 'generic'},
                 bootloader_type=None))
 
+<<<<<<< src/provisioningserver/import_images/tests/test_download_resources.py
+    def test_inserts_no_generic_link_for_generic_non_ga_kflavor(self):
+        # Regression test for LP:1749246
+=======
+    def test_inserts_generic_link_for_generic_ga_kflavor(self):
+>>>>>>> src/provisioningserver/import_images/tests/test_download_resources.py
+        product_mapping = ProductMapping()
+        product = self.make_product(subarch='hwe-16.04', kflavor='generic')
+        product_mapping.add(product, 'hwe-16.04')
+        repo_writer = download_resources.RepoWriter(
+            None, None, product_mapping)
+        self.patch(
+            download_resources, 'products_exdata').return_value = product
+        # Prevent MAAS from trying to actually write the file.
+        mock_insert_file = self.patch(download_resources, 'insert_file')
+        mock_link_resources = self.patch(download_resources, 'link_resources')
+        # We only need to provide the product as the other fields are only used
+        # when writing the actual files to disk.
+        repo_writer.insert_item(product, None, None, None, None)
+        # None is used for the store and the content source as we're not
+        # writing anything to disk.
+        self.assertThat(
+            mock_insert_file,
+            MockCalledOnceWith(
+                None, os.path.basename(product['path']), product['sha256'],
+                {'sha256': product['sha256']}, product['size'], None))
+        # links are mocked out by the mock_insert_file above.
+        self.assertThat(
+            mock_link_resources,
+            MockCalledOnceWith(
+                snapshot_path=None, links=mock.ANY, osystem=product['os'],
+                arch=product['arch'], release=product['release'],
+                label=product['label'], subarches={'hwe-16.04'},
+                bootloader_type=None))
+
     def test_inserts_no_generic_link_for_generic_non_ga_kflavor(self):
         # Regression test for LP:1749246
         product_mapping = ProductMapping()
diff --git a/src/provisioningserver/utils/tests/test_network.py b/src/provisioningserver/utils/tests/test_network.py
index bda51e1..3b3c6b0 100644
--- a/src/provisioningserver/utils/tests/test_network.py
+++ b/src/provisioningserver/utils/tests/test_network.py
@@ -83,7 +83,10 @@ from provisioningserver.utils.network import (
     resolves_to_loopback_address,
     reverseResolve,
 )
+<<<<<<< src/provisioningserver/utils/tests/test_network.py
 from provisioningserver.utils.shell import get_env_with_locale
+=======
+>>>>>>> src/provisioningserver/utils/tests/test_network.py
 from testtools import ExpectedException
 from testtools.matchers import (
     Contains,
diff --git a/utilities/release-build b/utilities/release-build
index 3c0a5af..49f32cc 100755
--- a/utilities/release-build
+++ b/utilities/release-build
@@ -15,7 +15,7 @@ usage () {
     exit 1
 }
 
-DEFAULT_DISTROS="$(ubuntu-distro-info --supported | grep -v trusty)"
+DEFAULT_DISTROS="$(ubuntu-distro-info --supported | grep -v trusty | grep -v bionic)"
 PACKAGE_DISTROS=""
 KEEP_CHANGELOG=0
 
@@ -61,7 +61,7 @@ dch -a "" --release-heuristic log --nomultimaint
 PKG=$(head -n1 debian/changelog | awk '{print $1}')
 MAJOR_VER=$(head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//')
 REV_COUNT=$(git rev-list --count $COMMIT)
-REV_SHORT=$(git rev-parse --short $COMMIT)
+REV_SHORT=$(git rev-parse --short=7 $COMMIT)
 FULL_VER="$MAJOR_VER-$REV_COUNT-g$REV_SHORT"
 TARBALL="maas_$FULL_VER.orig.tar.gz"
 
@@ -89,3 +89,12 @@ if echo "$PACKAGE_DISTROS" | grep -q "bionic"; then
     sed -i "s/) UNRELEASED;/~18.04.1) bionic;/i" debian/changelog
     debuild -S -sa
 fi
+<<<<<<< utilities/release-build
+=======
+
+if echo "$PACKAGE_DISTROS" | grep -q "artful"; then
+    cp $ROOTDIR/debian/changelog debian/changelog
+    sed -i "s/) UNRELEASED;/~17.10.1) artful;/" debian/changelog
+    debuild -S
+fi
+>>>>>>> utilities/release-build