tests: update testcli reference output

These are expected changes in CLI behaviour.  There's still a diff of
unexpected changes that need fixing (or are missing features, e.g.
keyword arguments).

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/tests/testcli.refout b/tests/testcli.refout
index 7da5494827acb3bee91c9d691da46f968ca3342b..816227579b003d32ecae1e1d14c5c71cc6f20e6c 100644 (file)
--- a/tests/testcli.refout
+++ b/tests/testcli.refout
@@ -9,16 +9,19 @@ test# echo
 % Command incomplete.\r
 test# \r
 test# arg ipv4 1.2.3.4\r
-cmd0 with 1 args.\r
-[00]: 1.2.3.4\r
+cmd0 with 3 args.\r
+[00]: arg\r
+[01]: ipv4\r
+[02]: 1.2.3.4\r
 test# arg ipv4 1.2.\r
   A.B.C.D  02\r
 test# arg ipv4 1.2.3.4\r
-cmd0 with 1 args.\r
-[00]: 1.2.3.4\r
+cmd0 with 3 args.\r
+[00]: arg\r
+[01]: ipv4\r
+[02]: 1.2.3.4\r
 test# arg ipv4 1.2.3\r
-cmd0 with 1 args.\r
-[00]: 1.2.3\r
+% [NONE] Unknown command: arg ipv4 1.2.3\r
 test# arg ipv4 1.2.3.4.5\r
 % [NONE] Unknown command: arg ipv4 1.2.3.4.5\r
 test# arg ipv4 1.a.3.4\r
@@ -27,13 +30,17 @@ test# arg ipv4 blah
 % [NONE] Unknown command: arg ipv4 blah\r
 test# \r
 test# arg ipv4m 1.2.3.0/24\r
-cmd1 with 1 args.\r
-[00]: 1.2.3.0/24\r
+cmd1 with 3 args.\r
+[00]: arg\r
+[01]: ipv4m\r
+[02]: 1.2.3.0/24\r
 test# arg ipv4m 1.2.\r
   A.B.C.D/M  02\r
 test# arg ipv4m 1.2.3.0/24\r
-cmd1 with 1 args.\r
-[00]: 1.2.3.0/24\r
+cmd1 with 3 args.\r
+[00]: arg\r
+[01]: ipv4m\r
+[02]: 1.2.3.0/24\r
 test# arg ipv4m 1.2.3/9\r
 % [NONE] Unknown command: arg ipv4m 1.2.3/9\r
 test# arg ipv4m 1.2.3.4.5/6\r
@@ -50,28 +57,36 @@ test# arg ipv4m 1.2.3.0/9a
 % [NONE] Unknown command: arg ipv4m 1.2.3.0/9a\r
 test# \r
 test# arg ipv6 de4d:b33f::cafe\r
-cmd2 with 1 args.\r
-[00]: de4d:b33f::cafe\r
+cmd2 with 3 args.\r
+[00]: arg\r
+[01]: ipv6\r
+[02]: de4d:b33f::cafe\r
 test# arg ipv6 de4d:b3\r
 % There is no matched command.\r
 test# arg ipv6 de4d:b33f::caf\r
   X:X::X:X  02\r
 test# arg ipv6 de4d:b33f::cafe\r
-cmd2 with 1 args.\r
-[00]: de4d:b33f::cafe\r
+cmd2 with 3 args.\r
+[00]: arg\r
+[01]: ipv6\r
+[02]: de4d:b33f::cafe\r
 test# arg ipv6 de4d:b3\r
 test# arg ipv6 de4d:b33f::caf\r
   X:X::X:X  02\r
 test# arg ipv6 de4d:b33f::cafe\r
-cmd2 with 1 args.\r
-[00]: de4d:b33f::cafe\r
+cmd2 with 3 args.\r
+[00]: arg\r
+[01]: ipv6\r
+[02]: de4d:b33f::cafe\r
 test# arg ipv6 de4d:b33f:z::cafe\r
 % [NONE] Unknown command: arg ipv6 de4d:b33f:z::cafe\r
 test# arg ipv6 de4d:b33f:cafe:\r
 % [NONE] Unknown command: arg ipv6 de4d:b33f:cafe:\r
 test# arg ipv6 ::\r
-cmd2 with 1 args.\r
-[00]: ::\r
+cmd2 with 3 args.\r
+[00]: arg\r
+[01]: ipv6\r
+[02]: ::\r
 test# arg ipv6 ::/\r
 % [NONE] Unknown command: arg ipv6 ::/\r
 test# arg ipv6 1:2:3:4:5:6:7:8:9:0:1:2:3:4:5:6:7:8:9:0:1:2:3:4:5:6:7:8:9:0\r
@@ -79,29 +94,39 @@ test# arg ipv6 1:2:3:4:5:6:7:8:9:0:1:2:3:4:5:6:7:8:9:0:1:2:3:4:5:6:7:8:9:0
 test# arg ipv6 12::34::56\r
 % [NONE] Unknown command: arg ipv6 12::34::56\r
 test# arg ipv6m dead:beef:cafe::/64\r
-cmd3 with 1 args.\r
-[00]: dead:beef:cafe::/64\r
+cmd3 with 3 args.\r
+[00]: arg\r
+[01]: ipv6m\r
+[02]: dead:beef:cafe::/64\r
 test# arg ipv6m dead:be\r
   X:X::X:X/M  02\r
 test# arg ipv6m dead:beef:cafe:\r
   X:X::X:X/M  02\r
 test# arg ipv6m dead:beef:cafe::/64\r
