72a6bc1ad1
The purpose of this patch is to make the new Mistral action pack actions more useful when they are coded in a workflow or workbook. The new Mistral action pack actions are executed by calling the appropriate python-mistralclient API methods. The API methods to create/update/validate the workbook/workflow/action/environment resources do not read the definitions/environments from files as the CLI commands do. They require the actual definition/environement be passed in as an argument. This can lead to problems when trying to use the Mistral action pack actions from within a workflow or workbook. For example, the workflow create/update/validate methods all take a definition argument. The mistralclient APIs are currently coded to take the actual definition, and not the definition file name as the CLI does. This leads to problems when coding the mistral.workflows_create action in a workflow for example. If the actual definition is passed into the action in the workflow YAML, any YAQL expressions in the workflow being created by that action get evaluated when read, and are not stored in the database as desired. This essentially makes it useless unless the workflow you are creating does not contain any YAQL. That is unrealistic. This patch enhances those methods of the mistralclient so that they can take either the actual definition, or the definition file name or file URI. This allows the action to be coded in a workflow in a way similar to the CLI by allowing the definition file name, or file URI to be specified instead of the actual definition. The change allows either the actual definition or the definition file name, or file URI to be specified when calling the affected mistralclient API methods. No changes to the API signatures are required. Each method affected will determine if the value passed in is a definition file name or file URI, or the actual definition. New unit test cases were also added for these changes. Change-Id: I9ca07bedf685839db130693a7aa6e091a9b8c4ad Implements: blueprint mistral-mistral-actions
86 lines
2.8 KiB
Python
86 lines
2.8 KiB
Python
# Copyright 2015 - StackStorm, 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 json
|
|
|
|
import six
|
|
|
|
from mistralclient.api import base
|
|
from mistralclient import utils
|
|
|
|
|
|
class Environment(base.Resource):
|
|
resource_name = 'Environment'
|
|
|
|
def _set_attributes(self):
|
|
"""Override loading of the "variables" attribute from text to dict."""
|
|
for k, v in self._data.items():
|
|
if k == 'variables' and isinstance(v, six.string_types):
|
|
v = json.loads(v)
|
|
|
|
try:
|
|
setattr(self, k, v)
|
|
except AttributeError:
|
|
# In this case we already defined the attribute on the class
|
|
pass
|
|
|
|
|
|
class EnvironmentManager(base.ResourceManager):
|
|
resource_class = Environment
|
|
|
|
def create(self, **kwargs):
|
|
# Check to see if the file name or URI is being passed in. If so,
|
|
# read it's contents first.
|
|
if 'file' in kwargs:
|
|
file = kwargs['file']
|
|
kwargs = utils.load_content(utils.get_contents_if_file(file))
|
|
|
|
self._ensure_not_empty(name=kwargs.get('name', None),
|
|
variables=kwargs.get('variables', None))
|
|
|
|
# Convert dict to text for the variables attribute.
|
|
if isinstance(kwargs['variables'], dict):
|
|
kwargs['variables'] = json.dumps(kwargs['variables'])
|
|
|
|
return self._create('/environments', kwargs)
|
|
|
|
def update(self, **kwargs):
|
|
# Check to see if the file name or URI is being passed in. If so,
|
|
# read it's contents first.
|
|
if 'file' in kwargs:
|
|
file = kwargs['file']
|
|
kwargs = utils.load_content(utils.get_contents_if_file(file))
|
|
|
|
name = kwargs.get('name', None)
|
|
self._ensure_not_empty(name=name)
|
|
|
|
# Convert dict to text for the variables attribute.
|
|
if kwargs.get('variables') and isinstance(kwargs['variables'], dict):
|
|
kwargs['variables'] = json.dumps(kwargs['variables'])
|
|
|
|
return self._update('/environments', kwargs)
|
|
|
|
def list(self):
|
|
return self._list('/environments', response_key='environments')
|
|
|
|
def get(self, name):
|
|
self._ensure_not_empty(name=name)
|
|
|
|
return self._get('/environments/%s' % name)
|
|
|
|
def delete(self, name):
|
|
self._ensure_not_empty(name=name)
|
|
|
|
self._delete('/environments/%s' % name)
|