openstack/deb-python-keystoneclient
Code Issues Proposed changes

Remove internal '-' from flag names

Browse Source 
Fixes bug 936400
* global --auth-url becomes --auth_url
* user-create --default-tenant becomes --tenant_id

Change-Id: I483bb369556f4da2a6de61a39d00a7adbe1cf12e
This commit is contained in:
Dean Troyer
2012-02-20 11:50:08 -06:00
parent 5d5160ce50
commit f4297ce10d
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/shell.py
View File

@@ -80,7 +80,7 @@ class OpenStackIdentityShell(object):
default=env('OS_TENANT_ID'),
help='Defaults to env[OS_TENANT_ID].')
parser.add_argument('--auth-url',
parser.add_argument('--auth_url',
default=env('OS_AUTH_URL'),
help='Defaults to env[OS_AUTH_URL].')

4
keystoneclient/v2_0/shell.py
View File

@@ -35,13 +35,13 @@ def do_user_list(kc, args):
help='Desired password.')
@utils.arg('--email', metavar='<email>', nargs='?',
help='Desired email address. (unique)')
@utils.arg('--default-tenant', metavar='<default_tenant>', nargs='?',
@utils.arg('--tenant_id', metavar='<tenant>', nargs='?',
help='User will join the default tenant as a Member.')
@utils.arg('--enabled', metavar='<enabled>', nargs='?', default=True,
help='Enable user immediately (Optional, default True)')
def do_user_create(kc, args):
user = kc.users.create(args.name, args.passwd, args.email,
tenant_id=args.default_tenant, enabled=args.enabled)
tenant_id=args.tenant_id, enabled=args.enabled)
utils.print_dict(user._info)

37
tests/test_shell.py
View File

@@ -58,7 +58,7 @@ class ShellTest(utils.TestCase):
b.tenant_name, b.username, b.version) == \
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, DEFAULT_TENANT_ID,
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
shell('--auth-url http://0.0.0.0:5000/ --password xyzpdq '
shell('--auth_url http://0.0.0.0:5000/ --password xyzpdq '
'--tenant_id 1234 --tenant_name fred --username barney '
'--version 2.0 user-list')
assert do_tenant_mock.called
@@ -68,6 +68,41 @@ class ShellTest(utils.TestCase):
('http://0.0.0.0:5000/', 'xyzpdq', '1234',
'fred', 'barney', '2.0')
def test_shell_user_create_args(self):
"""Test user-create args"""
do_uc_mock = mock.MagicMock()
# grab the decorators for do_user_create
uc_func = getattr(shell_v2_0, 'do_user_create')
do_uc_mock.arguments = getattr(uc_func, 'arguments', [])
with mock.patch('keystoneclient.v2_0.shell.do_user_create',
do_uc_mock):
# Test case with one --tenant_id args present: ec2 creds
shell('user-create --name=FOO '
'--pass=secrete --tenant_id=barrr --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
# restore os_tenant_id when review 4295 is merged
assert (b.auth_url, b.password, # b.os_tenant_id,
b.tenant_name, b.username, b.version) == \
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, # DEFAULT_TENANT_ID,
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
assert (b.tenant_id, b.name, b.passwd, b.enabled) == \
('barrr', 'FOO', 'secrete', 'true')
# Test case with two --tenant_id args present
shell('--tenant_id=os-tenant user-create --name=FOO '
'--pass=secrete --tenant_id=barrr --enabled=true')
assert do_uc_mock.called
((a, b), c) = do_uc_mock.call_args
# restore os_tenant_id when review 4295 is merged
assert (b.auth_url, b.password, # b.os_tenant_id,
b.tenant_name, b.username, b.version) == \
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, # 'os-tenant',
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
assert (b.tenant_id, b.name, b.passwd, b.enabled) == \
('barrr', 'FOO', 'secrete', 'true')
def test_do_tenant_create(self):
do_tenant_mock = mock.MagicMock()
with mock.patch('keystoneclient.v2_0.shell.do_tenant_create',