Merge pull request #11774 from rabbitmq/mergify/bp/v3.13.x/pr-11764

Add stream replication port range in ini-style configuration (backport #11763) (backport #11764)

Author: michaelklishin

deps/rabbit/priv/schema/rabbit.schema

@@ -1571,6 +1571,32 @@ end}.
 {mapping, "proxy_protocol", "rabbit.proxy_protocol",
     [{datatype, {enum, [true, false]}}]}.
 
+{mapping, "stream.replication.port_range.min", "osiris.port_range", [
+    {datatype, [integer]},
+    {validators, ["non_zero_positive_integer"]}
+]}.
+{mapping, "stream.replication.port_range.max", "osiris.port_range", [
+    {datatype, [integer]},
+    {validators, ["non_zero_positive_integer"]}
+]}.
+
+{translation, "osiris.port_range",
+fun(Conf) ->
+    Min = cuttlefish:conf_get("stream.replication.port_range.min", Conf, undefined),
+    Max = cuttlefish:conf_get("stream.replication.port_range.max", Conf, undefined),
+
+    case {Min, Max} of
+        {undefined, undefined} ->
+            cuttlefish:unset();
+        {Mn, undefined}  ->
+            {Mn, Mn + 500};
+        {undefined, Mx} ->
+            {Mx - 500, Mx};
+        _ ->
+            {Min, Max}
+    end
+end}.
+
 %% Whether to stop the rabbit application if a vhost has
 %% to terminate for any reason.
 
@@ -2635,7 +2661,6 @@ end}.
     end
 }.
 
-% ===============================
 % Validators
 % ===============================
 

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1057,6 +1057,38 @@ credential_validator.regexp = ^abc\\d+",
       {incoming_message_interceptors, [{set_header_routing_node, false},
                                        {set_header_timestamp, false}]}
      ]}],
+   []},
+
+  %%
+  %% Stream replication port range
+  %%
+
+  {stream_replication_port_range,
+   "
+    stream.replication.port_range.min = 4000
+    stream.replication.port_range.max = 4600
+   ",
+   [{osiris, [
+      {port_range, {4000, 4600}}
+     ]}],
+   []},
+
+  {stream_replication_port_range,
+   "
+    stream.replication.port_range.min = 4000
+   ",
+   [{osiris, [
+      {port_range, {4000, 4500}}
+     ]}],
+   []},
+
+  {stream_replication_port_range,
+   "
+    stream.replication.port_range.max = 4600
+   ",
+   [{osiris, [
+      {port_range, {4100, 4600}}
+     ]}],
    []}
 
 ].