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

[LaMont Jones]

Restore ability to switch between name and MAC on machine details page interface table.

Restore ability to switch between name and MAC on machine details page interface table.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

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

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Fetched 306 kB in 0s (551 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql psmisc pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
psmisc is already the newest version (22.21-2.1build1).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is alr...

[MAAS Lander (maas-lander)]

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

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Fetched 306 kB in 0s (645 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql psmisc pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
psmisc is already the newest version (22.21-2.1build1).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is alr...

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2017-03-02 19:27:23 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2017-03-06 18:08:47 +0000
@@ -199,7 +199,7 @@
         $scope.loaded = false;
         $scope.nodeHasLoaded = false;
         $scope.managersHaveLoaded = false;
-        $scope.column = 'name';
+        $scope.tableInfo = {column: 'name'};
         $scope.fabrics = FabricsManager.getItems();
         $scope.vlans = VLANsManager.getItems();
         $scope.subnets = SubnetsManager.getItems();

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/node_details_storage.js	2016-10-12 16:34:23 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_storage.js	2017-03-06 18:08:47 +0000
@@ -123,7 +123,7 @@
             }
         ];
 
-        $scope.column = 'name';
+        $scope.tableInfo = {column: 'name'};
         $scope.has_disks = false;
         $scope.filesystems = [];
         $scope.filesystemsMap = {};

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2017-03-02 17:07:13 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2017-03-06 18:08:47 +0000
@@ -373,7 +373,7 @@
         expect($scope.loaded).toBe(false);
         expect($scope.nodeHasLoaded).toBe(false);
         expect($scope.managersHaveLoaded).toBe(false);
