From 2bae36fee35a564c8e2c8f69081d1e5f1a7ef90d Mon Sep 17 00:00:00 2001
From: yanyanhu <yanyanhu@cn.ibm.com>
Date: Thu, 29 Sep 2016 06:09:27 -0400
Subject: [PATCH] Quick fix on message receiver

This patch fixes message receiver by changing subscription
ttl to a proper value. The current value is too large to be
accepted by Zaqar.

Change-Id: I4ec5dd28521bf2cc2d5ccfa6672ff228cb50af99
---
 senlin/engine/receivers/message.py                 | 2 +-
 senlin/tests/unit/engine/receivers/test_message.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/senlin/engine/receivers/message.py b/senlin/engine/receivers/message.py
index dceb58391..c6600d69b 100644
--- a/senlin/engine/receivers/message.py
+++ b/senlin/engine/receivers/message.py
@@ -128,7 +128,7 @@ class Message(base.Receiver):
         # subscription that never expires, we specify a very large
         # ttl value which doesn't exceed the max time of python.
         kwargs = {
-            "ttl": 2 ** 64,
+            "ttl": 2 ** 36,
             "subscriber": subscriber,
             "options": {
                 "trust_id": trust_id
diff --git a/senlin/tests/unit/engine/receivers/test_message.py b/senlin/tests/unit/engine/receivers/test_message.py
index 5d12b64bf..d8e6519bf 100644
--- a/senlin/tests/unit/engine/receivers/test_message.py
+++ b/senlin/tests/unit/engine/receivers/test_message.py
@@ -207,7 +207,7 @@ class TestMessage(base.SenlinTestCase):
         message = mmod.Message('message', None, None, id=UUID)
         queue_name = 'test-queue'
         kwargs = {
-            "ttl": 2 ** 64,
+            "ttl": 2 ** 36,
             "subscriber": subscriber,
             "options": {
                 "trust_id": "123abc"
@@ -235,7 +235,7 @@ class TestMessage(base.SenlinTestCase):
         message.id = UUID
         queue_name = 'test-queue'
         kwargs = {
-            "ttl": 2 ** 64,
+            "ttl": 2 ** 36,
             "subscriber": subscriber,
             "options": {
                 "trust_id": "123abc"