openstack/mistral
Code Issues Proposed changes

Fix client for further patching

Browse Source 
Change-Id: Ibf0cd08049c54921af79236e036d58f1b8300ac6
This commit is contained in:
Nikolay Mahotkin 2013-12-25 17:06:25 +04:00
parent eb957e5eaa
commit ed9aae73ec
1 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mistralclient/api/client.py
View File

@ -26,9 +26,32 @@ from mistralclient.api import listeners
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',
input_auth_token=None):
def __init__(self, username=None, api_key=None, project_id=None,
project_name=None, auth_url=None, mistral_url=None,
(mistral_url,
token,
project_id,
user_id) = self.authenticate(mistral_url, username,
api_key, project_name,
auth_url, project_id,
endpoint_type, service_type,
input_auth_token)
self.http_client = httpclient.HTTPClient(mistral_url,
token,
project_id,
user_id)
# Create all resource managers.
self.workbooks = workbooks.WorkbookManager(self)
self.executions = executions.ExecutionManager(self)
self.tasks = tasks.TaskManager(self)
self.listeners = listeners.ListenerManager(self)
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',
input_auth_token=None):
if mistral_url and not isinstance(mistral_url, six.string_types):
@ -71,13 +94,5 @@ class Client(object):
if not mistral_url:
mistral_url = "http://localhost:8989/v1"
self.http_client = httpclient.HTTPClient(mistral_url,
token,
project_id,
user_id)
# Create all resource managers.
self.workbooks = workbooks.WorkbookManager(self)
self.executions = executions.ExecutionManager(self)
self.tasks = tasks.TaskManager(self)
self.listeners = listeners.ListenerManager(self)
return mistral_url, token, project_id, user_id