Split management HTTP API tests to reduce interference

Plus don't store DQT as 'undefined'
at definition import time.

Author: michaelklishin

deps/rabbit/src/rabbit_definitions.erl

@@ -783,6 +783,9 @@ add_vhost(VHost, ActingUser) ->
     Tags             = maps:get(tags, VHost, maps:get(tags, Metadata, [])),
     DefaultQueueType = maps:get(default_queue_type, Metadata, undefined),
 
+    rabbit_log:debug("Definition import: asked to import a virtual host '~ts' with default queue type of '~tp'",
+                     [Name, DefaultQueueType]),
+
     rabbit_vhost:put_vhost(Name, Description, Tags, DefaultQueueType, IsTracingEnabled, ActingUser).
 
 add_permission(Permission, ActingUser) ->

deps/rabbit/src/rabbit_queue_type.erl

@@ -267,23 +267,30 @@ discover(Other) when is_binary(Other) ->
     {ok, Mod} = rabbit_registry:lookup_module(queue, T),
     Mod.
 
--spec short_alias_of(queue_type()) -> binary().
+-spec short_alias_of(queue_type() | binary()) -> binary() | undefined.
 %% The opposite of discover/1: returns a short alias given a module name
 short_alias_of(<<"rabbit_quorum_queue">>) ->
     <<"quorum">>;
+short_alias_of(<<"quorum">>) ->
+    <<"quorum">>;
 short_alias_of(rabbit_quorum_queue) ->
     <<"quorum">>;
 short_alias_of(<<"rabbit_classic_queue">>) ->
     <<"classic">>;
+short_alias_of(<<"classic">>) ->
+    <<"classic">>;
 short_alias_of(rabbit_classic_queue) ->
     <<"classic">>;
 short_alias_of(<<"rabbit_stream_queue">>) ->
     <<"stream">>;
+short_alias_of(<<"stream">>) ->
+    <<"stream">>;
 short_alias_of(rabbit_stream_queue) ->
     <<"stream">>;
 short_alias_of(_Other) ->
     undefined.
 
+-spec feature_flag_name(binary()) -> atom() | undefined.
 feature_flag_name(<<"quorum">>) ->
     quorum_queue;
 feature_flag_name(<<"classic">>) ->

deps/rabbit/src/rabbit_vhost.erl

@@ -255,7 +255,20 @@ update_metadata(Name, Metadata0, ActingUser) ->
 
 -spec update(vhost:name(), binary(), [atom()], rabbit_queue_type:queue_type() | 'undefined', rabbit_types:username()) -> rabbit_types:ok_or_error(any()).
 update(Name, Description, Tags, DefaultQueueType, ActingUser) ->
-    Metadata = #{description => Description, tags => Tags, default_queue_type => DefaultQueueType},
+    ResolvedDQT = rabbit_queue_type:short_alias_of(rabbit_queue_type:discover(DefaultQueueType)),
+    Metadata = case ResolvedDQT of
+        undefined ->
+            #{
+                description => Description,
+                tags => Tags
+            };
+        _ ->
+            #{
+                description => Description,
+                tags => Tags,
+                default_queue_type => DefaultQueueType
+            }
+    end,
     update_metadata(Name, Metadata, ActingUser).
 
 -spec delete(vhost:name(), rabbit_types:username()) -> rabbit_types:ok_or_error(any()).