Merge lp:~allenap/maas/zone-sort-by-name--bug-1262160 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Sort nodes by zone name instead of zone ID.

[Jeroen T. Vermeulen (jtv)]

That easy? What a relief! Django has its good sides, eh?

Instead of hard-coding zone names in the test, I'd just create a slightly longer list and let factory.make_zone() come up with names...

    zones = [factory.make_zone() for _ in range(5)]

The longer list will make it most likely that failures to sort will be exposed.

review: Approve

[Gavin Panella (allenap)]

> That easy? What a relief! Django has its good sides, eh?
>
> Instead of hard-coding zone names in the test, I'd just create a slightly
> longer list and let factory.make_zone() come up with names...
>
> zones = [factory.make_zone() for _ in range(5)]
>
> The longer list will make it most likely that failures to sort will be
> exposed.

Okay, I'll do that. There's the possibility of false success, but it's low.

I'll also remove the TODO you added about this; I missed that.

=== modified file 'src/maasserver/models/zone.py'
--- src/maasserver/models/zone.py	2013-12-18 12:27:33 +0000
+++ src/maasserver/models/zone.py	2013-12-18 13:46:10 +0000
@@ -41,6 +41,7 @@
         """Needed for South to recognize this model."""
         verbose_name = "Availability zone"
         verbose_name_plural = "Availability zones"
+        ordering = ["name"]
 
     name = CharField(
         max_length=256, unique=True, editable=True,
 
=== modified file 'src/maasserver/tests/test_views_nodes.py'
--- src/maasserver/tests/test_views_nodes.py	2013-12-18 11:16:29 +0000
+++ src/maasserver/tests/test_views_nodes.py	2013-12-18 13:46:10 +0000
@@ -181,13 +181,7 @@
                 if link.startswith('/nodes/node')])
 
     def test_node_list_sorts_by_zone(self):
-        # TODO JeroenVermeulen 2013-12-18, bug=1262160: This is cheating.
-        #      Sorting by zone should sort by zone name, but it actually sorts
-        #      by zone ID.  Make this test pass with the default random names!
-        zones = [
-            factory.make_zone(name='z-%d' % counter)
-            for counter in range(3)
-            ]
+        zones = [factory.make_zone() for _ in range(5)]
         nodes = [factory.make_node(zone=zone) for zone in zones]
 
         # First check the ascending sort order