Merge lp:~mpontillo/maas/fix-ip-range-ordering--bug-1671517 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix sorting of IP ranges on subnet details page.

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~mpontillo/maas/fix-ip-range-ordering--bug-1671517 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 (584 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...

=== modified file 'src/maasserver/static/js/angular/directives/ipranges.js'
--- src/maasserver/static/js/angular/directives/ipranges.js	2016-10-20 20:53:41 +0000
+++ src/maasserver/static/js/angular/directives/ipranges.js	2017-04-12 22:53:37 +0000
@@ -6,8 +6,9 @@
 
 angular.module('MAAS').directive('maasIpRanges', [
     '$filter', 'IPRangesManager', 'UsersManager',
-    'ManagerHelperService', function(
-        $filter, IPRangesManager, UsersManager, ManagerHelperService) {
+    'ManagerHelperService', 'ConverterService', function(
+        $filter, IPRangesManager, UsersManager, ManagerHelperService,
+        ConverterService) {
         return {
             restrict: "E",
             scope: {
@@ -105,6 +106,15 @@
                     });
                 };
 
+                // Sort ranges by starting IP address.
+                $scope.ipRangeSort = function(range) {
+                    if(range.start_ip.indexOf(':') !== -1) {
+                        return ConverterService.ipv6Expand(range.start_ip);
+                    } else {
+                        return ConverterService.ipv4ToInteger(range.start_ip);
+                    }
+                };
+
                 // Load the reqiured managers.
                 ManagerHelperService.loadManagers($scope, [
                     IPRangesManager, UsersManager]).then(

=== modified file 'src/maasserver/static/js/angular/directives/tests/test_ipranges.js'
--- src/maasserver/static/js/angular/directives/tests/test_ipranges.js	2016-10-20 20:53:41 +0000
+++ src/maasserver/static/js/angular/directives/tests/test_ipranges.js	2017-04-12 22:53:37 +0000
@@ -299,4 +299,24 @@
             expect(scope.deleteIPRange).toBeNull();
         });
     });
+
+    describe("ipRangeSort", function() {
+
+        it("returns sortable numeric IPv4 value", function() {
+            var directive = compileDirective();
+            var scope = directive.isolateScope();
+            var smaller = scope.ipRangeSort({ 'start_ip': '10.0.0.21'});
+            var larger = scope.ipRangeSort({ 'start_ip': '10.0.0.200'});
+            expect(smaller < larger).toBe(true);
+        });
+
+        it("returns sortable numeric IPv6 value", function() {
+            var directive = compileDirective();
+            var scope = directive.isolateScope();
+            var smaller = scope.ipRangeSort({ 'start_ip': '2001::21'});
+            var larger = scope.ipRangeSort({ 'start_ip': '2001::200'});
+            expect(smaller < larger).toBe(true);
+        });
+    });
+
 });

=== modified file 'src/maasserver/static/partials/ipranges.html'
--- src/maasserver/static/partials/ipranges.html	2017-04-07 16:08:21 +0000
+++ src/maasserver/static/partials/ipranges.html	2017-04-12 22:53:37 +0000
@@ -10,10 +10,9 @@
             </div>
         </header>
         <main class="table__body">
-            <div class="table__row"
-		data-ng-repeat="iprange in (subnetIPRanges = ipranges | filterBySubnet:obj | orderBy:'start_ip')"
+            <div class="table__row" data-ng-repeat="iprange in (subnetIPRanges = ipranges | filterBySubnet:obj) | orderBy:ipRangeSort"
                 data-ng-class="{ 'is-active': isIPRangeInEditMode(iprange) || isIPRangeInDeleteMode(iprange)}">
-		<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="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_username $}</div>
                 <div class="table__data table-col--10" aria-label="Type">{$ iprange.type == "dynamic" ? "Dynamic" : "Reserved" $}</div>