From a0c8195ad37292ab800a6c777fc28383995b4b64 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 22 Oct 2019 18:38:01 +0200 Subject: vty: Return error if cmd returns CMD_WARNING while reading cfg file Otherwise bad configurations can easily sneak in and produce unexpected behavior. Change-Id: Ic9c1b566ec4a459f03e6319cf369691903cf9d00 --- tests/vty/vty_test.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tests/vty/vty_test.c') diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c index 30efb9af..0d68a6c0 100644 --- a/tests/vty/vty_test.c +++ b/tests/vty/vty_test.c @@ -421,8 +421,27 @@ DEFUN(cfg_ambiguous_str_2, cfg_ambiguous_str_2_cmd, return CMD_SUCCESS; } +DEFUN(cfg_ret_success, cfg_ret_success_cmd, + "return-success", + "testing return success\n") +{ + printf("Called: 'return-success'\n"); + return CMD_SUCCESS; +} + +DEFUN(cfg_ret_warning, cfg_ret_warning_cmd, + "return-warning", + "testing return warning\n") +{ + printf("Called: 'return-warning'\n"); + return CMD_WARNING; +} + void test_vty_add_cmds() { + install_element(CONFIG_NODE, &cfg_ret_warning_cmd); + install_element(CONFIG_NODE, &cfg_ret_success_cmd); + install_element(CONFIG_NODE, &cfg_level1_cmd); install_node(&level1_node, NULL); install_element(LEVEL1_NODE, &cfg_level1_child_cmd); @@ -524,6 +543,7 @@ int main(int argc, char **argv) test_exit_by_indent("fail_tabs_and_spaces.cfg", -EINVAL); test_exit_by_indent("ok_indented_root.cfg", 0); test_exit_by_indent("ok_empty_parent.cfg", 0); + test_exit_by_indent("fail_cmd_ret_warning.cfg", -EINVAL); test_is_cmd_ambiguous(); -- cgit v1.2.3