From a4043c83caf7713dd930c9285859e911a427b27c Mon Sep 17 00:00:00 2001 From: Yogeshwar Srikrishnan Date: Wed, 12 Oct 2011 11:29:03 -0500 Subject: Changes to show name also for the user list. Change-Id: I1a720be5b1bacde6679c20f35d6103c47b78c451 --- keystone/manage/__init__.py | 2 +- keystone/manage/api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keystone/manage/__init__.py b/keystone/manage/__init__.py index 564b2fd4..678e6072 100644 --- a/keystone/manage/__init__.py +++ b/keystone/manage/__init__.py @@ -130,7 +130,7 @@ def process(*args): print "SUCCESS: User %s disabled." % object_id elif (object_type, command) == ('user', 'list'): - print_table(('id', 'enabled', 'tenant'), api.list_users()) + print_table(('id', 'name', 'enabled', 'tenant'), api.list_users()) elif (object_type, command) == ('tenant', 'add'): if api.add_tenant(name=object_id): diff --git a/keystone/manage/api.py b/keystone/manage/api.py index 0d013360..0a3c06bc 100644 --- a/keystone/manage/api.py +++ b/keystone/manage/api.py @@ -28,7 +28,7 @@ def list_users(): objects = db_api.USER.get_all() if objects == None: raise IndexError("No users found") - return [[o.id, o.enabled, o.tenant_id] for o in objects] + return [[o.id, o.name, o.enabled, o.tenant_id] for o in objects] def add_tenant(name): -- cgit