Rename auth backends prefixes to auth_X

1 files changed, 31 insertions, 17 deletions

diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config
index 4f7a25b110..92504b8c0d 100644
--- a/test/config_schema_SUITE_data/snippets.config
+++ b/test/config_schema_SUITE_data/snippets.config
@@ -135,46 +135,46 @@ auth_backends.2 = internal",
                                                       rabbit_auth_backend_internal]}]}],[]}
 ,
 {16.1,
-"ldap.servers.1 = DC1.domain.com
- ldap.servers.2 = DC1.eng.domain.com",
+"auth_ldap.servers.1 = DC1.domain.com
+ auth_ldap.servers.2 = DC1.eng.domain.com",
 [{rabbitmq_auth_backend_ldap, [{servers, ["DC1.domain.com", "DC1.eng.domain.com"]}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {16.2,
-"ldap.servers.1 = hostname1
- ldap.servers.2 = hostname2",
+"auth_ldap.servers.1 = hostname1
+ auth_ldap.servers.2 = hostname2",
 [{rabbitmq_auth_backend_ldap, [{servers, ["hostname1", "hostname2"]}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {17,
-"ldap.dn_lookup_attribute = userPrincipalName
-ldap.dn_lookup_base = DC=gopivotal,DC=com
-ldap.dn_lookup_bind = as_user",
+"auth_ldap.dn_lookup_attribute = userPrincipalName
+auth_ldap.dn_lookup_base = DC=gopivotal,DC=com
+auth_ldap.dn_lookup_bind = as_user",
 [{rabbitmq_auth_backend_ldap, [{dn_lookup_attribute,   "userPrincipalName"},
 {dn_lookup_base,        "DC=gopivotal,DC=com"},
 {dn_lookup_bind, as_user}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {18,
-"ldap.dn_lookup_bind.user_dn = username
-ldap.dn_lookup_bind.password = password",
+"auth_ldap.dn_lookup_bind.user_dn = username
+auth_ldap.dn_lookup_bind.password = password",
 [{rabbitmq_auth_backend_ldap, [
 {dn_lookup_bind, {"username", "password"}}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {19,
-"ldap.other_bind = anon",
+"auth_ldap.other_bind = anon",
 [{rabbitmq_auth_backend_ldap, [{other_bind, anon}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {20,
-"ldap.other_bind = as_user",
+"auth_ldap.other_bind = as_user",
 [{rabbitmq_auth_backend_ldap, [{other_bind, as_user}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {21,
-"ldap.other_bind.user_dn = username
-ldap.other_bind.password = password",
+"auth_ldap.other_bind.user_dn = username
+auth_ldap.other_bind.password = password",
 [{rabbitmq_auth_backend_ldap, [{other_bind, {"username", "password"}}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
@@ -727,9 +727,9 @@ web_stomp.ssl.password   = changeme",
 [rabbitmq_web_stomp]},
 {69,
 "auth_backends.1 = http
-rabbitmq_auth_backend_http.user_path     = http://some-server/auth/user
-rabbitmq_auth_backend_http.vhost_path    = http://some-server/auth/vhost
-rabbitmq_auth_backend_http.resource_path = http://some-server/auth/resource",
+auth_http.user_path     = http://some-server/auth/user
+auth_http.vhost_path    = http://some-server/auth/vhost
+auth_http.resource_path = http://some-server/auth/resource",
 [{rabbit, [{auth_backends, [rabbit_auth_backend_http]}]},
   {rabbitmq_auth_backend_http,
    [{user_path,     "http://some-server/auth/user"},
@@ -812,6 +812,20 @@ credential_validator.regexp = ^abc\\d+",
       {validation_backend, rabbit_credential_validator_password_regexp},
       {regexp,             "^abc\\d+"}
     ]}
-]}],[]}
+]}],[]},
+
+{79,
+"auth_backends.1 = amqp
+auth_amqp.username = user
+auth_amqp.vhost    = my_vhost
+auth_amqp.exchange = exchange_name
+auth_amqp.timeout  = 100",
+[{rabbit, [{auth_backends, [rabbit_auth_backend_amqp]}]},
+  {rabbitmq_auth_backend_amqp,
+   [{username, <<"user">>},
+    {vhost,    <<"my_vhost">>},
+    {exchange, <<"exchange_name">>},
+    {timeout,  100}]}],
+[rabbitmq_auth_backend_amqp]}
 
 ].