From bc81db719995b3d3bb023ad5921a24e7f0640974 Mon Sep 17 00:00:00 2001
From: Daniil Fedotov <dfedotov@pivotal.io>
Date: Fri, 4 Mar 2016 16:19:23 +0000
Subject: [PATCH] schema testing fixes

---
 .../priv/schema/rabbitmq_mqtt.schema          | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/deps/rabbitmq_mqtt/priv/schema/rabbitmq_mqtt.schema b/deps/rabbitmq_mqtt/priv/schema/rabbitmq_mqtt.schema
index 4cdf43eaf6..db741a53df 100644
--- a/deps/rabbitmq_mqtt/priv/schema/rabbitmq_mqtt.schema
+++ b/deps/rabbitmq_mqtt/priv/schema/rabbitmq_mqtt.schema
@@ -69,9 +69,18 @@ end}.
 %%
 %% {subscription_ttl, 1800000},
 {mapping, "mqtt.subscription_ttl", "rabbitmq_mqtt.subscription_ttl", [
-    {datatype, integer}
+    {datatype, [{enum, [undefined, infinity]}, integer]}
 ]}.
 
+{translation, "rabbitmq_mqtt.subscription_ttl",
+fun(Conf) ->
+    case cuttlefish:conf_get("mqtt.subscription_ttl", Conf, undefined) of
+        undefined -> undefined;
+        infinity  -> undefined;
+        Ms        -> Ms
+    end
+end}.
+
 %% Set the prefetch count (governing the maximum number of unacknowledged
 %% messages that will be delivered).
 %%
@@ -80,12 +89,11 @@ end}.
     [{datatype, integer}]}.
 
 
-{maping, "mqtt.retained_message_store", "rabbitmq_mqtt.retained_message_store",
+{mapping, "mqtt.retained_message_store", "rabbitmq_mqtt.retained_message_store",
     [{datatype, atom}]}.
 
-
-{maping, "mqtt.retained_message_store_dets_sync_interval", "rabbitmq_mqtt.retained_message_store_dets_sync_interval",
-    [{datatype, atom}]}.
+{mapping, "mqtt.retained_message_store_dets_sync_interval", "rabbitmq_mqtt.retained_message_store_dets_sync_interval",
+    [{datatype, integer}]}.
 
 
 
@@ -144,6 +152,9 @@ end}.
     {datatype, integer}
 ]}.
 
+{mapping, "mqtt.ssl_cert_login", "rabbitmq_mqtt.ssl_cert_login", [
+    {datatype, {enum, [true, false]}}]}.
+
 
 %% TCP/Socket options (as per the broker configuration).
 %%
@@ -151,7 +162,6 @@ end}.
 %%                       {nodelay,   true}]}
 %   ]},
 
-
 %% TCP listener section ======================================================
 
 {mapping, "mqtt.tcp_listen_options", "rabbitmq_mqtt.rabbit.tcp_listen_options", [