openstack/python-keystoneclient
Code Issues Proposed changes

Fix --tenant_id corner case with ec2-create-creds command

Browse Source 
And add some tests for that case

Rebased after CLI changes merged
Rebased again after more bit rot discovered

Change-Id: I95fa5ab19bff1d5e884b5c3675a123b134866e21
This commit is contained in:
Dean Troyer
2012-02-17 16:56:40 -06:00
parent 81116e4441
commit 265d4e9ffb
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/shell.py
View File

@@ -79,7 +79,7 @@ class OpenStackIdentityShell(object):
help='Defaults to env[OS_TENANT_NAME]') help='Defaults to env[OS_TENANT_NAME]')
parser.add_argument('--tenant_id', parser.add_argument('--tenant_id',
default=env('OS_TENANT_ID'), default=env('OS_TENANT_ID'), dest='os_tenant_id',
help='Defaults to env[OS_TENANT_ID]') help='Defaults to env[OS_TENANT_ID]')
parser.add_argument('--auth_url', parser.add_argument('--auth_url',
@@ -204,7 +204,7 @@ class OpenStackIdentityShell(object):
self.cs = self.get_api_class(api_version)( self.cs = self.get_api_class(api_version)(
username=args.username, username=args.username,
tenant_name=args.tenant_name, tenant_name=args.tenant_name,
tenant_id=args.tenant_id, tenant_id=args.os_tenant_id,
token=token, token=token,
endpoint=endpoint, endpoint=endpoint,
password=args.password, password=args.password,

36
tests/test_shell.py
View File

@@ -54,7 +54,7 @@ class ShellTest(utils.TestCase):
shell('user-list') shell('user-list')
assert do_tenant_mock.called assert do_tenant_mock.called
((a, b), c) = do_tenant_mock.call_args ((a, b), c) = do_tenant_mock.call_args
assert (b.auth_url, b.password, b.tenant_id, assert (b.auth_url, b.password, b.os_tenant_id,
b.tenant_name, b.username, b.identity_api_version) == \ b.tenant_name, b.username, b.identity_api_version) == \
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, DEFAULT_TENANT_ID, (DEFAULT_AUTH_URL, DEFAULT_PASSWORD, DEFAULT_TENANT_ID,
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '') DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
@@ -63,7 +63,7 @@ class ShellTest(utils.TestCase):
'--identity_api_version 2.0 user-list') '--identity_api_version 2.0 user-list')
assert do_tenant_mock.called assert do_tenant_mock.called
((a, b), c) = do_tenant_mock.call_args ((a, b), c) = do_tenant_mock.call_args
assert (b.auth_url, b.password, b.tenant_id, assert (b.auth_url, b.password, b.os_tenant_id,
b.tenant_name, b.username, b.identity_api_version) == \ b.tenant_name, b.username, b.identity_api_version) == \
('http://0.0.0.0:5000/', 'xyzpdq', '1234', ('http://0.0.0.0:5000/', 'xyzpdq', '1234',
'fred', 'barney', '2.0') 'fred', 'barney', '2.0')
@@ -120,3 +120,35 @@ class ShellTest(utils.TestCase):
do_tenant_mock): do_tenant_mock):
shell('tenant-list') shell('tenant-list')
assert do_tenant_mock.called assert do_tenant_mock.called
def test_shell_tenant_id_args(self):
"""Test a corner case where --tenant_id appears on the
command-line twice"""
do_ec2_mock = mock.MagicMock()
# grab the decorators for do_ec2_create_credentials
ec2_func = getattr(shell_v2_0, 'do_ec2_credentials_create')
do_ec2_mock.arguments = getattr(ec2_func, 'arguments', [])
with mock.patch('keystoneclient.v2_0.shell.do_ec2_credentials_create',
do_ec2_mock):
# Test case with one --tenant_id args present: ec2 creds
shell('ec2-credentials-create '
'--tenant_id=ec2-tenant --user=ec2-user')
assert do_ec2_mock.called
((a, b), c) = do_ec2_mock.call_args
assert (b.auth_url, b.password, b.os_tenant_id,
b.tenant_name, b.username, b.identity_api_version) == \
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, DEFAULT_TENANT_ID,
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
assert (b.tenant_id, b.user) == ('ec2-tenant', 'ec2-user')
# Test case with two --tenant_id args present
shell('--tenant_id=os-tenant ec2-credentials-create '
'--tenant_id=ec2-tenant --user=ec2-user')
assert do_ec2_mock.called
((a, b), c) = do_ec2_mock.call_args
assert (b.auth_url, b.password, b.os_tenant_id,
b.tenant_name, b.username, b.identity_api_version) == \
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, 'os-tenant',
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
assert (b.tenant_id, b.user) == ('ec2-tenant', 'ec2-user')