-        expect($scope.column).toBe('name');
+        expect($scope.tableInfo.column).toBe('name');
         expect($scope.fabrics).toBe(FabricsManager.getItems());
         expect($scope.vlans).toBe(VLANsManager.getItems());
         expect($scope.subnets).toBe(SubnetsManager.getItems());

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2016-10-12 16:34:23 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2017-03-06 18:08:47 +0000
@@ -264,7 +264,7 @@
 
     it("sets initial values", function() {
         var controller = makeController();
-        expect($scope.column).toBe('name');
+        expect($scope.tableInfo.column).toBe('name');
         expect($scope.has_disks).toBe(false);
         expect($scope.filesystems).toEqual([]);
         expect($scope.filesystemsMap).toEqual({});

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2017-03-02 21:42:46 +0000
+++ src/maasserver/static/partials/node-details.html	2017-03-06 18:08:47 +0000
@@ -600,13 +600,13 @@
                                   <div class="table__header table-col--12">
                                     <span data-ng-if="!isDevice">
                                       <a class="table__header-link is-active"
-                                          data-ng-class="{ 'is-active': column == 'name' }"
-                                          data-ng-click="column = 'name'">
+                                          data-ng-class="{ 'is-active': tableInfo.column == 'name' }"
+                                          data-ng-click="tableInfo.column = 'name'">
                                           Name
                                       </a>
                                       <span class="divide"></span>
-                                      <a class="table__header-link" data-ng-class="{ 'is-active': column == 'mac' }"
-                                          data-ng-click="column = 'mac'">
+                                      <a class="table__header-link" data-ng-class="{ 'is-active': tableInfo.column == 'mac' }"
+                                          data-ng-click="tableInfo.column = 'mac'">
                                           MAC
                                       </a>
                                     </span>
@@ -636,14 +636,14 @@
                                           data-ng-if="!isController && isNodeEditingAllowed()">
                                       <label for="{$ getUniqueKey(interface) $}"></label>
                                   </div>
-                                  <div class="table__data table-col--12" aria-label="Name" data-ng-if="!isDevice" data-ng-show="column == 'name'">
+                                  <div class="table__data table-col--12" aria-label="Name" data-ng-if="!isDevice" data-ng-show="tableInfo.column == 'name'">
                                       <span data-ng-if="!isEditing(interface)">{$ interface.name $}</span>
                                       <input type="text" class="table__input"
                                           data-ng-if="isEditing(interface) && interface.type != 'vlan'"
                                           data-ng-model="editInterface.name"
                                           data-ng-class="{ 'has-error': isInterfaceNameInvalid(editInterface) }">
                                   </div>
-                                  <div class="table__data table-col--12 ng-hide" data-ng-if="!isDevice" data-ng-show="column == 'mac'">
+                                  <div class="table__data table-col--12 ng-hide" data-ng-if="!isDevice" data-ng-show="tableInfo.column == 'mac'">
                                       {$ interface.mac_address $}
                                   </div>
                                   <div class="table__data table-col--12" data-ng-if="isDevice">{$ interface.mac_address $}</div>
@@ -714,9 +714,9 @@
                                           <div data-ng-show="isShowingMembers(interface)">
                                               <div class="table__data u-padding--top-none table-col--3"></div>
                                               <div class="table__data u-padding--top-none table-col--15"
-                                                  data-ng-show="column == 'name'">{$ member.name $}</div>
+                                                  data-ng-show="tableInfo.column == 'name'">{$ member.name $}</div>
                                               <div class="table__data u-padding--top-none table-col--15 ng-hide"
-                                                  data-ng-show="column == 'mac'">{$ member.mac_address $}</div>
+                                                  data-ng-show="tableInfo.column == 'mac'">{$ member.mac_address $}</div>
                                               <div class="table__data u-padding--top-none table-col--15">{$ getInterfaceTypeText(member) $}</div>
                                               <div class="table__data u-padding--top-none table-col--67">
                                               </div>
@@ -1535,11 +1535,11 @@
                                     <label for="available-check-all"></label>
                                 </div>
                                 <div class="table__header table-col--16">
-                                    <a class="table__header-link" data-ng-click="column = 'name'" data-ng-class="{'is-active': column === 'name'}">Name</a>
-                                    <span class="divide"></span>
-                                    <a class="table__header-link" data-ng-click="column = 'model'" data-ng-class="{'is-active': column === 'model'}">Model</a>
-                                    <span class="divide"></span>
-                                    <a class="table__header-link" data-ng-click="column = 'serial'" data-ng-class="{'is-active': column === 'serial'}">Serial</a>
+                                    <a class="table__header-link" data-ng-click="tableInfo.column = 'name'" data-ng-class="{'is-active': tableInfo.column === 'name'}">Name</a>
+                                    <span class="divide"></span>
+                                    <a class="table__header-link" data-ng-click="tableInfo.column = 'model'" data-ng-class="{'is-active': tableInfo.column === 'model'}">Model</a>
+                                    <span class="divide"></span>
+                                    <a class="table__header-link" data-ng-click="tableInfo.column = 'serial'" data-ng-class="{'is-active': tableInfo.column === 'serial'}">Serial</a>
                                 </div>
                                 <div class="table__header table-col--4">Boot</div>
                                 <div class="table__header table-col--15">Size</div>
@@ -1566,7 +1566,7 @@
                                             data-ng-disabled="isAvailableDisabled()" />
                                         <label for="{$ item.name $}" ></label>
                                     </div>
-                                    <div class="table__data table-col--16" data-ng-show="column === 'name'" aria-label="Name">
+                                    <div class="table__data table-col--16" data-ng-show="tableInfo.column === 'name'" aria-label="Name">
                                         <span data-ng-hide="availableMode === 'edit' && item.$selected">{$ item.name $}</span>
                                         <input type="text" class="table__input"
                                             data-ng-model="item.name"
@@ -1575,8 +1575,8 @@
                                             data-ng-disabled="item.type === 'partition' || isAllStorageDisabled() || !isSuperUser()"
                                             data-ng-change="nameHasChanged(item)">
                                     </div>
-                                    <div class="table__data table-col--16 ng-hide" data-ng-show="column === 'model'">{$ item.model $}</div>
-                                    <div class="table__data table-col--16 ng-hide" data-ng-show="column === 'serial'">{$ item.serial $}</div>
+                                    <div class="table__data table-col--16 ng-hide" data-ng-show="tableInfo.column === 'model'">{$ item.model $}</div>
+                                    <div class="table__data table-col--16 ng-hide" data-ng-show="tableInfo.column === 'serial'">{$ item.serial $}</div>
                                     <div class="table__data table-col--4 u-align--center" aria-label="Boot">
                                         <input type="radio" name="boot-disk" id="{$ item.name $}-boot"
                                             data-ng-click="setAsBootDisk(item)"
@@ -2248,11 +2248,11 @@
                             <div class="table__row">
                                 <div class="table__header table-col--3"></div>
                                 <div class="table__header table-col--16">
-                                    <a class="table__header-link" data-ng-click="column = 'name'" data-ng-class="{'is-active': column === 'name'}">Name</a>
-                                    <span class="divide"></span>
-                                    <a class="table__header-link" data-ng-click="column = 'model'" data-ng-class="{'is-active': column === 'model'}">Model</a>
-                                    <span class="divide"></span>
-                                    <a class="table__header-link" data-ng-click="column = 'serial'" data-ng-class="{'is-active': column === 'serial'}">Serial</a>
+                                    <a class="table__header-link" data-ng-click="tableInfo.column = 'name'" data-ng-class="{'is-active': tableInfo.column === 'name'}">Name</a>
+                                    <span class="divide"></span>
+                                    <a class="table__header-link" data-ng-click="tableInfo.column = 'model'" data-ng-class="{'is-active': tableInfo.column === 'model'}">Model</a>
+                                    <span class="divide"></span>
+                                    <a class="table__header-link" data-ng-click="tableInfo.column = 'serial'" data-ng-class="{'is-active': tableInfo.column === 'serial'}">Serial</a>
                                 </div>
                                 <div class="table__header table-col--4">Boot</div>
                                 <div class="table__header table-col--15">Device type</div>
@@ -2268,9 +2268,9 @@
                             <div data-ng-repeat="item in used">
                                 <div class="table__row details__used">
                                     <div class="table__data table-col--3 u-display--desktop"></div>
-                                    <div class="table__data table-col--16" data-ng-show="column === 'name'" aria-label="Name">{$ item.name $}</div>
-                                    <div class="table__data table-col--16" data-ng-show="column === 'model'">{$ item.model $}</div>
-                                    <div class="table__data table-col--16" data-ng-show="column === 'serial'">{$ item.serial $}</div>
+                                    <div class="table__data table-col--16" data-ng-show="tableInfo.column === 'name'" aria-label="Name">{$ item.name $}</div>
+                                    <div class="table__data table-col--16" data-ng-show="tableInfo.column === 'model'">{$ item.model $}</div>
+                                    <div class="table__data table-col--16" data-ng-show="tableInfo.column === 'serial'">{$ item.serial $}</div>
                                     <div class="table__data table-col--4 u-align--center" aria-label="Boot disk">
                                         <input type="radio" id="{$ item.name $}-boot" name="boot-disk"
                                             data-ng-click="setAsBootDisk(item)"