From a1261e7f9e05ec265ddb974e34916e27c304381c Mon Sep 17 00:00:00 2001 From: Masayuki Igawa Date: Mon, 17 Dec 2012 21:52:00 +0900 Subject: [PATCH] Fix keystone *-list order by 'name' 'keystone user-list' is order by 'name' now.(see bug 1073437) But {role, service, tenant, user-role}-list are not. So this patch fixes these. Fixes bug 1091894 Change-Id: I1876d0b1e1ea625efe91c3f8261bafd2bf34b0de --- keystoneclient/v2_0/shell.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keystoneclient/v2_0/shell.py b/keystoneclient/v2_0/shell.py index 93ab7afde..62cfe6a38 100755 --- a/keystoneclient/v2_0/shell.py +++ b/keystoneclient/v2_0/shell.py @@ -151,7 +151,7 @@ def do_user_delete(kc, args): def do_tenant_list(kc, args): """List all tenants""" tenants = kc.tenants.list() - utils.print_list(tenants, ['id', 'name', 'enabled']) + utils.print_list(tenants, ['id', 'name', 'enabled'], order_by='name') @utils.arg('id', metavar='', help='Tenant ID to display') @@ -223,7 +223,8 @@ def do_service_create(kc, args): def do_service_list(kc, args): """List all services in Service Catalog""" services = kc.services.list() - utils.print_list(services, ['id', 'name', 'type', 'description']) + utils.print_list(services, ['id', 'name', 'type', 'description'], + order_by='name') @utils.arg('id', metavar='', help='Service ID to display') @@ -242,7 +243,7 @@ def do_service_delete(kc, args): def do_role_list(kc, args): """List all roles""" roles = kc.roles.list() - utils.print_list(roles, ['id', 'name']) + utils.print_list(roles, ['id', 'name'], order_by='name') @utils.arg('id', metavar='', help='Role ID to display') @@ -311,7 +312,8 @@ def do_user_role_list(kc, args): role.user_id = args.user_id role.tenant_id = args.tenant_id - utils.print_list(roles, ['id', 'name', 'user_id', 'tenant_id']) + utils.print_list(roles, ['id', 'name', 'user_id', 'tenant_id'], + order_by='name') @utils.arg('--user-id', metavar='', help='User ID')