Merge lp:~blake-rouse/maas/fix-1577386 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix sorting of node actions.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Christian Reis (kiko)]

On Mon, May 02, 2016 at 12:54:28PM -0000, Blake Rouse wrote:
> === modified file 'src/maasserver/websockets/handlers/general.py'
> --- src/maasserver/websockets/handlers/general.py 2016-04-29 07:41:09 +0000
> +++ src/maasserver/websockets/handlers/general.py 2016-05-02 12:53:53 +0000
> @@ -7,6 +7,8 @@
> "GeneralHandler",
> ]
>
> +from operator import itemgetter
> +
> from maasserver.clusterrpc.power_parameters import (
> get_all_power_types_from_clusters,
> )
> @@ -83,14 +85,14 @@
>
> def dehydrate_actions(self, actions):
> """Dehydrate all the actions."""
> - return [
> + return sorted([
> {
> "name": name,
> "title": action.display,
> "sentence": action.display_sentence,
> }
> for name, action in actions.items()
> - ]
> + ], key=itemgetter("name"))
>
> def _node_actions(self, params, node_type):
> # Only admins can perform controller actions
>
> === modified file 'src/maasserver/websockets/handlers/tests/test_general.py'
> --- src/maasserver/websockets/handlers/tests/test_general.py 2016-04-29 07:41:09 +0000
> +++ src/maasserver/websockets/handlers/tests/test_general.py 2016-05-02 12:53:53 +0000
> @@ -5,6 +5,8 @@
>
> __all__ = []
>
> +from operator import itemgetter
> +
> from distro_info import UbuntuDistroInfo
> from maasserver.enum import (
> BOND_LACP_RATE_CHOICES,
> @@ -28,14 +30,14 @@
> class TestGeneralHandler(MAASServerTestCase):
>
> def dehydrate_actions(self, actions):
> - return [
> + return sorted([
> {
> "name": name,
> "title": action.display,
> "sentence": action.display_sentence,
> }
> for name, action in actions.items()
> - ]
> + ], key=itemgetter("name"))
>
> def test_architectures(self):
> arches = [

I'm seeing double!

=== modified file 'src/maasserver/websockets/handlers/general.py'
--- src/maasserver/websockets/handlers/general.py	2016-04-29 07:41:09 +0000
+++ src/maasserver/websockets/handlers/general.py	2016-05-02 12:53:53 +0000
@@ -7,6 +7,8 @@
     "GeneralHandler",
     ]
 
+from operator import itemgetter
+
 from maasserver.clusterrpc.power_parameters import (
     get_all_power_types_from_clusters,
 )
@@ -83,14 +85,14 @@
 
     def dehydrate_actions(self, actions):
         """Dehydrate all the actions."""
-        return [
+        return sorted([
             {
                 "name": name,
                 "title": action.display,
                 "sentence": action.display_sentence,
             }
             for name, action in actions.items()
-            ]
+            ], key=itemgetter("name"))
 
     def _node_actions(self, params, node_type):
         # Only admins can perform controller actions

=== modified file 'src/maasserver/websockets/handlers/tests/test_general.py'
--- src/maasserver/websockets/handlers/tests/test_general.py	2016-04-29 07:41:09 +0000
+++ src/maasserver/websockets/handlers/tests/test_general.py	2016-05-02 12:53:53 +0000
@@ -5,6 +5,8 @@
 
 __all__ = []
 
+from operator import itemgetter
+
 from distro_info import UbuntuDistroInfo
 from maasserver.enum import (
     BOND_LACP_RATE_CHOICES,
@@ -28,14 +30,14 @@
 class TestGeneralHandler(MAASServerTestCase):
 
     def dehydrate_actions(self, actions):
-        return [
+        return sorted([
             {
                 "name": name,
                 "title": action.display,
                 "sentence": action.display_sentence,
             }
             for name, action in actions.items()
-            ]
+            ], key=itemgetter("name"))
 
     def test_architectures(self):
         arches = [