Merge "Implement replay detection."

2 files changed, 37 insertions, 3 deletions

diff --git a/tests/unit/rpc/amqp.py b/tests/unit/rpc/amqp.py
index 1e4733c..c7215ea 100644
--- a/tests/unit/rpc/amqp.py
+++ b/tests/unit/rpc/amqp.py
@@ -100,14 +100,18 @@ class BaseRpcAMQPTestCase(common.BaseRpcTestCase):
         }
         self.rpc.notify(FLAGS, self.context, 'notifications.info', raw_msg,
                         envelope=True)
-        self.assertEqual(self.test_msg, msg)
+        for k, v in msg.items():
+            self.assertIn(k, self.test_msg)
+            self.assertEqual(self.test_msg[k], v)
 
         # Make sure envelopes are still on notifications, even if turned off
         # for general messages.
         self.stubs.Set(rpc_common, '_SEND_RPC_ENVELOPE', False)
         self.rpc.notify(FLAGS, self.context, 'notifications.info', raw_msg,
                         envelope=True)
-        self.assertEqual(self.test_msg, msg)
+        for k, v in msg.items():
+            self.assertIn(k, self.test_msg)
+            self.assertEqual(self.test_msg[k], v)
 
     def test_single_reply_queue_on_has_ids(
             self, single_reply_queue_for_callee_off=False):
diff --git a/tests/unit/rpc/test_common.py b/tests/unit/rpc/test_common.py
index 976da84..b4d4cf4 100644
--- a/tests/unit/rpc/test_common.py
+++ b/tests/unit/rpc/test_common.py
@@ -250,10 +250,40 @@ class RpcCommonTestCase(test_utils.BaseTestCase):
                  'oslo.message': jsonutils.dumps(msg)}
         serialized = rpc_common.serialize_msg(msg)
 
-        self.assertEqual(s_msg, rpc_common.serialize_msg(msg))
+        for k, v in s_msg.items():
+            self.assertIn(k, serialized)
+            self.assertEqual(serialized[k], v)
 
         self.assertEqual(msg, rpc_common.deserialize_msg(serialized))
 
+    def test_serialize_msg_v2_1(self):
+        self.stubs.Set(rpc_common, '_SEND_RPC_ENVELOPE', True)
+        msg = {'foo': 'bar'}
+        s_msg = {'oslo.version': rpc_common._RPC_ENVELOPE_VERSION,
+                 'oslo.message': jsonutils.dumps(msg),
+                 'oslo.nonce': ''}
+        serialized = rpc_common.serialize_msg(msg)
+
+        for k, v in s_msg.items():
+            self.assertIn(k, serialized)
+
+            if k == 'oslo.nonce':
+                # This key's value is set by serialize_msg
+                re_uuid = re.compile(r'[0-9a-f]{32}$', re.I)
+                self.assertTrue(re_uuid.match(serialized[k]))
+                continue
+
+            self.assertEqual(serialized[k], v)
+
+        self.assertEqual(msg, rpc_common.deserialize_msg(serialized))
+
+    def test_serialize_msg_v2_1(self):
+        self.stubs.Set(rpc_common, '_SEND_RPC_ENVELOPE', True)
+        msg = {'foo': 'bar'}
+        serialized = rpc_common.serialize_msg(msg)
+        self.assertIn('oslo.nonce', serialized)
+        self.assertEqual(msg, rpc_common.deserialize_msg(serialized))
+
     def test_deserialize_msg_no_envelope(self):
         self.assertEqual(1, rpc_common.deserialize_msg(1))
         self.assertEqual([], rpc_common.deserialize_msg([]))