---
lib/cmdlib.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index ed4faff..5bb3c3b 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -39,6 +39,7 @@ import OpenSSL
import socket
import tempfile
import shutil
+import operator
from ganeti import ssh
from ganeti import utils
@@ -545,9 +546,11 @@ class _QueryBase:
"""
if fields is None:
- # Client requests all fields
- fdefs = query.GetAllFields(cls.FIELDS.values())
+ # Client requests all fields, sort by name
+ fdefs = sorted(query.GetAllFields(cls.FIELDS.values()),
+ key=operator.attrgetter("name"))
else:
+ # Keep order as requested by client
fdefs = query.Query(cls.FIELDS, fields).GetFields()
return objects.QueryFieldsResponse(fields=fdefs).ToDict()
--
1.7.3.1
