openstack/python-keystoneclient
Code Issues Proposed changes

enabled treated as string (bug 953678)

Browse Source 
Change-Id: I897797b3fb264647c486e6c10eab8edd00eadbcc
This commit is contained in:
Dolph Mathews
2012-03-13 15:51:23 -05:00
parent 8c824bd639
commit 5c223fb641
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystoneclient/utils.py
View File

@@ -91,4 +91,7 @@ def isunauthenticated(f):
def string_to_bool(arg): def string_to_bool(arg):
if isinstance(arg, bool):
return arg
return arg.strip().lower() in ('t', 'true', 'yes', '1') return arg.strip().lower() in ('t', 'true', 'yes', '1')

8
keystoneclient/v2_0/shell.py
View File

@@ -42,7 +42,8 @@ def do_user_list(kc, args):
def do_user_create(kc, args): def do_user_create(kc, args):
"""Create new user""" """Create new user"""
user = kc.users.create(args.name, args.passwd, args.email, user = kc.users.create(args.name, args.passwd, args.email,
tenant_id=args.tenant_id, enabled=args.enabled) tenant_id=args.tenant_id,
enabled=utils.string_to_bool(args.enabled))
utils.print_dict(user._info) utils.print_dict(user._info)
@@ -111,7 +112,7 @@ def do_tenant_create(kc, args):
"""Create new tenant""" """Create new tenant"""
tenant = kc.tenants.create(args.name, tenant = kc.tenants.create(args.name,
description=args.description, description=args.description,
enabled=args.enabled) enabled=utils.string_to_bool(args.enabled))
utils.print_dict(tenant._info) utils.print_dict(tenant._info)
@@ -131,8 +132,7 @@ def do_tenant_update(kc, args):
if args.description: if args.description:
kwargs.update({'description': args.description}) kwargs.update({'description': args.description})
if args.enabled: if args.enabled:
new_enable = args.enabled.lower() in ['true', 'yes', '1'] kwargs.update({'enabled': utils.string_to_bool(args.enabled)})
kwargs.update({'enabled': new_enable})
if kwargs == {}: if kwargs == {}:
print "Tenant not updated, no arguments present." print "Tenant not updated, no arguments present."