From 9b703b28961e5c14099ef39e9a10903cc5374fa5 Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Wed, 8 Jun 2016 15:19:37 +0100 Subject: [PATCH] Dynamically select distribution node --- deps/rabbitmq_cli/lib/help_command.ex | 7 ++- deps/rabbitmq_cli/lib/helpers.ex | 2 +- deps/rabbitmq_cli/lib/parser.ex | 8 ++- deps/rabbitmq_cli/lib/rabbitmqctl.ex | 55 +++++++++++++++---- .../test/add_user_command_test.exs | 2 +- .../test/add_vhost_command_test.exs | 2 +- .../test/authenticate_user_command_test.exs | 2 +- .../test/change_password_command_test.exs | 2 +- .../test/clear_parameter_command_test.exs | 2 +- .../test/clear_password_command_test.exs | 2 +- .../test/clear_permissions_command_test.exs | 2 +- .../test/close_connection_command_test.exs | 2 +- .../test/cluster_status_command_test.exs | 2 +- .../test/delete_user_command_test.exs | 2 +- .../test/delete_vhost_command_test.exs | 2 +- .../test/environment_command_test.exs | 2 +- .../test/force_reset_command_test.exs | 2 +- deps/rabbitmq_cli/test/helpers_test.exs | 2 +- .../test/join_cluster_command_test.exs | 2 +- .../test/list_bindings_command_test.exs | 2 +- .../test/list_channels_command_test.exs | 2 +- .../test/list_connections_command_test.exs | 2 +- .../test/list_consumers_command_test.exs | 2 +- .../test/list_exchanges_command_test.exs | 2 +- .../test/list_parameters_command_test.exs | 2 +- .../test/list_permissions_command_test.exs | 2 +- .../test/list_queues_command_test.exs | 2 +- .../list_user_permissions_command_test.exs | 2 +- .../test/list_users_command_test.exs | 2 +- .../test/list_vhosts_command_test.exs | 2 +- .../test/node_health_check_command_test.exs | 2 +- deps/rabbitmq_cli/test/rabbitmqctl_test.exs | 2 +- .../rabbitmq_cli/test/report_command_test.exs | 2 +- deps/rabbitmq_cli/test/reset_command_test.exs | 2 +- .../test/rotate_logs_command_test.exs | 2 +- deps/rabbitmq_cli/test/rpc_stream_test.exs | 2 +- .../test/set_disk_free_limit_command_test.exs | 2 +- .../test/set_parameter_command_test.exs | 2 +- .../test/set_permissions_command_test.exs | 2 +- .../test/set_user_tags_command_test.exs | 2 +- ..._vm_memory_high_watermark_command_test.exs | 2 +- .../test/start_app_command_test.exs | 2 +- .../rabbitmq_cli/test/status_command_test.exs | 2 +- .../test/stop_app_command_test.exs | 2 +- deps/rabbitmq_cli/test/stop_command_test.exs | 2 +- .../test/trace_off_command_test.exs | 2 +- .../test/trace_on_command_test.exs | 2 +- deps/rabbitmq_cli/test/wait_command_test.exs | 2 +- 48 files changed, 100 insertions(+), 60 deletions(-) diff --git a/deps/rabbitmq_cli/lib/help_command.ex b/deps/rabbitmq_cli/lib/help_command.ex index 7edc9b5ee5..c6b4084068 100644 --- a/deps/rabbitmq_cli/lib/help_command.ex +++ b/deps/rabbitmq_cli/lib/help_command.ex @@ -52,7 +52,7 @@ defmodule HelpCommand do defp print_base_usage() do IO.puts "Usage:" - IO.puts "rabbitmqctl [-n ] [-t ] [-q] []" + IO.puts "rabbitmqctl [-n ] [-t ] [-l] [-q] []" end def print_base_usage(command) do @@ -74,6 +74,7 @@ Options: -n node -q -t timeout + -l longnames Default node is \"rabbit@server\", where server is the local host. On a host named \"server.example.com\", the node name of the RabbitMQ Erlang node will @@ -87,6 +88,10 @@ suppressed when quiet mode is in effect. Operation timeout in seconds. Only applicable to \"list\" commands. Default is \"infinity\". + +If RabbitMQ broker uses long node names for erlang distribution, \"longnames\" +option should be specified. + Some commands accept an optional virtual host parameter for which to display results. The default value is \"/\".\n" end diff --git a/deps/rabbitmq_cli/lib/helpers.ex b/deps/rabbitmq_cli/lib/helpers.ex index 534ed2da6a..f49ac895dc 100644 --- a/deps/rabbitmq_cli/lib/helpers.ex +++ b/deps/rabbitmq_cli/lib/helpers.ex @@ -79,7 +79,7 @@ defmodule Helpers do def power_as_int(num, x, y), do: round(num * (:math.pow(x, y))) - def global_flags, do: [:node, :quiet, :timeout] + def global_flags, do: [:node, :quiet, :timeout, :longnames] def nodes_in_cluster(node, timeout \\ :infinity) do case :rpc.call(node, :rabbit_mnesia, :cluster_nodes, [:running], timeout) do diff --git a/deps/rabbitmq_cli/lib/parser.ex b/deps/rabbitmq_cli/lib/parser.ex index a019d73f9c..550b7550f6 100644 --- a/deps/rabbitmq_cli/lib/parser.ex +++ b/deps/rabbitmq_cli/lib/parser.ex @@ -22,8 +22,12 @@ defmodule Parser do def parse(command) do {options, cmd, invalid} = OptionParser.parse( command, - switches: build_switches([node: :atom, quiet: :boolean, timeout: :integer, vhost: :string]), - aliases: [p: :vhost, n: :node, q: :quiet, t: :timeout] + switches: build_switches([node: :atom, + quiet: :boolean, + timeout: :integer, + vhost: :string, + longnames: :boolean]), + aliases: [p: :vhost, n: :node, q: :quiet, t: :timeout, l: :longnames] ) {clear_on_empty_command(cmd), options_map(options), invalid} end diff --git a/deps/rabbitmq_cli/lib/rabbitmqctl.ex b/deps/rabbitmq_cli/lib/rabbitmqctl.ex index fe5df7f535..b655072d77 100644 --- a/deps/rabbitmq_cli/lib/rabbitmqctl.ex +++ b/deps/rabbitmq_cli/lib/rabbitmqctl.ex @@ -20,19 +20,22 @@ defmodule RabbitMQCtl do import ExitCodes def main(unparsed_command) do - :net_kernel.start([:rabbitmqctl, :shortnames]) - {parsed_cmd, options, invalid} = parse(unparsed_command) case {Helpers.is_command?(parsed_cmd), invalid} do - {false, _} -> HelpCommand.all_usage() |> handle_exit(exit_usage); - {_, [_|_]} -> print_standard_messages({:bad_option, invalid}, unparsed_command) - |> handle_exit - {true, []} -> options - |> merge_defaults_defaults - |> run_command(parsed_cmd) - |> StandardCodes.map_to_standard_code - |> print_standard_messages(unparsed_command) - |> handle_exit + {false, _} -> + HelpCommand.all_usage() |> handle_exit(exit_usage); + {_, [_|_]} -> + print_standard_messages({:bad_option, invalid}, unparsed_command) + |> handle_exit + {true, []} -> + effective_options = merge_defaults_defaults(options) + start_distribution(effective_options) + + effective_options + |> run_command(parsed_cmd) + |> StandardCodes.map_to_standard_code + |> print_standard_messages(unparsed_command) + |> handle_exit end end @@ -40,12 +43,15 @@ defmodule RabbitMQCtl do options |> merge_defaults_node |> merge_defaults_timeout + |> merge_defaults_longnames end defp merge_defaults_node(%{} = opts), do: Map.merge(%{node: get_rabbit_hostname}, opts) defp merge_defaults_timeout(%{} = opts), do: Map.merge(%{timeout: :infinity}, opts) + defp merge_defaults_longnames(%{} = opts), do: Map.merge(%{longnames: false}, opts) + defp maybe_connect_to_rabbitmq("help", _), do: nil defp maybe_connect_to_rabbitmq(_, node) do Helpers.connect_to_rabbitmq(node) @@ -202,7 +208,7 @@ defmodule RabbitMQCtl do defp handle_exit({:validation_failure, {:bad_argument, _}}), do: exit_program(exit_dataerr) defp handle_exit({:validation_failure, :bad_argument}), do: exit_program(exit_dataerr) defp handle_exit({:validation_failure, _}), do: exit_program(exit_usage) - defp handle_exit({:bad_option, _}), do: exit_program(exit_usage) + defp handle_exit({:bad_option, _} = err), do: exit_program(exit_usage) defp handle_exit({:badrpc, :timeout}), do: exit_program(exit_tempfail) defp handle_exit({:badrpc, :nodedown}), do: exit_program(exit_unavailable) defp handle_exit({:refused, _, _, _}), do: exit_program(exit_dataerr) @@ -231,4 +237,29 @@ defmodule RabbitMQCtl do :net_kernel.stop exit({:shutdown, code}) end + + def start_distribution(options) do + names_opt = case options[:longnames] do + true -> [:longnames]; + false -> [:shortnames]; + nil -> [:shortnames] + end + start_distribution(names_opt, 10, :undefined) + end + + defp start_distribution(_opt, 0, last_err) do + {:error, last_err} + end + + defp start_distribution(names_opt, attempts, _last_err) do + candidate = String.to_atom("rabbitmqcil" <> + to_string(:rabbit_misc.random(100))) + case :net_kernel.start([candidate | names_opt]) do + {:ok, _} = ok -> ok; + {:error, reason} -> start_distribution(names_opt, + attempts - 1, + reason) + end + end + end diff --git a/deps/rabbitmq_cli/test/add_user_command_test.exs b/deps/rabbitmq_cli/test/add_user_command_test.exs index a32a24ddf3..08a717b163 100644 --- a/deps/rabbitmq_cli/test/add_user_command_test.exs +++ b/deps/rabbitmq_cli/test/add_user_command_test.exs @@ -21,7 +21,7 @@ defmodule AddUserCommandTest do @command AddUserCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/add_vhost_command_test.exs b/deps/rabbitmq_cli/test/add_vhost_command_test.exs index 2a8800dfeb..74d0e105f8 100644 --- a/deps/rabbitmq_cli/test/add_vhost_command_test.exs +++ b/deps/rabbitmq_cli/test/add_vhost_command_test.exs @@ -22,7 +22,7 @@ defmodule AddVhostCommandTest do @vhost "test" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/authenticate_user_command_test.exs b/deps/rabbitmq_cli/test/authenticate_user_command_test.exs index 766d8ede02..54ceb13a74 100644 --- a/deps/rabbitmq_cli/test/authenticate_user_command_test.exs +++ b/deps/rabbitmq_cli/test/authenticate_user_command_test.exs @@ -23,7 +23,7 @@ defmodule AuthenticateUserCommandTest do @password "password" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/change_password_command_test.exs b/deps/rabbitmq_cli/test/change_password_command_test.exs index e876155d79..9e040b8640 100644 --- a/deps/rabbitmq_cli/test/change_password_command_test.exs +++ b/deps/rabbitmq_cli/test/change_password_command_test.exs @@ -20,7 +20,7 @@ defmodule ChangePasswordCommandTest do @password "password" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/clear_parameter_command_test.exs b/deps/rabbitmq_cli/test/clear_parameter_command_test.exs index e04bd08643..f4ed5b321b 100644 --- a/deps/rabbitmq_cli/test/clear_parameter_command_test.exs +++ b/deps/rabbitmq_cli/test/clear_parameter_command_test.exs @@ -27,7 +27,7 @@ defmodule ClearParameterCommandTest do @value "{\"uri\":\"amqp://\"}" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost @vhost diff --git a/deps/rabbitmq_cli/test/clear_password_command_test.exs b/deps/rabbitmq_cli/test/clear_password_command_test.exs index 69b794a4ba..146abb8877 100644 --- a/deps/rabbitmq_cli/test/clear_password_command_test.exs +++ b/deps/rabbitmq_cli/test/clear_password_command_test.exs @@ -20,7 +20,7 @@ defmodule ClearPasswordCommandTest do @password "password" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/clear_permissions_command_test.exs b/deps/rabbitmq_cli/test/clear_permissions_command_test.exs index 680b98671a..bd39ad224c 100644 --- a/deps/rabbitmq_cli/test/clear_permissions_command_test.exs +++ b/deps/rabbitmq_cli/test/clear_permissions_command_test.exs @@ -22,7 +22,7 @@ defmodule ClearPermissionsTest do @specific_vhost "vhost1" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_user(@user, @password) add_vhost(@specific_vhost) diff --git a/deps/rabbitmq_cli/test/close_connection_command_test.exs b/deps/rabbitmq_cli/test/close_connection_command_test.exs index 122ad48eb2..fa71c4478f 100644 --- a/deps/rabbitmq_cli/test/close_connection_command_test.exs +++ b/deps/rabbitmq_cli/test/close_connection_command_test.exs @@ -21,7 +21,7 @@ defmodule CloseConnectionCommandTest do @command CloseConnectionCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) close_all_connections(get_rabbit_hostname) diff --git a/deps/rabbitmq_cli/test/cluster_status_command_test.exs b/deps/rabbitmq_cli/test/cluster_status_command_test.exs index 181ee3aa05..8d86ef350b 100644 --- a/deps/rabbitmq_cli/test/cluster_status_command_test.exs +++ b/deps/rabbitmq_cli/test/cluster_status_command_test.exs @@ -21,7 +21,7 @@ defmodule ClusterStatusCommandTest do @command ClusterStatusCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/delete_user_command_test.exs b/deps/rabbitmq_cli/test/delete_user_command_test.exs index b3266ac9d8..45d37c61ce 100644 --- a/deps/rabbitmq_cli/test/delete_user_command_test.exs +++ b/deps/rabbitmq_cli/test/delete_user_command_test.exs @@ -23,7 +23,7 @@ defmodule DeleteUserCommandTest do @password "password" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/delete_vhost_command_test.exs b/deps/rabbitmq_cli/test/delete_vhost_command_test.exs index 6b6c47d3ae..e3ce0e113a 100644 --- a/deps/rabbitmq_cli/test/delete_vhost_command_test.exs +++ b/deps/rabbitmq_cli/test/delete_vhost_command_test.exs @@ -22,7 +22,7 @@ defmodule DeleteVhostCommandTest do @vhost "test" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/environment_command_test.exs b/deps/rabbitmq_cli/test/environment_command_test.exs index c3cc4dd0a2..caa5d1b049 100644 --- a/deps/rabbitmq_cli/test/environment_command_test.exs +++ b/deps/rabbitmq_cli/test/environment_command_test.exs @@ -21,7 +21,7 @@ defmodule EnvironmentCommandTest do @command EnvironmentCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/force_reset_command_test.exs b/deps/rabbitmq_cli/test/force_reset_command_test.exs index 7e54c68a53..ff05d36dd6 100644 --- a/deps/rabbitmq_cli/test/force_reset_command_test.exs +++ b/deps/rabbitmq_cli/test/force_reset_command_test.exs @@ -21,7 +21,7 @@ defmodule ForceResetCommandTest do @command ForceResetCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) start_rabbitmq_app diff --git a/deps/rabbitmq_cli/test/helpers_test.exs b/deps/rabbitmq_cli/test/helpers_test.exs index 81400ce923..d3569a844a 100644 --- a/deps/rabbitmq_cli/test/helpers_test.exs +++ b/deps/rabbitmq_cli/test/helpers_test.exs @@ -21,7 +21,7 @@ defmodule HelpersTest do @subject Helpers setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) on_exit([], fn -> :net_kernel.stop() end) :ok end diff --git a/deps/rabbitmq_cli/test/join_cluster_command_test.exs b/deps/rabbitmq_cli/test/join_cluster_command_test.exs index 7af25c125a..2e9f8644d8 100644 --- a/deps/rabbitmq_cli/test/join_cluster_command_test.exs +++ b/deps/rabbitmq_cli/test/join_cluster_command_test.exs @@ -21,7 +21,7 @@ defmodule JoinClusterCommandTest do @command JoinClusterCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) start_rabbitmq_app diff --git a/deps/rabbitmq_cli/test/list_bindings_command_test.exs b/deps/rabbitmq_cli/test/list_bindings_command_test.exs index b4471270e9..997cffd9de 100644 --- a/deps/rabbitmq_cli/test/list_bindings_command_test.exs +++ b/deps/rabbitmq_cli/test/list_bindings_command_test.exs @@ -9,7 +9,7 @@ defmodule ListBindingsCommandTest do @default_timeout :infinity setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/list_channels_command_test.exs b/deps/rabbitmq_cli/test/list_channels_command_test.exs index 4fa9935445..294fc55464 100644 --- a/deps/rabbitmq_cli/test/list_channels_command_test.exs +++ b/deps/rabbitmq_cli/test/list_channels_command_test.exs @@ -22,7 +22,7 @@ defmodule ListChannelsCommandTest do @default_timeout :infinity setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) close_all_connections(get_rabbit_hostname) diff --git a/deps/rabbitmq_cli/test/list_connections_command_test.exs b/deps/rabbitmq_cli/test/list_connections_command_test.exs index dffd1a408e..fd101683cf 100644 --- a/deps/rabbitmq_cli/test/list_connections_command_test.exs +++ b/deps/rabbitmq_cli/test/list_connections_command_test.exs @@ -7,7 +7,7 @@ defmodule ListConnectionsCommandTest do @default_timeout 15000 setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) close_all_connections(get_rabbit_hostname) diff --git a/deps/rabbitmq_cli/test/list_consumers_command_test.exs b/deps/rabbitmq_cli/test/list_consumers_command_test.exs index 9b3d33e664..47bcbd96ec 100644 --- a/deps/rabbitmq_cli/test/list_consumers_command_test.exs +++ b/deps/rabbitmq_cli/test/list_consumers_command_test.exs @@ -7,7 +7,7 @@ defmodule ListConsumersCommandTest do @default_timeout :infinity setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/list_exchanges_command_test.exs b/deps/rabbitmq_cli/test/list_exchanges_command_test.exs index d75ece65b5..2744487058 100644 --- a/deps/rabbitmq_cli/test/list_exchanges_command_test.exs +++ b/deps/rabbitmq_cli/test/list_exchanges_command_test.exs @@ -20,7 +20,7 @@ defmodule ListExchangesCommandTest do end setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/list_parameters_command_test.exs b/deps/rabbitmq_cli/test/list_parameters_command_test.exs index a93faec6d8..29687cd96f 100644 --- a/deps/rabbitmq_cli/test/list_parameters_command_test.exs +++ b/deps/rabbitmq_cli/test/list_parameters_command_test.exs @@ -26,7 +26,7 @@ defmodule ListParametersCommandTest do @value "{\"uri\":\"amqp://\"}" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost @vhost diff --git a/deps/rabbitmq_cli/test/list_permissions_command_test.exs b/deps/rabbitmq_cli/test/list_permissions_command_test.exs index e09508b173..3a3c00c499 100644 --- a/deps/rabbitmq_cli/test/list_permissions_command_test.exs +++ b/deps/rabbitmq_cli/test/list_permissions_command_test.exs @@ -24,7 +24,7 @@ defmodule ListPermissionsCommandTest do @default_timeout :infinity setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost @vhost diff --git a/deps/rabbitmq_cli/test/list_queues_command_test.exs b/deps/rabbitmq_cli/test/list_queues_command_test.exs index 4b6d1ae51e..959914b1dc 100644 --- a/deps/rabbitmq_cli/test/list_queues_command_test.exs +++ b/deps/rabbitmq_cli/test/list_queues_command_test.exs @@ -8,7 +8,7 @@ defmodule ListQueuesCommandTest do @default_timeout 15000 setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) reset_vm_memory_high_watermark() diff --git a/deps/rabbitmq_cli/test/list_user_permissions_command_test.exs b/deps/rabbitmq_cli/test/list_user_permissions_command_test.exs index 2cbde7fe0b..b243ed4bce 100644 --- a/deps/rabbitmq_cli/test/list_user_permissions_command_test.exs +++ b/deps/rabbitmq_cli/test/list_user_permissions_command_test.exs @@ -19,7 +19,7 @@ defmodule ListUserPermissionsCommandTest do import TestHelper setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/list_users_command_test.exs b/deps/rabbitmq_cli/test/list_users_command_test.exs index 95f4c4d3d7..ccc2f81bc2 100644 --- a/deps/rabbitmq_cli/test/list_users_command_test.exs +++ b/deps/rabbitmq_cli/test/list_users_command_test.exs @@ -23,7 +23,7 @@ defmodule ListUsersCommandTest do @guest "guest" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/list_vhosts_command_test.exs b/deps/rabbitmq_cli/test/list_vhosts_command_test.exs index fdd2fab06d..deb86ef671 100644 --- a/deps/rabbitmq_cli/test/list_vhosts_command_test.exs +++ b/deps/rabbitmq_cli/test/list_vhosts_command_test.exs @@ -23,7 +23,7 @@ defmodule ListVhostsCommandTest do @root "/" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost @vhost1 diff --git a/deps/rabbitmq_cli/test/node_health_check_command_test.exs b/deps/rabbitmq_cli/test/node_health_check_command_test.exs index 1cf6c26064..2c67d944f7 100644 --- a/deps/rabbitmq_cli/test/node_health_check_command_test.exs +++ b/deps/rabbitmq_cli/test/node_health_check_command_test.exs @@ -21,7 +21,7 @@ defmodule NodeHealthCheckCommandTest do @command NodeHealthCheckCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) reset_vm_memory_high_watermark() diff --git a/deps/rabbitmq_cli/test/rabbitmqctl_test.exs b/deps/rabbitmq_cli/test/rabbitmqctl_test.exs index af9ff83139..fde0a244e0 100644 --- a/deps/rabbitmq_cli/test/rabbitmqctl_test.exs +++ b/deps/rabbitmq_cli/test/rabbitmqctl_test.exs @@ -22,7 +22,7 @@ defmodule RabbitMQCtlTest do setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/report_command_test.exs b/deps/rabbitmq_cli/test/report_command_test.exs index 73e05e460f..130061d6c9 100644 --- a/deps/rabbitmq_cli/test/report_command_test.exs +++ b/deps/rabbitmq_cli/test/report_command_test.exs @@ -19,7 +19,7 @@ defmodule ReportTest do import TestHelper setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/reset_command_test.exs b/deps/rabbitmq_cli/test/reset_command_test.exs index 63677d2947..21fb728622 100644 --- a/deps/rabbitmq_cli/test/reset_command_test.exs +++ b/deps/rabbitmq_cli/test/reset_command_test.exs @@ -21,7 +21,7 @@ defmodule ResetCommandTest do @command ResetCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) start_rabbitmq_app diff --git a/deps/rabbitmq_cli/test/rotate_logs_command_test.exs b/deps/rabbitmq_cli/test/rotate_logs_command_test.exs index e1975f2718..51fb83c989 100644 --- a/deps/rabbitmq_cli/test/rotate_logs_command_test.exs +++ b/deps/rabbitmq_cli/test/rotate_logs_command_test.exs @@ -21,7 +21,7 @@ defmodule RotateLogsCommandTest do @command RotateLogsCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/rpc_stream_test.exs b/deps/rabbitmq_cli/test/rpc_stream_test.exs index 752030b74b..61882269f9 100644 --- a/deps/rabbitmq_cli/test/rpc_stream_test.exs +++ b/deps/rabbitmq_cli/test/rpc_stream_test.exs @@ -4,7 +4,7 @@ defmodule RpcStreamTest do import TestHelper setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/set_disk_free_limit_command_test.exs b/deps/rabbitmq_cli/test/set_disk_free_limit_command_test.exs index 97ea07235f..b52270f36f 100644 --- a/deps/rabbitmq_cli/test/set_disk_free_limit_command_test.exs +++ b/deps/rabbitmq_cli/test/set_disk_free_limit_command_test.exs @@ -21,7 +21,7 @@ defmodule SetDiskFreeLimitCommandTest do @default_limit 1048576 setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) set_disk_free_limit(@default_limit) diff --git a/deps/rabbitmq_cli/test/set_parameter_command_test.exs b/deps/rabbitmq_cli/test/set_parameter_command_test.exs index c1878e0da7..71e2fbf24d 100644 --- a/deps/rabbitmq_cli/test/set_parameter_command_test.exs +++ b/deps/rabbitmq_cli/test/set_parameter_command_test.exs @@ -26,7 +26,7 @@ defmodule SetParameterCommandTest do @value "{\"uri\":\"amqp://\"}" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost @vhost diff --git a/deps/rabbitmq_cli/test/set_permissions_command_test.exs b/deps/rabbitmq_cli/test/set_permissions_command_test.exs index 0e0b5bc241..5f275b1810 100644 --- a/deps/rabbitmq_cli/test/set_permissions_command_test.exs +++ b/deps/rabbitmq_cli/test/set_permissions_command_test.exs @@ -23,7 +23,7 @@ defmodule SetPermissionsCommandTest do @root "/" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost @vhost diff --git a/deps/rabbitmq_cli/test/set_user_tags_command_test.exs b/deps/rabbitmq_cli/test/set_user_tags_command_test.exs index bfacfd0292..71667ab3fe 100644 --- a/deps/rabbitmq_cli/test/set_user_tags_command_test.exs +++ b/deps/rabbitmq_cli/test/set_user_tags_command_test.exs @@ -22,7 +22,7 @@ defmodule SetUserTagsCommandTest do @password "password" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_user @user, @password diff --git a/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs b/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs index 253a12748d..8832861795 100644 --- a/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs +++ b/deps/rabbitmq_cli/test/set_vm_memory_high_watermark_command_test.exs @@ -21,7 +21,7 @@ defmodule SetVmMemoryHighWatermarkCommandTest do import SetVmMemoryHighWatermarkCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) reset_vm_memory_high_watermark() diff --git a/deps/rabbitmq_cli/test/start_app_command_test.exs b/deps/rabbitmq_cli/test/start_app_command_test.exs index a79912eb6e..0cc6f7b396 100644 --- a/deps/rabbitmq_cli/test/start_app_command_test.exs +++ b/deps/rabbitmq_cli/test/start_app_command_test.exs @@ -21,7 +21,7 @@ defmodule StartAppCommandTest do @command StartAppCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) start_rabbitmq_app diff --git a/deps/rabbitmq_cli/test/status_command_test.exs b/deps/rabbitmq_cli/test/status_command_test.exs index be583ca4c7..377b795eb7 100644 --- a/deps/rabbitmq_cli/test/status_command_test.exs +++ b/deps/rabbitmq_cli/test/status_command_test.exs @@ -21,7 +21,7 @@ defmodule StatusCommandTest do @command StatusCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/stop_app_command_test.exs b/deps/rabbitmq_cli/test/stop_app_command_test.exs index 4e08c2cd60..0a5b8653f7 100644 --- a/deps/rabbitmq_cli/test/stop_app_command_test.exs +++ b/deps/rabbitmq_cli/test/stop_app_command_test.exs @@ -21,7 +21,7 @@ defmodule StopAppCommandTest do @command StopAppCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) start_rabbitmq_app diff --git a/deps/rabbitmq_cli/test/stop_command_test.exs b/deps/rabbitmq_cli/test/stop_command_test.exs index c5663be0c4..d0a0b2883f 100644 --- a/deps/rabbitmq_cli/test/stop_command_test.exs +++ b/deps/rabbitmq_cli/test/stop_command_test.exs @@ -21,7 +21,7 @@ defmodule StopCommandTest do @command StopCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn -> diff --git a/deps/rabbitmq_cli/test/trace_off_command_test.exs b/deps/rabbitmq_cli/test/trace_off_command_test.exs index 7e2da8efcf..0116f02090 100644 --- a/deps/rabbitmq_cli/test/trace_off_command_test.exs +++ b/deps/rabbitmq_cli/test/trace_off_command_test.exs @@ -22,7 +22,7 @@ defmodule TraceOffCommandTest do @default_vhost "/" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost(@test_vhost) diff --git a/deps/rabbitmq_cli/test/trace_on_command_test.exs b/deps/rabbitmq_cli/test/trace_on_command_test.exs index 5e724edf73..f7443a25c2 100644 --- a/deps/rabbitmq_cli/test/trace_on_command_test.exs +++ b/deps/rabbitmq_cli/test/trace_on_command_test.exs @@ -22,7 +22,7 @@ defmodule TraceOnCommandTest do @default_vhost "/" setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) add_vhost(@test_vhost) diff --git a/deps/rabbitmq_cli/test/wait_command_test.exs b/deps/rabbitmq_cli/test/wait_command_test.exs index 61783b6bdc..d6bb3ef6c0 100644 --- a/deps/rabbitmq_cli/test/wait_command_test.exs +++ b/deps/rabbitmq_cli/test/wait_command_test.exs @@ -21,7 +21,7 @@ defmodule WaitCommandTest do @command WaitCommand setup_all do - :net_kernel.start([:rabbitmqctl, :shortnames]) + RabbitMQCtl.start_distribution(%{}) :net_kernel.connect_node(get_rabbit_hostname) on_exit([], fn ->