-cmd3 with 1 args.\r
-[00]: dead:beef:cafe::/64\r
+cmd3 with 3 args.\r
+[00]: arg\r
+[01]: ipv6m\r
+[02]: dead:beef:cafe::/64\r
 test# \r
 test# arg range 4\r
 % [NONE] Unknown command: arg range 4\r
 test# arg range 5\r
-cmd4 with 1 args.\r
-[00]: 5\r
+cmd4 with 3 args.\r
+[00]: arg\r
+[01]: range\r
+[02]: 5\r
 test# arg range 9\r
   <5-15>  02\r
 test# arg range 9\r
-cmd4 with 1 args.\r
-[00]: 9\r
+cmd4 with 3 args.\r
+[00]: arg\r
+[01]: range\r
+[02]: 9\r
 test# arg range 15\r
-cmd4 with 1 args.\r
-[00]: 15\r
+cmd4 with 3 args.\r
+[00]: arg\r
+[01]: range\r
+[02]: 15\r
 test# arg range 16\r
 % [NONE] Unknown command: arg range 16\r
 test# arg range -1\r
@@ -129,14 +154,18 @@ test#
 test# pat a\r
 % Command incomplete.\r
 test# pat a a\r
-cmd5 with 1 args.\r
-[00]: a\r
+cmd5 with 3 args.\r
+[00]: pat\r
+[01]: a\r
+[02]: a\r
 test# pat a \r
   a  02\r
   b  03\r
 test# pat a b\r
-cmd5 with 1 args.\r
-[00]: b\r
+cmd5 with 3 args.\r
+[00]: pat\r
+[01]: a\r
+[02]: b\r
 test# pat a c\r
 % There is no matched command.\r
 test# pat a c\r
@@ -159,9 +188,11 @@ test#
 test# pat c a\r
 % Command incomplete.\r
 test# pat c a 1.2.3.4\r
-cmd7 with 2 args.\r
-[00]: a\r
-[01]: 1.2.3.4\r
+cmd7 with 4 args.\r
+[00]: pat\r
+[01]: c\r
+[02]: a\r
+[03]: 1.2.3.4\r
 test# pat c b 2.3.4\r
 cmd7 with 2 args.\r
 [00]: b\r
@@ -172,17 +203,15 @@ test# pat c c x
 % [NONE] Unknown command: pat c c x\r
 test# \r
 test# pat d\r
-cmd8 with 3 args.\r
-[00]: (null)\r
-[01]: (null)\r
-[02]: (null)\r
+cmd8 with 2 args.\r
+[00]: pat\r
+[01]: d\r
 test# pat d \r
 bar        baz        foo        \r
 test# pat d \r
-cmd8 with 3 args.\r
-[00]: (null)\r
-[01]: (null)\r
-[02]: (null)\r
+cmd8 with 2 args.\r
+[00]: pat\r
+[01]: d\r
 test# pat d foo 1.2.3.4\r
 cmd8 with 3 args.\r
 [00]: 1.2.3.4\r
@@ -217,37 +246,55 @@ cmd8 with 3 args.
 [02]: baz\r
 test# \r
 test# pat e\r
-% Command incomplete.\r
+cmd9 with 2 args.\r
+[00]: pat\r
+[01]: e\r
 test# pat e f\r
-% Command incomplete.\r
+cmd9 with 3 args.\r
+[00]: pat\r
+[01]: e\r
+[02]: f\r
 test# pat e f g\r
-% Command incomplete.\r
+% [NONE] Unknown command: pat e f g\r
 test# pat e 1.2.3.4\r
-% Command incomplete.\r
+cmd9 with 3 args.\r
+[00]: pat\r
+[01]: e\r
+[02]: 1.2.3.4\r
 test# \r
 test# pat f\r
-cmd10 with 0 args.\r
+cmd10 with 2 args.\r
+[00]: pat\r
+[01]: f\r
 test# pat f foo\r
-cmd10 with 1 args.\r
-[00]: foo\r
+% [NONE] Unknown command: pat f foo\r
 test# pat f key\r
-cmd10 with 1 args.\r
-[00]: key\r
+cmd10 with 3 args.\r
+[00]: pat\r
+[01]: f\r
+[02]: key\r
 test# \r
 test# alt a \r
+\r
 test# alt a a\r
   WORD  02\r
 test# alt a ab\r
-cmd11 with 1 args.\r
-[00]: ab\r
+cmd11 with 3 args.\r
+[00]: alt\r
+[01]: a\r
+[02]: ab\r
 test# alt a 1\r
+\r
 test# alt a 1.2\r
   A.B.C.D  02\r
   WORD     02\r
 test# alt a 1.2.3.4\r
-cmd12 with 1 args.\r
-[00]: 1.2.3.4\r
+cmd12 with 3 args.\r
+[00]: alt\r
+[01]: a\r
+[02]: 1.2.3.4\r
 test# alt a 1\r
+\r
 test# alt a 1:2\r
   WORD  02\r
 test# alt a 1:2\r
@@ -255,8 +302,10 @@ test# alt a 1:2::
   WORD      02\r
   X:X::X:X  02\r
 test# alt a 1:2::3\r
-cmd13 with 1 args.\r
-[00]: 1:2::3\r
+cmd13 with 3 args.\r
+[00]: alt\r
+[01]: a\r
+[02]: 1:2::3\r
 test# \r
 test# conf t\r
 test(config)# do pat d baz\r