openstack/python-senlinclient
Code Issues Proposed changes

Support keystone v2 and v3

Browse Source 
Though senlin uses keystone v3 on the server side, on the
client side should support both keystone v2 and v3.

Change-Id: I12711b87a2ab114f42abd1c1b4e7fd1724311e4c
This commit is contained in:
Haiwei Xu 2015-07-03 09:15:25 +09:00
parent 608589c916
commit ac7c4b3a06
1 changed files with 19 additions and 17 deletions

36
senlinclient/shell.py

@ -164,14 +164,15 @@ class SenlinShell(object):
'user ID for authentication') 'user ID for authentication')
print(_('WARNING: %s') % msg) print(_('WARNING: %s') % msg)
if (args.username and not args.user_id): if 'v3' in args.auth_url:
if not (args.user_domain_id or args.user_domain_name): if (args.username and not args.user_id):
msg = _('Either user domain ID (--user-domain-id / ' if not (args.user_domain_id or args.user_domain_name):
'env[OS_USER_DOMAIN_ID]) or user domain name ' msg = _('Either user domain ID (--user-domain-id / '
'(--user-domain-name / env[OS_USER_DOMAIN_NAME ' 'env[OS_USER_DOMAIN_ID]) or user domain name '
'must be specified, because user name may not be ' '(--user-domain-name / env[OS_USER_DOMAIN_NAME '
'unique.') 'must be specified, because user name may not be '
raise exc.CommandError(msg) 'unique.')
raise exc.CommandError(msg)
# password is needed if username or user_id is present # password is needed if username or user_id is present
if (args.username or args.user_id) and not (args.password): if (args.username or args.user_id) and not (args.password):
@ -201,15 +202,16 @@ class SenlinShell(object):
print(_('WARNING: %s') % msg) print(_('WARNING: %s') % msg)
# project name may not be unique # project name may not be unique
if (not (args.project_id or args.tenant_id) and if 'v3' in args.auth_url:
(args.project_name or args.tenant_name) and if (not (args.project_id or args.tenant_id) and
not (args.project_domain_id or args.project_domain_name)): (args.project_name or args.tenant_name) and
msg = _('Either project domain ID (--project-domain-id / ' not (args.project_domain_id or args.project_domain_name)):
'env[OS_PROJECT_DOMAIN_ID]) orr project domain name ' msg = _('Either project domain ID (--project-domain-id / '
'(--project-domain-name / env[OS_PROJECT_DOMAIN_NAME ' 'env[OS_PROJECT_DOMAIN_ID]) orr project domain name '
'must be specified, because project/tenant name may not ' '(--project-domain-name / env[OS_PROJECT_DOMAIN_NAME '
'be unique.') 'must be specified, because project/tenant name may '
raise exc.CommandError(msg) 'not be unique.')
raise exc.CommandError(msg)
def _setup_senlin_client(self, api_ver, args): def _setup_senlin_client(self, api_ver, args):
'''Create senlin client using given args.''' '''Create senlin client using given args.'''