Merge "Change for synchronous Mistral actions from CLI"

mistral/cmd/launch.py

@@ -25,6 +25,7 @@ eventlet.monkey_patch(
     time=True)
 
 import os
+import six
 import time
 
 # If ../mistral/__init__.py exists, add ../ to Python search path, so that
@@ -38,7 +39,14 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'mistral', '__init__.py')):
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging as messaging
+
+if six.PY3 is True:
+    import socketserver
+else:
+    import SocketServer as socketserver
+
 from wsgiref import simple_server
+from wsgiref.simple_server import WSGIServer
 
 from mistral.api import app
 from mistral import config
@@ -128,6 +136,10 @@ def launch_engine(transport):
         server.wait()
 
 
+class ThreadingWSGIServer(socketserver.ThreadingMixIn, WSGIServer):
+    pass
+
+
 def launch_api(transport):
     host = cfg.CONF.api.host
     port = cfg.CONF.api.port
@@ -135,7 +147,8 @@ def launch_api(transport):
     server = simple_server.make_server(
         host,
         port,
-        app.setup_app()
+        app.setup_app(),
+        ThreadingWSGIServer
     )
 
     LOG.info("Mistral API is serving on http://%s:%s (PID=%s)" %

mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py

@@ -1167,3 +1167,18 @@ class ActionExecutionTestsV2(base.TestCase):
             'action_executions',
             'nonexist'
         )
+
+    @test.attr(type='sanity')
+    def test_create_action_execution_sync(self):
+        token = self.client.auth_provider.get_token()
+        resp, body = self.client.create_action_execution(
+            {
+                'name': 'std.http',
+                'input': '{{"url": "http://localhost:8989/v2/workflows",\
+                           "headers": {{"X-Auth-Token": "{}"}}}}'.format(token)
+            }
+        )
+
+        self.assertEqual(201, resp.status)
+        output = json.loads(body['output'])
+        self.assertEqual(200, output['result']['status'])