Merge branch 'vtysh-grammar' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into vtysh-grammar

pimd: removed undebug CHECK MEs

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Merge branch 'vtysh-grammar' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into vtysh-grammar

ripd, ripngd: cli refactor

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

bgpd, etc: changed .LINE to LINE...

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: fixed more CHECK MEs

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: Put back missing code

When pulling forward the zebra_vty.c changes I accidently dropped
these changes from earlier commits.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Refactor 'no ipv6 route XXXX' for new cli

Refactor the 'no ipv6 route XXXX' commands to
work under the new cli and to collapse the code
to a much smaller set.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Refactor 'ipv6 route XXXX' for new cli

Take existing code for 'ipv6 route XXX' and
refactor to use the new cli.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Fixup 'no ip route....'

Rework the 'no ip route XXXX' commands to use the new cli
and collapse all DEFUN's that we could into a much smaller
set of commands.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

zebra: Refactore "ip route XXXXXX" commands

Convert all 'ip route XXXX' commands to use the new syntax and
collapse all functions that we can easily do.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

bgpd: compress "show ip bgp neighbor received prefix-list"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: compress bgp_show_neighbor_route() calls

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: collaps show ip bgp, show ip bgp x.x.x.x, etc calls

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: bgp_vty.c compiles now

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: combine "show ip bgp summary" commands into one DEFUN

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: minor grammar corrections

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

bgpd: combine "clear bgp, clear ip bgp" commands into one DEFUN

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Expand #defines in command strings

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Expand #defines in command strings

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Sam Tannous <stannous@cumulusnetworks.com>
Ticket:

Expand #defines in command strings

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: CHECK ME fixes

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: fixed more CHECK MEs in bgp_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: refactor rtadv.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

zebra: refactor zserv.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

zebra: fix zebra_routemap.c checkme's

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

bgpd: fixed some CHECK MEs

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: added strmatch()

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: lib compiles

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

zebra: zebra_vty.c compiles

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Merge branch 'vtysh-grammar' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into vtysh-grammar

lib: Implement removed ALIAS into DEFUN

N.B.: some of these are de-facto ALIAS resurrections
that are necessary due to some parser limitations; these
are marked with ALIAS_FIXME so I can go back and add
capability to the parser to handle these special cases.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

ripd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripngd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

pimd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospfd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospf6d: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

isisd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: add 'int idx_foo' argv index variables

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: fix vrf argv index numbers

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

zebra: compress multiple whitespaces in command string

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: fix hosed CMD_RANGE_STR

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

convert <1-255> to (1-255), ()s to <>s, etc

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

tools: argv_translator convert <1-255> to (1-255), ()s to <>s, etc

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Change {json} to [json]

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: undo <> -> () change I made yesterday

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

tools: alias_destroyer re_install_element None check

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ALIAS removal for bgp, ospf, pim, isis, rip, ripng, lib and zebra

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

tools: added alias_destroyer.py

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: argv update for distribute.c and ns.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

isisd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: argv update for filter.c, if_rmap.c keychain.c and plist.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospf6d: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

pimd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ripngd: argv update

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: argv update for routemap.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: argv update for if.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: argv update for thread.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: argv fixes, XFREE -> free, rm decl in matcher

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: distribute.c, smux.c, vty.c grammar refactor

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

zebra: argv update for all but zebra_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

ospfd: argv update for all but ospf_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

lib: Remove last remnants of NUMBER_TKN...again

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Revert "lib: Get thread.c to compile"

This reverts commit 9c5f6b578e9c8df1186a89cee51c02348beb480a.

Revert "lib, zebra: Fixup if.c to work in the new regime"

This reverts commit 2511cb40e6b0e88620f26b3506b2a454a773c93d.

Revert "lib: Fix vty.c to compile with new parser"

This reverts commit c1ad0838e8de8184f6122b13472a60dbca009aa7.

Revert "lib: Fixup ns.c"

This reverts commit 5720e4ff9518275b23c28a3107a46d833eb387fa.

Revert "lib: Fixup plist.c"

This reverts commit c65a0fe1c664b5438a13aa1d756c121ff2fb7a80.

Revert "lib: Fixup more files"

This reverts commit f68cec764abf50b35945b907a2e005bc50c50831.

Revert "zebra: Fixup to use the new parser"

This reverts commit 5c94274ff77b7ba53a27ed68eb4b0bcdafba47b2.

Revert "pimd: Convert to the new way of working"

This reverts commit 0564b02e432cba04f1245a5df77c2cf2893b51a3.

Revert "ripd: Fixup code to work under new way"

This reverts commit 224a3ed809ae23539cd49b85ada8516cb0b0a762.

Revert "isisd: Make work under new regime"

This reverts commit 38c249987301aac93bebc0cb7b51784d5827c066.

bgpd: more bgp_vty.c parser conversion

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

bgpd: argv update for all but bgp_vty.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Added argv_translator.py

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
To use this run:
../tools/argv_translator.py bgp_route.c

It will update the argv[] instances with the corrent index and adds
'->arg'

isisd: Make work under new regime

ripd: Fixup code to work under new way

pimd: Convert to the new way of working

zebra: Fixup to use the new parser

lib: Fixup json code to use struct cmd_token

lib: Fixup more files

Merge branch 'vtysh-grammar' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into vtysh-grammar

lib: Remove NUMBER_TKN leftovers

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Use listnode_add_before for prepending nodes

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Update copyright headers

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

lib: Fixup plist.c

lib: Fixup ns.c

lib: Fix vty.c to compile with new parser

lib, zebra: Fixup if.c to work in the new regime

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Get thread.c to compile

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Merge remote-tracking branch 'origin/cmaster-next' into vtysh-grammar

Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/.gitignore
lib/command.c
lib/command.h

bgpd: Additional Show Commands

These commands were ported forward from these
commits:
f9b6c39 bgpd: Add back old forms of 'show <afi> <safi>' for compatibility
bf1ae6c bgpd: drop machineparse / random "show" improvements
651b402 bgpd: encap show commands
35c3686 bgpd: VPNv6 show commands
135ca15 bgpd: cleanup vty bgp_node_afi/safi utils

This is the first drop of those commits.  The files have
changed too much and the diffs to extensive to try to do it
in one piece.  Break it up into smaller code chunks.

Original Code:
Signed-off-by: Lou Berger <lberger@labn.net>
Forward Port:
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

lib: Add #define str for JavaScript help string

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

ospfd: Do not print warning on new interface

The new TE functions will always print out a warning
that TE has not been configured on an interface.  This
should be a debug not a warn.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

bgpd: Revert --enable-bgp-standalone

Reverts the --enable-bgp-standalone and makes it so that you
need to use --enable-cumulus to get the cumulus behavior.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>