diff --git a/reg-tests/proxy/cli_add_backend.vtc b/reg-tests/proxy/cli_add_backend.vtc index 7a2c97f79..c1d049590 100644 --- a/reg-tests/proxy/cli_add_backend.vtc +++ b/reg-tests/proxy/cli_add_backend.vtc @@ -50,10 +50,10 @@ client c1 -connect ${h1_feS_sock} { haproxy h1 -cli { # non existent backend - send "experimental-mode on; add backend be from def" + send "add backend be from def" expect ~ "Mode is required" - send "experimental-mode on; add backend be from def_http" + send "add backend be from def_http" expect ~ "New backend registered." send "add server be/srv ${hsrv_fe_addr}:${hsrv_fe_port}" diff --git a/reg-tests/proxy/cli_del_backend.vtc b/reg-tests/proxy/cli_del_backend.vtc index 4eb17070a..bcbc1a4c1 100644 --- a/reg-tests/proxy/cli_del_backend.vtc +++ b/reg-tests/proxy/cli_del_backend.vtc @@ -40,29 +40,29 @@ haproxy h1 -conf { } -start haproxy h1 -cli { - send "experimental-mode on; del backend other" + send "del backend other" expect ~ "No such backend." - send "experimental-mode on; del backend li" + send "del backend li" expect ~ "Cannot delete a listen section." - send "experimental-mode on; del backend be_ref" + send "del backend be_ref" expect ~ "This proxy cannot be removed at runtime due to other configuration elements pointing to it." send "show stat be 2 -1" expect ~ "be,BACKEND," - send "experimental-mode on; del backend be" + send "del backend be" expect ~ "Backend must be unpublished prior to its deletion." send "unpublish backend be;" expect ~ ".*" - send "experimental-mode on; del backend be" + send "del backend be" expect ~ "Only a backend without server can be deleted." send "del server be/s1" expect ~ ".*" - send "experimental-mode on; del backend be" + send "del backend be" expect ~ "Backend deleted." send "show stat be 2 -1" @@ -75,7 +75,7 @@ haproxy h1 -cli { send "unpublish backend be_unnamed_def_ref;" expect ~ ".*" - send "experimental-mode on; del backend be_unnamed_def_ref" + send "del backend be_unnamed_def_ref" expect ~ "Backend deleted." send "show stat be_unnamed_def_ref 2 -1" @@ -83,6 +83,6 @@ haproxy h1 -cli { send "unpublish backend be_unnamed_def_ref2;" expect ~ ".*" - send "experimental-mode on; del backend be_unnamed_def_ref2" + send "del backend be_unnamed_def_ref2" expect ~ "Backend deleted." } diff --git a/src/proxy.c b/src/proxy.c index c6c4eb293..d7ca09843 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -5443,8 +5443,8 @@ static int cli_io_handler_show_errors(struct appctx *appctx) /* register cli keywords */ static struct cli_kw_list cli_kws = {{ },{ - { { "add", "backend", NULL }, "add backend : add a new backend", cli_parse_add_backend, NULL, NULL, NULL, ACCESS_EXPERIMENTAL }, - { { "del", "backend", NULL }, "del backend : delete a backend", cli_parse_delete_backend, NULL, NULL, NULL, ACCESS_EXPERIMENTAL }, + { { "add", "backend", NULL }, "add backend : add a new backend", cli_parse_add_backend, NULL, NULL, NULL, 0 }, + { { "del", "backend", NULL }, "del backend : delete a backend", cli_parse_delete_backend, NULL, NULL, NULL, 0 }, { { "disable", "frontend", NULL }, "disable frontend : temporarily disable specific frontend", cli_parse_disable_frontend, NULL, NULL }, { { "enable", "frontend", NULL }, "enable frontend : re-enable specific frontend", cli_parse_enable_frontend, NULL, NULL }, { { "publish", "backend", NULL }, "publish backend : mark backend as ready for traffic", cli_parse_publish_backend, NULL, NULL },