Merge pull request #5408 from rabbitmq/ik-import-vhost-default-queue-type-5399

Import default queue type when virtual host is imported

deps/rabbit/src/rabbit_definitions.erl

@@ -660,8 +660,9 @@ add_vhost(VHost, ActingUser) ->
     Metadata         = rabbit_data_coercion:atomize_keys(maps:get(metadata, VHost, #{})),
     Description      = maps:get(description, VHost, maps:get(description, Metadata, <<"">>)),
     Tags             = maps:get(tags, VHost, maps:get(tags, Metadata, [])),
+    DefaultQueueType = maps:get(default_queue_type, Metadata, undefined),
 
-    rabbit_vhost:put_vhost(Name, Description, Tags, IsTracingEnabled, ActingUser).
+    rabbit_vhost:put_vhost(Name, Description, Tags, DefaultQueueType, IsTracingEnabled, ActingUser).
 
 add_permission(Permission, ActingUser) ->
     rabbit_auth_backend_internal:set_permissions(maps:get(user,      Permission, undefined),

deps/rabbit/test/definition_import_SUITE.erl

@@ -263,6 +263,7 @@ import_case16(Config) ->
     rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
     VHostRec = vhost_lookup(Config, VHost),
     ?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
+    ?assertEqual(<<"quorum">>, vhost:get_default_queue_type(VHostRec)),
     ?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
 
     ok.

deps/rabbit/test/definition_import_SUITE_data/case16.json

@@ -45,6 +45,7 @@
     {
       "limits": [],
       "metadata": {
+        "default_queue_type":"quorum",
         "description": "A case16 description",
         "tags": [
           "multi_dc_replication",