From c7089bf21c028b171b107c2113aa60b46f811a96 Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Tue, 21 Nov 2017 12:32:22 -0500 Subject: [PATCH] Add new tempest tests for swift and zaqar client actions Change-Id: I58c20ec36086a812ae7fad4637e977d1bc7c9838 --- .zuul.yaml | 6 +++++ .../openstack/action_collection_wb.yaml | 22 +++++++++++++++++++ .../actions/v2/test_openstack_actions.py | 20 +++++++++++++++++ .../mistral-devstack-dsvm-kombu/run.yaml | 3 +++ .../mistral-devstack-dsvm-non-apache/run.yaml | 3 +++ .../legacy/mistral-devstack-dsvm/run.yaml | 3 +++ 6 files changed, 57 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index dadab8432..7ba662cfb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,6 +11,8 @@ - openstack/mistral - openstack/mistral-dashboard - openstack/python-mistralclient + - openstack/zaqar + - openstack/python-zaqarclient - job: name: mistral-devstack-dsvm-kombu @@ -25,6 +27,8 @@ - openstack/mistral - openstack/mistral-dashboard - openstack/python-mistralclient + - openstack/zaqar + - openstack/python-zaqarclient - job: name: mistral-devstack-dsvm-non-apache @@ -39,6 +43,8 @@ - openstack/mistral - openstack/mistral-dashboard - openstack/python-mistralclient + - openstack/zaqar + - openstack/python-zaqarclient - job: name: mistral-docker-buildimage diff --git a/mistral_tempest_tests/tests/resources/openstack/action_collection_wb.yaml b/mistral_tempest_tests/tests/resources/openstack/action_collection_wb.yaml index d675a58b3..e5a5a8e31 100755 --- a/mistral_tempest_tests/tests/resources/openstack/action_collection_wb.yaml +++ b/mistral_tempest_tests/tests/resources/openstack/action_collection_wb.yaml @@ -51,3 +51,25 @@ workflows: publish: result: <% task().result %> + swift: + type: direct + tasks: + get_account: + action: swift.get_account + publish: + result: <% task().result %> + + zaqar: + type: direct + tasks: + send_message: + action: zaqar.queue_post + input: + queue_name: test + messages: + body: + type: action_collection.zaqar + payload: + status: <% $.get(status, 'SUCCESS') %> + publish: + result: <% task().result %> diff --git a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py index ec95d6475..403e38fe0 100644 --- a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py +++ b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_openstack_actions.py @@ -90,3 +90,23 @@ class OpenStackActionsTestsV2(base.TestCase): executed_task = self.client.get_wf_tasks(wf_name)[-1] self.assertEqual('SUCCESS', executed_task['state']) + + @decorators.attr(type='openstack') + @decorators.idempotent_id('985c1051-cf2e-4fd0-8ceb-a9b8110597a1') + def test_swift_actions(self): + wf_name = self.wb['name'] + '.swift' + _, execution = self.client.create_execution(wf_name) + self.client.wait_execution_success(execution) + executed_task = self.client.get_wf_tasks(wf_name)[-1] + + self.assertEqual('SUCCESS', executed_task['state']) + + @decorators.attr(type='openstack') + @decorators.idempotent_id('6f000ae8-3f41-49bd-b7a7-ad2256d80076') + def test_zaqar_actions(self): + wf_name = self.wb['name'] + '.zaqar' + _, execution = self.client.create_execution(wf_name) + self.client.wait_execution_success(execution) + executed_task = self.client.get_wf_tasks(wf_name)[-1] + + self.assertEqual('SUCCESS', executed_task['state']) diff --git a/playbooks/legacy/mistral-devstack-dsvm-kombu/run.yaml b/playbooks/legacy/mistral-devstack-dsvm-kombu/run.yaml index 0b84d9657..4592844ba 100644 --- a/playbooks/legacy/mistral-devstack-dsvm-kombu/run.yaml +++ b/playbooks/legacy/mistral-devstack-dsvm-kombu/run.yaml @@ -38,11 +38,14 @@ fi export ENABLED_SERVICES=heat,h-api,h-api-cfn,h-api-cw,h-eng,tempest + export PROJECTS="openstack/zaqar $PROJECTS" + export PROJECTS="openstack/python-zaqarclient $PROJECTS" export PROJECTS="openstack/heat $PROJECTS" export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/mistral-dashboard $PROJECTS" export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" if [ "-kombu" == "-non-apache" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"MISTRAL_USE_MOD_WSGI=False" diff --git a/playbooks/legacy/mistral-devstack-dsvm-non-apache/run.yaml b/playbooks/legacy/mistral-devstack-dsvm-non-apache/run.yaml index 63de8bb51..03777afc7 100644 --- a/playbooks/legacy/mistral-devstack-dsvm-non-apache/run.yaml +++ b/playbooks/legacy/mistral-devstack-dsvm-non-apache/run.yaml @@ -38,11 +38,14 @@ fi export ENABLED_SERVICES=heat,h-api,h-api-cfn,h-api-cw,h-eng,tempest + export PROJECTS="openstack/zaqar $PROJECTS" + export PROJECTS="openstack/python-zaqarclient $PROJECTS" export PROJECTS="openstack/heat $PROJECTS" export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/mistral-dashboard $PROJECTS" export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" if [ "-non-apache" == "-non-apache" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"MISTRAL_USE_MOD_WSGI=False" diff --git a/playbooks/legacy/mistral-devstack-dsvm/run.yaml b/playbooks/legacy/mistral-devstack-dsvm/run.yaml index 2508aef2a..a85d5d633 100644 --- a/playbooks/legacy/mistral-devstack-dsvm/run.yaml +++ b/playbooks/legacy/mistral-devstack-dsvm/run.yaml @@ -38,11 +38,14 @@ fi export ENABLED_SERVICES=heat,h-api,h-api-cfn,h-api-cw,h-eng,tempest + export PROJECTS="openstack/zaqar $PROJECTS" + export PROJECTS="openstack/python-zaqarclient $PROJECTS" export PROJECTS="openstack/heat $PROJECTS" export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/mistral-dashboard $PROJECTS" export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" if [ "" == "-non-apache" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"MISTRAL_USE_MOD_WSGI=False"