openstack/python-mistralclient
Code Issues Proposed changes

Delete requirement on unneeded arguments

Browse Source 
* There was a requirement - mistralclient doesn't
 init without user_id or username and project_id or project_name
 However, keystone doesn't need this parameter if token is provided.

Closes-Bug: #1407992

Change-Id: I903d52f2552d6b5e718d13d5957404e0a2d9f9d3
This commit is contained in:
Nikolay Mahotkin 2015-04-20 13:13:41 +03:00
parent 3a4c1ff8f3
commit d339608bc1
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mistralclient/api/v2/client.py
View File

@ -29,7 +29,7 @@ from mistralclient.api.v2 import workflows
class Client(object):
def __init__(self, mistral_url=None, username=None, api_key=None,
project_name=None, auth_url=None, project_id=None,
endpoint_type='publicURL', service_type='workflow',
endpoint_type='publicURL', service_type='workflowv2',
auth_token=None, user_id=None, cacert=None):
if mistral_url and not isinstance(mistral_url, six.string_types):
@ -61,23 +61,13 @@ class Client(object):
def authenticate(self, mistral_url=None, username=None, api_key=None,
project_name=None, auth_url=None, project_id=None,
endpoint_type='publicURL', service_type='workflow',
endpoint_type='publicURL', service_type='workflowv2',
auth_token=None, user_id=None, cacert=None):
if (not (project_name or project_id) or
not (isinstance(project_name, six.string_types) or
isinstance(project_id, six.string_types))):
raise RuntimeError('Either project name or project id should'
' be non-empty string')
if project_name and project_id:
raise RuntimeError('Only project name or '
'project id should be set')
if (not (username or user_id) or
not (isinstance(username, six.string_types) or
isinstance(user_id, six.string_types))):
raise RuntimeError('Either user name or user id should'
' be non-empty string')
if username and user_id:
raise RuntimeError('Only user name or user id'
' should be set')