openstack/python-glanceclient
Code Issues Proposed changes

Merge "Add os_ prefix to project_domain_name/id"

Browse Source
This commit is contained in:
Jenkins 2015-01-04 10:40:07 +00:00 committed by Gerrit Code Review
commit 7ce1ff9325
2 changed files with 19 additions and 3 deletions
glanceclient
shell.py
tests
test_shell.py

6
glanceclient/shell.py

@ -480,12 +480,12 @@ class OpenStackImagesShell(object):
project_info = (args.os_tenant_name or
args.os_tenant_id or
(args.os_project_name and
(args.project_domain_name or
args.project_domain_id)) or
(args.os_project_domain_name or
args.os_project_domain_id)) or
args.os_project_id)
if (not project_info):
# tenent is deprecated in Keystone v3. Use the latest
# tenant is deprecated in Keystone v3. Use the latest
# terminology instead.
raise exc.CommandError(
_("You must provide a project_id or project_name ("

16
tests/test_shell.py

@ -273,6 +273,22 @@ class ShellTest(utils.TestCase):
# Make sure we are actually prompted.
mock_getpass.assert_called_with('OS Password: ')
@mock.patch(
'glanceclient.shell.OpenStackImagesShell._get_keystone_session')
@mock.patch.object(openstack_shell.OpenStackImagesShell, '_cache_schemas')
def test_no_auth_with_proj_name(self, cache_schemas, session):
with mock.patch('glanceclient.v2.client.Client'):
args = ('--os-project-name myname '
'--os-project-domain-name mydomain '
'--os-project-domain-id myid '
'--os-image-api-version 2 image-list')
glance_shell = openstack_shell.OpenStackImagesShell()
glance_shell.main(args.split())
((args), kwargs) = session.call_args
self.assertEqual('myname', kwargs['project_name'])
self.assertEqual('mydomain', kwargs['project_domain_name'])
self.assertEqual('myid', kwargs['project_domain_id'])
class ShellTestWithKeystoneV3Auth(ShellTest):
# auth environment to use