openstack/python-novaclient
Code Issues Proposed changes

Merge "make sure os_password is set for auth_plugins"

Browse Source
This commit is contained in:
Jenkins 2015-09-11 17:06:35 +00:00 committed by Gerrit Code Review
commit 37d1e29a0b
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
novaclient/shell.py
View File

@ -683,6 +683,9 @@ class OpenStackComputeShell(object):
project_name=project_name, project_name=project_name,
project_domain_id=args.os_project_domain_id, project_domain_id=args.os_project_domain_id,
project_domain_name=args.os_project_domain_name) project_domain_name=args.os_project_domain_name)
else:
# set password for auth plugins
os_password = args.os_password
if not do_help and not any([args.os_tenant_id, args.os_tenant_name, if not do_help and not any([args.os_tenant_id, args.os_tenant_name,
args.os_project_id, args.os_project_name]): args.os_project_id, args.os_project_name]):

16
novaclient/tests/unit/test_shell.py
View File

@ -58,6 +58,13 @@ FAKE_ENV4 = {'OS_USER_ID': 'user_id',
'OS_ENDPOINT_TYPE': 'osURL', 'OS_ENDPOINT_TYPE': 'osURL',
'OS_COMPUTE_API_VERSION': '2'} 'OS_COMPUTE_API_VERSION': '2'}
FAKE_ENV5 = {'OS_USERNAME': 'username',
'OS_PASSWORD': 'password',
'OS_TENANT_NAME': 'tenant_name',
'OS_AUTH_URL': 'http://no.where/v2.0',
'OS_COMPUTE_API_VERSION': '2',
'OS_AUTH_SYSTEM': 'rackspace'}
def _create_ver_list(versions): def _create_ver_list(versions):
return {'versions': {'values': versions}} return {'versions': {'values': versions}}
@ -505,6 +512,15 @@ class ShellTest(utils.TestCase):
self.shell, self.shell,
'--os-compute-api-version 2.3 list') '--os-compute-api-version 2.3 list')
@mock.patch('novaclient.client.Client')
def test_custom_auth_plugin(self, mock_client):
self.make_env(fake_env=FAKE_ENV5)
self.shell('list')
password = mock_client.call_args_list[0][0][2]
client_kwargs = mock_client.call_args_list[0][1]
self.assertEqual(password, 'password')
self.assertIs(client_kwargs['session'], None)
class TestLoadVersionedActions(utils.TestCase): class TestLoadVersionedActions(utils.TestCase):