From 1293ea5f8602e3a470f66764118273899599d8be Mon Sep 17 00:00:00 2001
From: Nikolay Mahotkin <nmakhotkin@mirantis.com>
Date: Tue, 5 Apr 2016 14:16:37 +0300
Subject: [PATCH] Fixing issue with different versions of oslo_messaging

Change-Id: I4555061c2b4ee9939d7ce4bc00d1b53e3f90ad4e
---
 mistral/engine/rpc.py | 53 +++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/mistral/engine/rpc.py b/mistral/engine/rpc.py
index 59bf3b799..e4758c2b5 100644
--- a/mistral/engine/rpc.py
+++ b/mistral/engine/rpc.py
@@ -13,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+import inspect
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging as messaging
@@ -34,23 +35,47 @@ _ENGINE_CLIENT = None
 _EXECUTOR_CLIENT = None
 
 
-class RPCDispatcherPostAck(dispatcher.RPCDispatcher):
-    def __call__(self, incoming, executor_callback=None):
-        return messaging.rpc.dispatcher.dispatcher.DispatcherExecutorContext(
-            incoming,
-            self._dispatch_and_reply,
-            executor_callback=executor_callback
-        )
+# TODO(nmakhotkin): Delete this once oslo_messaging version
+# TODO(nmakhotkin): is >= 4.4.0 in global requirements.
+# Declare different classes for < 4.4.0 oslo_messaging
+# and >= 4.4.0 oslo_messaging:
+# >= 4.4.0 doesn't contain 'executor_callback' argument anymore.
+if 'executor_callback' in inspect.getargspec(
+    dispatcher.RPCDispatcher.__call__
+).args:
+    # For < 4.4.0.
+    class RPCDispatcherPostAck(dispatcher.RPCDispatcher):
+        def __call__(self, incoming, executor_callback=None):
+            return dispatcher.dispatcher.DispatcherExecutorContext(
+                incoming,
+                self._dispatch_and_reply,
+                executor_callback=executor_callback
+            )
 
-    def _dispatch_and_reply(self, incoming, executor_callback):
-        incoming = incoming[0]
+        def _dispatch_and_reply(self, incoming, executor_callback):
+            incoming = incoming[0]
 
-        super(RPCDispatcherPostAck, self)._dispatch_and_reply(
-            incoming,
-            executor_callback
-        )
+            super(RPCDispatcherPostAck, self)._dispatch_and_reply(
+                incoming,
+                executor_callback
+            )
 
-        incoming.acknowledge()
+            incoming.acknowledge()
+else:
+    # For >= 4.4.0
+    class RPCDispatcherPostAck(dispatcher.RPCDispatcher):
+        def __call__(self, incoming):
+            return dispatcher.dispatcher.DispatcherExecutorContext(
+                incoming,
+                self._dispatch_and_reply
+            )
+
+        def _dispatch_and_reply(self, incoming):
+            incoming = incoming[0]
+
+            super(RPCDispatcherPostAck, self)._dispatch_and_reply(incoming)
+
+            incoming.acknowledge()
 
 
 def get_rpc_server(transport, target, endpoints, executor='blocking',