Duplicate ssl and tcp options in management and MQTT schemas

2 files changed, 73 insertions, 12 deletions

diff --git a/schema/rabbitmq.config.schema b/schema/rabbitmq.config.schema
index ee040d6ae6..95d0bf3fb2 100644
--- a/schema/rabbitmq.config.schema
+++ b/schema/rabbitmq.config.schema
@@ -127,6 +127,8 @@ end}.
    %%                {verify,               verify_peer},
    %%                {fail_if_no_peer_cert, false}]},
 
+%% SSL options section ========================================================
+
 {mapping, "ssl_option.verify", "rabbit.ssl_options", [
     {datatype, {enum, [verify_peer, verify_none]}}]}.
 
@@ -223,6 +225,8 @@ fun(Conf) ->
     [ V || {_, V} <- Settings ]
 end}.
 
+%% ===========================================================================
+
    %% Choose the available SASL mechanism(s) to expose.
    %% The two default (built in) mechanisms are 'PLAIN' and
    %% 'AMQPLAIN'. Additional mechanisms can be added via
@@ -439,6 +443,8 @@ end}.
    %%                       {nodelay,       true},
    %%                       {exit_on_close, false}]},
 
+%% TCP listener section ======================================================
+
 {mapping, "tcp_listen_option.backlog", "rabbit.tcp_listen_options.backlog", [
     {datatype, integer}
 ]}.
@@ -498,6 +504,7 @@ end}.
 {mapping, "tcp_listen_option.tos", "rabbit.tcp_listen_options.tos", 
     [{datatype, integer}]}.
 
+%% ==========================================================================
 
    %%
    %% Resource Limits & Flow Control
@@ -584,8 +591,7 @@ end}.
 
 {mapping, "disk_free_limit.relative", "rabbit.disk_free_limit", [
     {default, 0.4},
-    {datatype, float},
-    {validators, ["less_than_1"]}]}.
+    {datatype, float}]}.
 
 {mapping, "disk_free_limit.absolute", "rabbit.disk_free_limit", [
     {datatype, [integer, string]}]}.
@@ -828,11 +834,13 @@ end}.
 % ].
 
 
-{mapping, "log.dir", "lager.log_root", [{datatype, string}]}.
+{mapping, "log.dir", "lager.log_root", [
+    {datatype, string},
+    {validators, ["dir_writable"]}]}.
+
 {mapping, "log.console", "lager.handlers", [
     {datatype, {enum, [true, false]}},
-    {default, false},
-    {validators, ["dir_writable"]}
+    {default, false}
 ]}.
 
 {mapping, "log.syslog", "lager.handlers", [
diff --git a/schema/rabbitmq.mqtt.schema b/schema/rabbitmq.mqtt.schema
index 5cc972fc5c..23af75e655 100644
--- a/schema/rabbitmq.mqtt.schema
+++ b/schema/rabbitmq.mqtt.schema
@@ -130,13 +130,66 @@ end}.
 %    %%                       {nodelay,   true}]}
 %   ]},
 
-{mapping, "mqtt.tcp_listen_option.$option", "rabbitmq_mqtt.tcp_listen_options", [
-    {datatype, [integer, {enum, [true, false]}]}
+
+%% TCP listener section ======================================================
+
+{mapping, "mqtt.tcp_listen_option.backlog", "rabbitmq_mqtt.tcp_listen_options.backlog", [
+    {datatype, integer}
 ]}.
 
-{translation, "rabbitmq_mqtt.tcp_listen_options",
-fun(Conf) ->
-    Settings  = cuttlefish_variable:filter_by_prefix("mqtt.tcp_listen_option", Conf),
-    [ V || {_, V} <- Settings ]
-end}.
+{mapping, "mqtt.tcp_listen_option.nodelay", "rabbitmq_mqtt.tcp_listen_options.nodelay", [
+    {datatype, {enum, [true, false]}}
+]}.
+
+{mapping, "mqtt.tcp_listen_option.buffer", "rabbitmq_mqtt.tcp_listen_options.buffer", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.delay_send", "rabbitmq_mqtt.tcp_listen_options.delay_send", 
+    [{datatype, {enum, [true, false]}}]}.
+
+{mapping, "mqtt.tcp_listen_option.dontroute", "rabbitmq_mqtt.tcp_listen_options.dontroute", 
+    [{datatype, {enum, [true, false]}}]}.
+
+{mapping, "mqtt.tcp_listen_option.exit_on_close", "rabbitmq_mqtt.tcp_listen_options.exit_on_close", 
+    [{datatype, {enum, [true, false]}}]}.
+
+{mapping, "mqtt.tcp_listen_option.fd", "rabbitmq_mqtt.tcp_listen_options.fd", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.high_msgq_watermark", "rabbitmq_mqtt.tcp_listen_options.high_msgq_watermark", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.high_watermark", "rabbitmq_mqtt.tcp_listen_options.high_watermark", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.keepalive", "rabbitmq_mqtt.tcp_listen_options.keepalive", 
+    [{datatype, {enum, [true, false]}}]}.
+
+{mapping, "mqtt.tcp_listen_option.low_msgq_watermark", "rabbitmq_mqtt.tcp_listen_options.low_msgq_watermark", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.low_watermark", "rabbitmq_mqtt.tcp_listen_options.low_watermark", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.port", "rabbitmq_mqtt.tcp_listen_options.port", 
+    [{datatype, integer}, {validators, ["port"]}]}.
+
+{mapping, "mqtt.tcp_listen_option.priority", "rabbitmq_mqtt.tcp_listen_options.priority", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.recbuf", "rabbitmq_mqtt.tcp_listen_options.recbuf", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.send_timeout", "rabbitmq_mqtt.tcp_listen_options.send_timeout", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.send_timeout_close", "rabbitmq_mqtt.tcp_listen_options.send_timeout_close", 
+    [{datatype, {enum, [true, false]}}]}.
+
+{mapping, "mqtt.tcp_listen_option.sndbuf", "rabbitmq_mqtt.tcp_listen_options.sndbuf", 
+    [{datatype, integer}]}.
+
+{mapping, "mqtt.tcp_listen_option.tos", "rabbitmq_mqtt.tcp_listen_options.tos", 
+    [{datatype, integer}]}.
 
+%% ==========================================================================