3f0255f416
Currently some mistral errors are masked in the cli with non helpful messages like: ERROR (app) Bad Request (HTTP 400) That is due to ResourceManagers not using the standard underscore methods defined in the base class. Those underscore methods have the appropriate try catch to parse the unfriendly keystoneauth errors into more cli friendly errors like: ERROR (app) Invalid input [name=std.echo, class=mistral.actions.std_actions.EchoAction, missing=['output']] This adds the try catch to the non standard methods and change the action_execution.create to use the standard method Change-Id: I2573cb093e97ce378fc1d255d8b38e2ce818c8e5 Closes-bug: #1754093
134 lines
4.0 KiB
Python
134 lines
4.0 KiB
Python
# Copyright 2014 - Mirantis, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import six
|
|
|
|
from keystoneauth1 import exceptions
|
|
from mistralclient.api import base
|
|
from mistralclient import utils
|
|
|
|
urlparse = six.moves.urllib.parse
|
|
|
|
|
|
class Action(base.Resource):
|
|
resource_name = 'Action'
|
|
|
|
|
|
class ActionManager(base.ResourceManager):
|
|
resource_class = Action
|
|
|
|
def create(self, definition, scope='private'):
|
|
self._ensure_not_empty(definition=definition)
|
|
|
|
# If the specified definition is actually a file, read in the
|
|
# definition file
|
|
definition = utils.get_contents_if_file(definition)
|
|
|
|
try:
|
|
resp = self.http_client.post(
|
|
'/actions?scope=%s' % scope,
|
|
definition,
|
|
headers={'content-type': 'text/plain'}
|
|
)
|
|
except exceptions.HttpError as ex:
|
|
self._raise_api_exception(ex.response)
|
|
|
|
if resp.status_code != 201:
|
|
self._raise_api_exception(resp)
|
|
|
|
return [self.resource_class(self, resource_data)
|
|
for resource_data in base.extract_json(resp, 'actions')]
|
|
|
|
def update(self, definition, scope='private', id=None):
|
|
self._ensure_not_empty(definition=definition)
|
|
|
|
url_pre = ('/actions/%s' % id) if id else '/actions'
|
|
|
|
# If the specified definition is actually a file, read in the
|
|
# definition file
|
|
definition = utils.get_contents_if_file(definition)
|
|
|
|
try:
|
|
resp = self.http_client.put(
|
|
'%s?scope=%s' % (url_pre, scope),
|
|
definition,
|
|
headers={'content-type': 'text/plain'}
|
|
)
|
|
except exceptions.HttpError as ex:
|
|
self._raise_api_exception(ex.response)
|
|
|
|
if resp.status_code != 200:
|
|
self._raise_api_exception(resp)
|
|
|
|
return [self.resource_class(self, resource_data)
|
|
for resource_data in base.extract_json(resp, 'actions')]
|
|
|
|
def list(self, marker='', limit=None, sort_keys='', sort_dirs='',
|
|
**filters):
|
|
qparams = {}
|
|
|
|
if marker:
|
|
qparams['marker'] = marker
|
|
|
|
if limit and limit > 0:
|
|
qparams['limit'] = limit
|
|
|
|
if sort_keys:
|
|
qparams['sort_keys'] = sort_keys
|
|
|
|
if sort_dirs:
|
|
qparams['sort_dirs'] = sort_dirs
|
|
|
|
for name, val in filters.items():
|
|
qparams[name] = val
|
|
|
|
query_string = ("?%s" % urlparse.urlencode(list(qparams.items()))
|
|
if qparams else "")
|
|
|
|
return self._list(
|
|
'/actions%s' % query_string,
|
|
response_key='actions',
|
|
)
|
|
|
|
def get(self, identifier):
|
|
self._ensure_not_empty(identifier=identifier)
|
|
|
|
return self._get('/actions/%s' % identifier)
|
|
|
|
def delete(self, identifier):
|
|
self._ensure_not_empty(identifier=identifier)
|
|
|
|
self._delete('/actions/%s' % identifier)
|
|
|
|
def validate(self, definition):
|
|
self._ensure_not_empty(definition=definition)
|
|
|
|
# If the specified definition is actually a file, read in the
|
|
# definition file
|
|
definition = utils.get_contents_if_file(definition)
|
|
|
|
try:
|
|
resp = self.http_client.post(
|
|
'/actions/validate',
|
|
definition,
|
|
headers={'content-type': 'text/plain'}
|
|
)
|
|
except exceptions.HttpError as ex:
|
|
self._raise_api_exception(ex.response)
|
|
|
|
if resp.status_code != 200:
|
|
self._raise_api_exception(resp)
|
|
|
|
return base.extract_json(resp, None)
|