Import of Zebra CVS 20030203-16:30zebra_org_20030203

18 files changed, 9640 insertions, 12695 deletions

diff --git a/configure.in b/configure.in
index bee8296a..5c9cb547 100755
--- a/configure.in
+++ b/configure.in
@@ -317,24 +317,10 @@ if test x"$opsys" = x"gnu-linux"; then
     RT_METHOD=rt_ioctl.o
     netlink=no
   else
-    AC_EGREP_CPP(yes,
-    [#include <linux/autoconf.h>
-#include <linux/version.h>
-#if LINUX_VERSION_CODE > 131328  /* 2.1.0 or later */
-#ifdef CONFIG_RTNETLINK
-  yes
-#endif
-#endif
-#if LINUX_VERSION_CODE > 132112  /* 2.4.17 or later */
-  yes
-#endif
-    ],
-   [AC_MSG_RESULT(netlink)
+    AC_MSG_RESULT(netlink)
     RT_METHOD=rt_netlink.o
     AC_DEFINE(HAVE_NETLINK)
-    netlink=yes],
-   [AC_MSG_RESULT(ioctl)
-    RT_METHOD=rt_ioctl.o])
+    netlink=yes
   fi
 else
   if test "$opsys" = "sol2-6";then
diff --git a/doc/ChangeLog b/doc/ChangeLog
index cfe6e0e2..8aa0c802 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-22  Christian Hammers <ch@westend.com>
+
+	* ospfd.texi (OSPF router, OSPF router): Add description.
+
 2002-07-07  Kunihiro Ishiguro  <kunihiro@ipinfusion.com>
 
 	* zebra-0.93 released.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 66e35ec3..b2babd80 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,127 +13,92 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
 host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BGPD = @BGPD@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 CURSES = @CURSES@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
 IF_METHOD = @IF_METHOD@
 IF_PROC = @IF_PROC@
 INCLUDES = @INCLUDES@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 IPFORWARD = @IPFORWARD@
 KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
 LIBPAM = @LIBPAM@
-LIBS = @LIBS@
 LIB_IPV6 = @LIB_IPV6@
 LIB_REGEX = @LIB_REGEX@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
 MULTIPATH_NUM = @MULTIPATH_NUM@
-OBJEXT = @OBJEXT@
 OSPF6D = @OSPF6D@
 OSPFD = @OSPFD@
 OTHER_METHOD = @OTHER_METHOD@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RIPD = @RIPD@
 RIPNGD = @RIPNGD@
 RTREAD_METHOD = @RTREAD_METHOD@
 RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 VTYSH = @VTYSH@
 ZEBRA = @ZEBRA@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 
 info_TEXINFOS = zebra.texi
 
@@ -150,11 +115,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-am__TEXINFO_TEX_DIR = $(srcdir)
 INFO_DEPS = zebra.info
 DVIS = zebra.dvi
-PDFS = zebra.pdf
-PSS = zebra.ps
 TEXINFOS = zebra.texi
 
 NROFF = nroff
@@ -164,33 +126,35 @@ DIST_COMMON = $(zebra_TEXINFOS) ChangeLog Makefile.am Makefile.in \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .dvi .info .pdf .ps .texi
+.SUFFIXES: .dvi .info .ps .texi
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  doc/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
+zebra.info: zebra.texi $(zebra_TEXINFOS)
+zebra.dvi: zebra.texi $(zebra_TEXINFOS)
+
 .texi.info:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	`test -f '$<' || echo '$(srcdir)/'`$< -o $@
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+	       `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
+	$(TEXI2DVI) $<
 
-.texi.pdf:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-zebra.info: zebra.texi $(zebra_TEXINFOS)
-zebra.dvi: zebra.texi $(zebra_TEXINFOS)
-zebra.pdf: zebra.texi $(zebra_TEXINFOS)
-TEXI2DVI = texi2dvi
+.texi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+	       `echo $< | sed 's,.*/,,'`
 
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
+MAKEINFO = @MAKEINFO@
+TEXI2DVI = texi2dvi
 DVIPS = dvips
 .dvi.ps:
 	$(DVIPS) $< -o $@
@@ -198,7 +162,7 @@ DVIPS = dvips
 uninstall-info-am:
 	$(PRE_UNINSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
@@ -217,7 +181,7 @@ uninstall-info-am:
 dist-info: $(INFO_DEPS)
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
-	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  for file in $$d/$$base*; do \
 	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
 	    test -f $(distdir)/$$relfile || \
@@ -226,11 +190,12 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -f zebra.aux zebra.cp zebra.cps zebra.fn zebra.ky zebra.log zebra.op \
-	  zebra.pg zebra.tmp zebra.toc zebra.tp zebra.vr zebra.dvi \
-	  zebra.pdf zebra.ps
+	-rm -f zebra.aux zebra.cp zebra.cps zebra.dvi zebra.fn zebra.ky zebra.log \
+	  zebra.op zebra.pg zebra.ps zebra.tmp zebra.toc zebra.tp \
+	  zebra.vr
 
 maintainer-clean-aminfo:
+	cd $(srcdir) && \
 	list='$(INFO_DEPS)'; for i in $$list; do \
 	  rm -f $$i; \
 	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
@@ -326,20 +291,13 @@ uninstall-man8:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -360,7 +318,7 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
 	  dist-info
 check-am: all-am
 check: check-am
@@ -420,7 +378,7 @@ install-info-am: $(INFO_DEPS)
 	$(mkinstalldirs) $(DESTDIR)$(infodir)
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
 	    if test -f $$ifile; then \
 	      relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
@@ -431,7 +389,7 @@ install-info-am: $(INFO_DEPS)
 	done
 	@$(POST_INSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
@@ -451,14 +409,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-aminfo mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am: $(PDFS)
-
-ps: ps-am
-
-ps-am: $(PSS)
-
 uninstall-am: uninstall-info-am uninstall-man
 
 uninstall-man: uninstall-man1 uninstall-man8
@@ -470,9 +420,8 @@ uninstall-man: uninstall-man1 uninstall-man8
 	install-man1 install-man8 install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
-	mostlyclean-aminfo mostlyclean-generic pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am uninstall-man \
-	uninstall-man1 uninstall-man8
+	mostlyclean-aminfo mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-man uninstall-man1 uninstall-man8
 
 
 draft-zebra-00.txt:
diff --git a/doc/ospfd.texi b/doc/ospfd.texi
index 5952c051..adbf45ef 100644
--- a/doc/ospfd.texi
+++ b/doc/ospfd.texi
@@ -52,10 +52,26 @@ number.
 @deffn {OSPF Command} {ospf abr-type @var{type}} {}
 @deffnx {OSPF Command} {no ospf abr-type @var{type}} {}
 @var{type} can be cisco|ibm|shortcut|standard
+More information regarding the behaviour controlled by this command can
+be found in draft-ietf-ospf-abr-alt-05.txt. 
+Quote: "Though the definition of the Area Border Router (ABR)
+in the OSPF specification does not require a router with multiple
+attached areas to have a backbone connection, it is actually
+necessary to provide successful routing to the inter-area and
+external destinations. If this requirement is not met, all traffic
+destined for the areas not connected to such an ABR or out of the
+OSPF domain, is dropped.  This document describes alternative ABR
+behaviors implemented in Cisco and IBM routers."
 @end deffn
 
 @deffn {OSPF Command} {ospf rfc1583compatibility} {}
 @deffnx {OSPF Command} {no ospf rfc1583compatibility} {}
+This rfc2328, the sucessor to rfc1583, suggests according to section
+G.2 (changes) in section 16.4 a change to the path preference
+algorithm that prevents possible routing loops that were possible in
+the old version of OSPFv2. More specificly it demands that inter-area
+paths and intra-area path are now of equal preference but still both
+preferred to external paths.
 @end deffn
 
 @deffn {OSPF Command} {passive interface @var{interface}} {}
diff --git a/doc/zebra.info b/doc/zebra.info
index ca805e12..eb17a2d0 100644
--- a/doc/zebra.info
+++ b/doc/zebra.info
@@ -8,8 +8,8 @@ END-INFO-DIR-ENTRY
    This file documents the GNU Zebra software which manages common
 TCP/IP routing protocols.
 
-   This is Edition 0.1, last updated 12 September 2002 of `The GNU
-Zebra Manual', for Zebra Version 0.93b.
+   This is Edition 0.1, last updated 26 January 2003 of `The GNU Zebra
+Manual', for Zebra Version 0.94.
 
    Copyright (C) 1999, 2000, 2001, 2002 Kunihiro Ishiguro
 
@@ -29,142 +29,142 @@ translation approved by Kunihiro Ishiguro.
 
 
 Indirect:
-zebra.info-1: 1121
-zebra.info-2: 48818
-zebra.info-3: 95581
-zebra.info-4: 143934
+zebra.info-1: 1118
+zebra.info-2: 48813
+zebra.info-3: 96640
+zebra.info-4: 144993
 
 Tag Table:
 (Indirect)
-Node: Top1121
-Node: Overview1646
-Node: About Zebra3063
-Node: System Architecture5332
-Node: Supported Platforms8330
-Node: Supported RFC9317
-Node: How to get Zebra11119
-Node: Mailing List11824
-Node: Bug Reports12491
-Node: Installation13336
-Node: Configure the Software13767
-Ref: Configure the Software-Footnote-116134
-Node: Build the Software17776
-Node: Install the Software18318
-Node: Basic commands19689
-Node: Config Commands20402
-Node: Basic Config Commands21284
-Node: Sample Config File23682
-Node: Common Invocation Options24442
-Node: Virtual Terminal Interfaces25564
-Node: VTY Overview26069
-Node: VTY Modes27353
-Node: VTY View Mode27793
-Node: VTY Enable Mode28047
-Node: VTY Other Modes28311
-Node: VTY CLI Commands28473
-Node: CLI Movement Commands28923
-Node: CLI Editing Commands29456
-Node: CLI Advanced Commands30029
-Node: Zebra30780
-Node: Invoking zebra31287
-Node: Interface Commands31873
-Node: Static Route Commands32703
-Node: zebra Terminal Mode Commands34790
-Node: RIP35751
-Node: Starting and Stopping ripd36686
-Node: RIP netmask38107
-Node: RIP Configuration39229
-Node: How to Announce RIP route43124
-Node: Filtering RIP Routes45653
-Node: RIP Metric Manipulation47112
-Node: RIP distance48015
-Node: RIP route-map48818
-Node: RIP Authentication51320
-Node: RIP Timers52410
-Node: Show RIP Information53685
-Node: RIP Debug Commands55048
-Node: RIPng56032
-Node: Invoking ripngd56350
-Node: ripngd Configuration56607
-Node: ripngd Terminal Mode Commands57346
-Node: ripngd Filtering Commands57696
-Node: OSPFv258195
-Node: Configuring ospfd58752
-Node: OSPF router59229
-Node: OSPF area60960
-Node: OSPF interface63174
-Node: Redistribute routes to OSPF65956
-Node: Showing OSPF information68072
-Node: Debugging OSPF69292
-Node: OSPFv370303
-Node: OSPF6 router70621
-Node: OSPF6 area70978
-Node: OSPF6 interface71150
-Node: Redistribute routes to OSPF672002
-Node: Showing OSPF6 information72306
-Node: BGP73111
-Node: Starting BGP73972
-Node: BGP router74557
-Node: BGP distance75793
-Node: BGP decision process76234
-Node: BGP network76490
-Node: BGP route76671
-Node: Route Aggregation77232
-Node: Redistribute to BGP77784
-Node: BGP Peer78293
-Node: Defining Peer78471
-Node: BGP Peer commands79087
-Node: Peer filtering81458
-Node: BGP Peer Group81949
-Node: BGP Address Family82251
-Node: Autonomous System82396
-Node: AS Path Regular Expression83227
-Node: Display BGP Routes by AS Path84490
-Node: AS Path Access List84919
-Node: Using AS Path in Route Map85373
-Node: Private AS Numbers85639
-Node: BGP Communities Attribute85784
-Node: BGP Community Lists88245
-Node: Numbered BGP Community Lists90926
-Node: BGP Community in Route Map92500
-Node: Display BGP Routes by Community94427
-Node: Using BGP Communities Attribute95581
-Node: BGP Extended Communities Attribute99139
-Node: BGP Extended Community Lists100905
-Node: BGP Extended Communities in Route Map102806
-Node: Displaying BGP routes103249
-Node: Show IP BGP103475
-Node: More Show IP BGP104197
-Node: Capability Negotiation105317
-Node: Route Reflector108605
-Node: Route Server108870
-Node: Multiple instance109928
-Node: BGP instance and view111741
-Node: Routing policy113107
-Node: Viewing the view113863
-Node: How to set up a 6-Bone connection114135
-Node: Dump BGP packets and table115507
-Node: VTY shell116037
-Node: Filtering116877
-Node: IP Access List117225
-Node: IP Prefix List117616
-Node: ip prefix-list description120785
-Node: ip prefix-list sequential number control121318
-Node: Showing ip prefix-list121843
-Node: Clear counter of ip prefix-list122926
-Node: Route Map123347
-Node: Route Map Command123848
-Node: Route Map Match Command124051
-Node: Route Map Set Command124659
-Node: IPv6 Support125517
-Node: Router Advertisement126082
-Node: Kernel Interface126413
-Node: SNMP Support128363
-Node: How to get ucd-snmp128992
-Node: SMUX configuration130040
-Node: Zebra Protocol130473
-Node: Packet Binary Dump Format132367
-Node: Command Index143934
-Node: VTY Key Index173652
+Node: Top1118
+Node: Overview1642
+Node: About Zebra3059
+Node: System Architecture5328
+Node: Supported Platforms8326
+Node: Supported RFC9313
+Node: How to get Zebra11115
+Node: Mailing List11820
+Node: Bug Reports12487
+Node: Installation13332
+Node: Configure the Software13763
+Ref: Configure the Software-Footnote-116130
+Node: Build the Software17772
+Node: Install the Software18314
+Node: Basic commands19685
+Node: Config Commands20398
+Node: Basic Config Commands21280
+Node: Sample Config File23678
+Node: Common Invocation Options24438
+Node: Virtual Terminal Interfaces25560
+Node: VTY Overview26065
+Node: VTY Modes27348
+Node: VTY View Mode27788
+Node: VTY Enable Mode28042
+Node: VTY Other Modes28306
+Node: VTY CLI Commands28468
+Node: CLI Movement Commands28918
+Node: CLI Editing Commands29451
+Node: CLI Advanced Commands30024
+Node: Zebra30775
+Node: Invoking zebra31282
+Node: Interface Commands31868
+Node: Static Route Commands32698
+Node: zebra Terminal Mode Commands34785
+Node: RIP35746
+Node: Starting and Stopping ripd36681
+Node: RIP netmask38102
+Node: RIP Configuration39224
+Node: How to Announce RIP route43119
+Node: Filtering RIP Routes45648
+Node: RIP Metric Manipulation47107
+Node: RIP distance48010
+Node: RIP route-map48813
+Node: RIP Authentication51315
+Node: RIP Timers52405
+Node: Show RIP Information53680
+Node: RIP Debug Commands55043
+Node: RIPng56027
+Node: Invoking ripngd56345
+Node: ripngd Configuration56602
+Node: ripngd Terminal Mode Commands57341
+Node: ripngd Filtering Commands57691
+Node: OSPFv258190
+Node: Configuring ospfd58747
+Node: OSPF router59224
+Node: OSPF area62019
+Node: OSPF interface64233
+Node: Redistribute routes to OSPF67015
+Node: Showing OSPF information69131
+Node: Debugging OSPF70351
+Node: OSPFv371362
+Node: OSPF6 router71680
+Node: OSPF6 area72037
+Node: OSPF6 interface72209
+Node: Redistribute routes to OSPF673061
+Node: Showing OSPF6 information73365
+Node: BGP74170
+Node: Starting BGP75031
+Node: BGP router75616
+Node: BGP distance76852
+Node: BGP decision process77293
+Node: BGP network77549
+Node: BGP route77730
+Node: Route Aggregation78291
+Node: Redistribute to BGP78843
+Node: BGP Peer79352
+Node: Defining Peer79530
+Node: BGP Peer commands80146
+Node: Peer filtering82517
+Node: BGP Peer Group83008
+Node: BGP Address Family83310
+Node: Autonomous System83455
+Node: AS Path Regular Expression84286
+Node: Display BGP Routes by AS Path85549
+Node: AS Path Access List85978
+Node: Using AS Path in Route Map86432
+Node: Private AS Numbers86698
+Node: BGP Communities Attribute86843
+Node: BGP Community Lists89304
+Node: Numbered BGP Community Lists91985
+Node: BGP Community in Route Map93559
+Node: Display BGP Routes by Community95486
+Node: Using BGP Communities Attribute96640
+Node: BGP Extended Communities Attribute100198
+Node: BGP Extended Community Lists101964
+Node: BGP Extended Communities in Route Map103865
+Node: Displaying BGP routes104308
+Node: Show IP BGP104534
+Node: More Show IP BGP105256
+Node: Capability Negotiation106376
+Node: Route Reflector109664
+Node: Route Server109929
+Node: Multiple instance110987
+Node: BGP instance and view112800
+Node: Routing policy114166
+Node: Viewing the view114922
+Node: How to set up a 6-Bone connection115194
+Node: Dump BGP packets and table116566
+Node: VTY shell117096
+Node: Filtering117936
+Node: IP Access List118284
+Node: IP Prefix List118675
+Node: ip prefix-list description121844
+Node: ip prefix-list sequential number control122377
+Node: Showing ip prefix-list122902
+Node: Clear counter of ip prefix-list123985
+Node: Route Map124406
+Node: Route Map Command124907
+Node: Route Map Match Command125110
+Node: Route Map Set Command125718
+Node: IPv6 Support126576
+Node: Router Advertisement127141
+Node: Kernel Interface127472
+Node: SNMP Support129422
+Node: How to get ucd-snmp130051
+Node: SMUX configuration131099
+Node: Zebra Protocol131532
+Node: Packet Binary Dump Format133426
+Node: Command Index144993
+Node: VTY Key Index174711
 
 End Tag Table
diff --git a/doc/zebra.texi b/doc/zebra.texi
index d09ff4d6..965e0590 100644
--- a/doc/zebra.texi
+++ b/doc/zebra.texi
@@ -9,9 +9,9 @@
 
 @c Set variables
 @set EDITION 0.1
-@set VERSION 0.93b
-@set UPDATED 12 September 2002
-@set UPDATED-MONTH September 2002
+@set VERSION 0.94
+@set UPDATED 26 January 2003
+@set UPDATED-MONTH January 2003
 
 @c These may vary with installation environment.
 @set INSTALL_PREFIX_ETC /usr/local/etc
diff --git a/lib/version.h b/lib/version.h
index 9a90bf4e..ecb6b0a3 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -22,7 +22,7 @@
 #ifndef _ZEBRA_VERSION_H
 #define _ZEBRA_VERSION_H
 
-#define ZEBRA_VERSION     "0.93b"
+#define ZEBRA_VERSION     "0.94"
 
 #define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org"
 
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 31c5b0f7..b7794f72 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-23  Masahiko Endo <endo@suri.co.jp>
+
+	* ospf_ism.c: NSM event schedule bug fix.
+
+2002-10-30  Greg Troxel <gdt@ir.bbn.com>
+
+	* ospf_packet.c (ospf_make_md5_digest): MD5 length fix. 
+
 2002-10-23  endo@suri.co.jp (Masahiko Endo)
 
 	* ospf_opaque.c: Update Opaque LSA patch.
diff --git a/ospfd/ChangeLog.opaque.txt b/ospfd/ChangeLog.opaque.txt
new file mode 100644
index 00000000..782e332a
--- /dev/null
+++ b/ospfd/ChangeLog.opaque.txt
@@ -0,0 +1,221 @@
+----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * -----
+Changes 2002.12.20
+
+1. Bug fixes
+
+  1.1 When an opaque LSA is being removed from (or added to) the LSDB,
+      it does not mean a change in network topology. Therefore, SPF
+      recalculation should not be triggered in that case.
+      There was an assertion failure problem "assert (rn && rn->info)"
+      inside the function "ospf_ase_incremental_update()", because
+      the upper function "ospf_lsa_maxage_walker_remover()" called it
+      when a type-11 opaque LSA is removed due to MaxAge.
+
+  1.2 Type-9 LSA is defined to have "link-local" flooding scope.
+      In the Database exchange procedure with a new neighbor, a type-9
+      LSA was added in the database summary of a DD message, even if
+      the link is different from the one that have bound to.
+
+2. Feature enhancements
+
+  2.1 Though a "wildcard" concept to handle type-9/10/11 LSAs altogether
+      has introduced about a year ago, it was only a symbol definition
+      and actual handling mechanism was not implemented. Now it works.
+
+----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * -----
+Changes 2002.7.8
+
+1. Bug fixes
+
+  1.1 When "ospf_delete_opaque_functab()" is called, internal structure
+      "oipt" remain unfreed. If register/delete functab is repeated,
+      illegal memory access happens due to this "oipt".
+
+  1.2 In "free_opaque_info_per_id()", there was a crucial typo which
+      ignores a condition test.
+
+      "if (oipi->lsa != NULL);" <-- semicolon!
+
+2. Feature enhancements
+
+  None.
+
+----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * -----
+Changes 2001.12.03
+
+1. Bug fixes
+
+  1.1 Though a new member "oi" has added to "struct ospf_lsa" to control
+      flooding scope of type-9 Opaque-LSAs, the value was always NULL
+      because no one set it.
+
+  1.2 In the function "show_ip_ospf_database_summary()" and "show_lsa_
+      detail_adv_router()", VTY output for type-11 Opaque-LSAs did not
+      work properly.
+
+  1.3 URL for the opaque-type assignment reference has changed.
+
+  1.4 In the file "ospf_mpls_te.c", printf formats have changed to
+      avoid compiler warning messages; "%lu" -> "%u", "%lx" -> "%x".
+      Note that this hack depends on OS, compiler and their versions. 
+
+  1.5 One of attached documentation "opaque_lsa.txt" has changed to
+      reflect the latest coding.
+
+2. Feature enhancements
+
+  2.1 Knowing that it is an ugly hack, an "officially unallocated"
+      opaque-type value 0 has newly introduced as a "wildcard",
+      which matches to all opaque-type.
+      This value must not be flooded to the network, of course.
+
+  2.2 The Opaque-core module makes use of newly introduced hooks to
+      dispatch every LSDB change (LSA installation and deletion) to
+      preregistered opaque users.
+      Therefore, by providing appropriate callback functions as new
+      parameters of "ospf_register_opaque_functab()", an opaque user
+      can refer to every LSA instance to be installed into, or to be
+      deleted from, the LSDB.
+
+----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * -----
+Changes 2001.10.31
+
+1. Bug fixes
+
+  1.1 Since each LSA has their own lifetime, they will remain in a
+      routing domain (being stored in LSDB of each router), until their
+      age naturally reach to MaxAge or explicitly being flushed by the
+      originated router. Therefore, if a router restarted with a short
+      downtime, it is possible that previously flooded self-originated
+      LSAs might received if the NSM status is not less than Exchange.
+
+      There were some problems in the way of handling self-originated
+      Opaque-LSAs if they are contained in a received LSUpd message,
+      but not installed to the local LSDB yet.
+      Regardless of some conditions to start originating Opaque-LSAs
+      (there should be at least one opaque-capable full-state neighbor),
+      the function "ospf_flood()" will be called to flood and install
+      this brand-new looking LSA.
+      As the result, when the NSM of an opaque-capable neighbor gets
+      full, internal state inconsistency happens; a user of Opaque-LSA
+      such as MPLS-TE can refer to self-originated LSAs in the local
+      LSDB, but cannot modify their contents...
+
+      Above problems have fixed with a policy "flush it from the whole
+      routing domain and keep silent until the flushing completed".
+      By using this sweeping technique, we can be free from confusion
+      caused by self-originated LSAs received via network. 
+
+  1.2 The function "ospf_opaque_type_name()" contained massive ifdefs
+      corresponding to each "opaque-type".
+      These unnecessary ifdefs are removed completely.
+
+  1.3 In the function "ospf_delete_opaque_functab()", there was an
+      improper loop control that causes illegal memory access.
+      Original coding was "next = nextnode (node)".
+
+  1.4 The function "ospf_mpls_te_ism_change()" could not handle the
+      case when the ISM changes from Waiting to DR/BDR/Other.
+      So, there was a case that even if one of an ISM become
+      operational and MPLS-TE module has started, the corresponding
+      Opaque-LSA cannot be originated.
+
+  1.5 The function "ospf_opaque_lsa_reoriginate_schedule()" did not
+      allow to be called multiple times, simply because handling
+      module for the given "lsa-type & opaque-type" already exists.
+      But this assumption seems to be wrong.
+      Change the policy to allow this function to be called multiple
+      times and let the caller to decide what should do when the
+      corresponding callback function "(* functab->lsa_originator)()"
+      is called.
+
+2. Feature enhancements
+
+  2.1 The global bitmap "opaque" has introduced instead of former flag
+      "OpaqueCapable", to store complex conditions to handle Opaque-LSAs.
+
+  2.2 The MPLS-TE module now referes to "draft-katz-yeung-ospf-traffic
+      -06.txt", no significant changes with 05 version, though.
+
+----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * -----
+Changes 2001.08.03
+
+1. Bug fixes
+
+  1.1 Even if the ospfd started with opaque capability enabled, when
+      the ospfd receives an unknown opaque-type (unregistered by the
+      function "ospf_register_opaque_functab()" beforehand), the LSA
+      was discarded. As the result, only the opaque-LSAs that have
+      commonly registered by opaque-capable ospf routers can be
+      flooded in a routing domain.
+
+      This behavior has fixed so that arbitrary opaque-type LSAs can
+      be flooded among opaque-capable ospf routers.
+      If the ospfd has opaque-LSA capability but disabled at runtime,
+      received opaque-LSAs can be accepted and registered to LSDB as
+      is, but not be flooded to the network; those opaque LSAs will
+      remain in LSDB until explicitly flushed by incoming LSUpd
+      messages with MaxAge, or their age naturally reaches to MaxAge.
+
+  1.2 The function "ospf_register_opaque_functab()" did not check
+      if the entry corresponding to the given "lsa-type, opaque-type"
+      combination already exists or not.
+      This problem has fixed not to allow multiple registration.
+
+  1.3 Since type-11 (AS external) LSAs will be flooded beyond areas,
+      there is little relationship between "struct lsa" and "struct
+      area". More specifically, the pointer address "lsa->area" can
+      be NULL if the lsa-type is 11, thus an illegal memory access
+      will happen. This problem has fixed.
+
+  1.4 When self-originated opaque-LSAs are received via network and
+      if the corresponding opaque-type functions are not available
+      (they have already deleted) at that time, those LSAs were
+      dropped due to "unknown opaque-type" error.
+      After the problem 1.1 has fixed, those "self-originated" LSAs
+      were registered to LSDB and then flooded to the network, even
+      if the processing functions did not exist...
+
+      After all, this problem has fixed so that those LSAs should
+      explicitly be flushed from the routing domain immediately, if
+      the processing functions cannot find at that time.
+
+  1.5 Some typo have fixed.
+
+      --- EXAMPLE ---
+      static int
+      opaque_lsa_originate_callback (list funclist, void *lsa_type_dependent)
+                                                          ^^^^^
+      --- EXAMPLE ---
+
+2. Feature enhancements
+
+  2.1 According to the description of rfc2328 in section 10.8, any
+      change in the router's optional capabilities should trigger
+      the option re-negotiation procedures with neighbors.
+
+      --- EXCERPT ---
+                              If for some reason the router's optional
+        capabilities change, the Database Exchange procedure should be
+        restarted by reverting to neighbor state ExStart.
+      --- EXCERPT ---
+
+      For the opaque-capability changes, this feature has implemented.
+      More specifically, if "ospf opaque-lsa" or "no ospf opaque-lsa"
+      VTY command is given at runtime, all self-originated LSAs will
+      be flushed immediately and then all neighbor status will be
+      forced to ExStart by generating SeqNumberMismatch events.
+
+  2.1 When we change opaque-capability dynamically (ON -> OFF -> ON),
+      there was no trigger at "OFF->ON" timing to reactivate opaque
+      LSA handling modules (such as MPLS-TE) that have once forcibly
+      stopped at "ON->OFF" timing.
+      Now this dynamic reactivation feature has added.
+
+  2.2 The MPLS-TE module now referes to "draft-katz-yeung-ospf-traffic
+      -05.txt", no significant changes with 04 version, though.
+
+----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * ----- * -----
+Changes 2001.03.28
+
+  Initial release of Opaque-LSA/MPLS-TE extensions for the zebra/ospfd.
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 1ced11cc..2b905804 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -28,7 +28,7 @@ ospfd_LDADD = ../lib/libzebra.a
 
 sysconf_DATA = ospfd.conf.sample
 
-EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
+EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
 
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
diff --git a/ospfd/Makefile.in b/ospfd/Makefile.in
index 8472535e..941804cf 100644
--- a/ospfd/Makefile.in
+++ b/ospfd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,128 +13,94 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
 host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BGPD = @BGPD@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 CURSES = @CURSES@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
 IF_METHOD = @IF_METHOD@
 IF_PROC = @IF_PROC@
 
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 IPFORWARD = @IPFORWARD@
 KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
 LIBPAM = @LIBPAM@
-LIBS = @LIBS@
 LIB_IPV6 = @LIB_IPV6@
 LIB_REGEX = @LIB_REGEX@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
 MULTIPATH_NUM = @MULTIPATH_NUM@
-OBJEXT = @OBJEXT@
 OSPF6D = @OSPF6D@
 OSPFD = @OSPFD@
 OTHER_METHOD = @OTHER_METHOD@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RIPD = @RIPD@
 RIPNGD = @RIPNGD@
 RTREAD_METHOD = @RTREAD_METHOD@
 RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 VTYSH = @VTYSH@
 ZEBRA = @ZEBRA@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
+DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA = @INSTALL@ -m 600
 
 noinst_LIBRARIES = libospf.a
@@ -164,7 +130,7 @@ ospfd_LDADD = ../lib/libzebra.a
 
 sysconf_DATA = ospfd.conf.sample
 
-EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
+EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
 subdir = ospfd
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -199,8 +165,10 @@ am_ospfd_OBJECTS = ospf_main.$(OBJEXT) $(am__objects_1)
 ospfd_OBJECTS = $(am_ospfd_OBJECTS)
 ospfd_DEPENDENCIES = ../lib/libzebra.a
 ospfd_LDFLAGS =
-
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ospf_abr.Po ./$(DEPDIR)/ospf_asbr.Po \
@@ -222,6 +190,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
 DIST_SOURCES = $(libospf_a_SOURCES) $(ospfd_SOURCES)
 DATA = $(sysconf_DATA)
 
@@ -256,7 +225,7 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
 	  else :; fi; \
 	done
 
@@ -309,26 +278,17 @@ distclean-depend:
 	-rm -rf ./$(DEPDIR)
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 sysconfDATA_INSTALL = $(INSTALL_DATA)
 
@@ -343,9 +303,6 @@ uninstall-sysconfDATA:
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -371,39 +328,20 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -490,19 +428,11 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS \
 	uninstall-sysconfDATA
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES clean-sbinPROGRAMS ctags distclean \
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES clean-sbinPROGRAMS distclean \
 	distclean-compile distclean-depend distclean-generic \
 	distclean-tags distdir dvi dvi-am info info-am install \
 	install-am install-data install-data-am install-exec \
@@ -510,9 +440,8 @@ uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS \
 	install-sbinPROGRAMS install-strip install-sysconfDATA \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-sbinPROGRAMS \
-	uninstall-sysconfDATA
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am uninstall-sbinPROGRAMS uninstall-sysconfDATA
 
 
 install-sysconfDATA: $(sysconf_DATA)
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 5b63a76d..56c1e990 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2306,6 +2306,11 @@ ospf_lsa_install (struct ospf_interface *oi, struct ospf_lsa *lsa)
       break;
 #ifdef HAVE_OPAQUE_LSA
     case OSPF_OPAQUE_LINK_LSA:
+      if (IS_LSA_SELF (lsa))
+          lsa->oi = oi; /* Specify outgoing ospf-interface for this LSA. */
+      else
+          ; /* Incoming "oi" for this LSA has set at LSUpd reception. */
+      /* Fallthrough */
     case OSPF_OPAQUE_AREA_LSA:
     case OSPF_OPAQUE_AS_LSA:
       new = ospf_opaque_lsa_install (lsa, rt_recalc);
@@ -2537,10 +2542,21 @@ ospf_lsa_maxage_walker_remover (struct ospf_lsa *lsa, void *p_arg, int int_arg)
 
         switch (lsa->data->type)
           {
-          case OSPF_AS_EXTERNAL_LSA:
 #ifdef HAVE_OPAQUE_LSA
+          case OSPF_OPAQUE_LINK_LSA:
+          case OSPF_OPAQUE_AREA_LSA:
           case OSPF_OPAQUE_AS_LSA:
+            /*
+             * As a general rule, whenever network topology has changed
+             * (due to an LSA removal in this case), routing recalculation
+             * should be triggered. However, this is not true for opaque
+             * LSAs. Even if an opaque LSA instance is going to be removed
+             * from the routing domain, it does not mean a change in network
+             * topology, and thus, routing recalculation is not needed here.
+             */
+            break;
 #endif /* HAVE_OPAQUE_LSA */
+          case OSPF_AS_EXTERNAL_LSA:
 	    ospf_ase_incremental_update (lsa, ospf_top);
             break;
           default:
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 67c6608b..5d5b30c9 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -239,6 +239,7 @@ struct ospf_opaque_functab
   int (* del_lsa_hook)(struct ospf_lsa *lsa);
 };
 
+static list ospf_opaque_wildcard_funclist; /* Handle LSA-9/10/11 altogether. */
 static list ospf_opaque_type9_funclist;
 static list ospf_opaque_type10_funclist;
 static list ospf_opaque_type11_funclist;
@@ -255,6 +256,9 @@ ospf_opaque_funclist_init (void)
 {
   list funclist;
 
+  funclist = ospf_opaque_wildcard_funclist = list_new ();
+  funclist->del = ospf_opaque_del_functab;
+
   funclist = ospf_opaque_type9_funclist  = list_new ();
   funclist->del = ospf_opaque_del_functab;
 
@@ -271,6 +275,9 @@ ospf_opaque_funclist_term (void)
 {
   list funclist;
 
+  funclist = ospf_opaque_wildcard_funclist;
+  list_delete (funclist);
+
   funclist = ospf_opaque_type9_funclist;
   list_delete (funclist);
 
@@ -289,6 +296,16 @@ ospf_get_opaque_funclist (u_char lsa_type)
 
   switch (lsa_type)
     {
+    case OPAQUE_TYPE_WILDCARD:
+      /* XXX
+       * This is an ugly trick to handle type-9/10/11 LSA altogether.
+       * Yes, "OPAQUE_TYPE_WILDCARD (value 0)" is not an LSA-type, nor
+       * an officially assigned opaque-type.
+       * Though it is possible that the value might be officially used
+       * in the future, we use it internally as a special label, for now.
+       */
+      funclist = ospf_opaque_wildcard_funclist;
+      break;
     case OSPF_OPAQUE_LINK_LSA:
       funclist = ospf_opaque_type9_funclist;
       break;
@@ -434,6 +451,7 @@ ospf_opaque_functab_lookup (struct ospf_lsa *lsa)
  */
 struct opaque_info_per_type
 {
+  u_char lsa_type;
   u_char opaque_type;
 
   enum { PROC_NORMAL, PROC_SUSPEND } status;
@@ -451,7 +469,7 @@ struct opaque_info_per_type
   struct thread *t_opaque_lsa_self;
 
   /*
-   * Backpointer to an "owner" which is opaque-type dependent.
+   * Backpointer to an "owner" which is LSA-type dependent.
    *   type-9:  struct ospf_interface
    *   type-10: struct ospf_area
    *   type-11: struct ospf
@@ -523,11 +541,13 @@ register_opaque_info_per_type (struct ospf_opaque_functab *functab,
       listnode_add (top->opaque_lsa_self, oipt);
       break;
     default:
+      zlog_warn ("register_opaque_info_per_type: Unexpected LSA-type(%u)", new->data->type);
       free_opaque_info_per_type ((void *) oipt);
       oipt = NULL;
       goto out; /* This case may not exist. */
     }
 
+  oipt->lsa_type = new->data->type;
   oipt->opaque_type = GET_OPAQUE_TYPE (ntohl (new->data->id.s_addr));
   oipt->status = PROC_NORMAL;
   oipt->t_opaque_lsa_self = NULL;
@@ -560,6 +580,32 @@ free_opaque_info_per_type (void *val)
       ospf_opaque_lsa_flush_schedule (lsa);
     }
 
+  /* Remove "oipt" from its owner's self-originated LSA list. */
+  switch (oipt->lsa_type)
+    {
+    case OSPF_OPAQUE_LINK_LSA:
+      {
+        struct ospf_interface *oi = (struct ospf_interface *)(oipt->owner);
+        listnode_delete (oi->opaque_lsa_self, oipt);
+        break;
+      }
+    case OSPF_OPAQUE_AREA_LSA:
+      {
+        struct ospf_area *area = (struct ospf_area *)(oipt->owner);
+        listnode_delete (area->opaque_lsa_self, oipt);
+        break;
+      }
+    case OSPF_OPAQUE_AS_LSA:
+      {
+        struct ospf *top = (struct ospf *)(oipt->owner);
+        listnode_delete (top->opaque_lsa_self, oipt);
+        break;
+      }
+    default:
+      zlog_warn ("free_opaque_info_per_type: Unexpected LSA-type(%u)", oipt->lsa_type);
+      break; /* This case may not exist. */
+    }
+
   OSPF_TIMER_OFF (oipt->t_opaque_lsa_self);
   list_delete (oipt->id_list);
   XFREE (MTYPE_OPAQUE_INFO_PER_TYPE, oipt);
@@ -923,6 +969,10 @@ ospf_opaque_new_if (struct interface *ifp)
   list funclist;
   int rc = -1;
 
+  funclist = ospf_opaque_wildcard_funclist;
+  if (opaque_lsa_new_if_callback (funclist, ifp) != 0)
+    goto out;
+
   funclist = ospf_opaque_type9_funclist;
   if (opaque_lsa_new_if_callback (funclist, ifp) != 0)
     goto out;
@@ -946,6 +996,10 @@ ospf_opaque_del_if (struct interface *ifp)
   list funclist;
   int rc = -1;
 
+  funclist = ospf_opaque_wildcard_funclist;
+  if (opaque_lsa_del_if_callback (funclist, ifp) != 0)
+    goto out;
+
   funclist = ospf_opaque_type9_funclist;
   if (opaque_lsa_del_if_callback (funclist, ifp) != 0)
     goto out;
@@ -968,6 +1022,9 @@ ospf_opaque_ism_change (struct ospf_interface *oi, int old_status)
 {
   list funclist;
 
+  funclist = ospf_opaque_wildcard_funclist;
+  opaque_lsa_ism_change_callback (funclist, oi, old_status);
+
   funclist = ospf_opaque_type9_funclist;
   opaque_lsa_ism_change_callback (funclist, oi, old_status);
 
@@ -1017,6 +1074,9 @@ ospf_opaque_nsm_change (struct ospf_neighbor *nbr, int old_state)
       ;
     }
 
+  funclist = ospf_opaque_wildcard_funclist;
+  opaque_lsa_nsm_change_callback (funclist, nbr, old_state);
+
   funclist = ospf_opaque_type9_funclist;
   opaque_lsa_nsm_change_callback (funclist, nbr, old_state);
 
@@ -1038,6 +1098,9 @@ ospf_opaque_config_write_router (struct vty *vty, struct ospf *ospf)
   if (CHECK_FLAG (ospf->config, OSPF_OPAQUE_CAPABLE))
     vty_out (vty, " capability opaque%s", VTY_NEWLINE);
 
+  funclist = ospf_opaque_wildcard_funclist;
+  opaque_lsa_config_write_router_callback (funclist, vty);
+
   funclist = ospf_opaque_type9_funclist;
   opaque_lsa_config_write_router_callback (funclist, vty);
 
@@ -1055,6 +1118,9 @@ ospf_opaque_config_write_if (struct vty *vty, struct interface *ifp)
 {
   list funclist;
 
+  funclist = ospf_opaque_wildcard_funclist;
+  opaque_lsa_config_write_if_callback (funclist, vty, ifp);
+
   funclist = ospf_opaque_type9_funclist;
   opaque_lsa_config_write_if_callback (funclist, vty, ifp);
 
@@ -1072,6 +1138,9 @@ ospf_opaque_config_write_debug (struct vty *vty)
 {
   list funclist;
 
+  funclist = ospf_opaque_wildcard_funclist;
+  opaque_lsa_config_write_debug_callback (funclist, vty);
+
   funclist = ospf_opaque_type9_funclist;
   opaque_lsa_config_write_debug_callback (funclist, vty);
 
@@ -1142,6 +1211,10 @@ ospf_opaque_lsa_install_hook (struct ospf_lsa *lsa)
    * Some Opaque-LSA user may want to monitor every LSA installation
    * into the LSDB, regardless with target LSA type.
    */
+  funclist = ospf_opaque_wildcard_funclist;
+  if (new_lsa_callback (funclist, lsa) != 0)
+    goto out;
+
   funclist = ospf_opaque_type9_funclist;
   if (new_lsa_callback (funclist, lsa) != 0)
     goto out;
@@ -1169,6 +1242,10 @@ ospf_opaque_lsa_delete_hook (struct ospf_lsa *lsa)
    * Some Opaque-LSA user may want to monitor every LSA deletion
    * from the LSDB, regardless with target LSA type.
    */
+  funclist = ospf_opaque_wildcard_funclist;
+  if (del_lsa_callback (funclist, lsa) != 0)
+    goto out;
+
   funclist = ospf_opaque_type9_funclist;
   if (del_lsa_callback (funclist, lsa) != 0)
     goto out;
@@ -1473,6 +1550,13 @@ ospf_opaque_lsa_install (struct ospf_lsa *lsa, int rt_recalc)
   switch (lsa->data->type)
     {
     case OSPF_OPAQUE_LINK_LSA:
+      if ((top = oi_to_top (lsa->oi)) == NULL)
+        {
+          /* Above conditions must have passed. */
+          zlog_warn ("ospf_opaque_lsa_install: Sonmething wrong?");
+          goto out;
+        }
+      break;
     case OSPF_OPAQUE_AREA_LSA:
       if (lsa->area == NULL || (top = lsa->area->top) == NULL)
         {
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 2156ce33..89878c92 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -226,7 +226,12 @@ ospf_packet_dup (struct ospf_packet *op)
 {
   struct ospf_packet *new;
 
-  new = ospf_packet_new (op->length);
+  if (stream_get_endp(op->s) != op->length)
+    zlog_warn ("ospf_packet_dup stream %ld ospf_packet %d size mismatch",
+	       STREAM_SIZE(op->s), op->length);
+
+  /* Reserve space for MD5 authentication that may be added later. */
+  new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE);
   ospf_stream_copy (new->s, op->s);
 
   new->dst = op->dst;
@@ -356,7 +361,10 @@ ospf_make_md5_digest (struct ospf_interface *oi, struct ospf_packet *op)
   stream_set_putp (op->s, oldputp);
 
   /* We do *NOT* increment the OSPF header length. */
-  op->length += OSPF_AUTH_MD5_SIZE;
+  op->length = ntohs (ospfh->length) + OSPF_AUTH_MD5_SIZE;
+
+  if (stream_get_endp(op->s) != op->length)
+    zlog_warn("ospf_make_md5_digest: length mismatch stream %ld ospf_packet %d", stream_get_endp(op->s), op->length);
 
   return OSPF_AUTH_MD5_SIZE;
 }
diff --git a/vtysh/Makefile.in b/vtysh/Makefile.in
index 71eb6b49..20a208c8 100644
--- a/vtysh/Makefile.in
+++ b/vtysh/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,129 +13,96 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
 host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BGPD = @BGPD@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 CURSES = @CURSES@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
 IF_METHOD = @IF_METHOD@
 IF_PROC = @IF_PROC@
 
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 IPFORWARD = @IPFORWARD@
 KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
 LIBPAM = @LIBPAM@
-
-LIBS = @LIBS@ @CURSES@ @LIBPAM@
 LIB_IPV6 = @LIB_IPV6@
 LIB_REGEX = @LIB_REGEX@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
 MULTIPATH_NUM = @MULTIPATH_NUM@
-OBJEXT = @OBJEXT@
 OSPF6D = @OSPF6D@
 OSPFD = @OSPFD@
 OTHER_METHOD = @OTHER_METHOD@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RIPD = @RIPD@
 RIPNGD = @RIPNGD@
 RTREAD_METHOD = @RTREAD_METHOD@
 RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 VTYSH = @VTYSH@
 ZEBRA = @ZEBRA@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
+DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+
+LIBS = @LIBS@ @CURSES@ @LIBPAM@
 
 bin_PROGRAMS = vtysh
 
@@ -158,8 +125,9 @@ am_vtysh_OBJECTS = vtysh_main.$(OBJEXT) vtysh.$(OBJEXT) \
 vtysh_OBJECTS = $(am_vtysh_OBJECTS)
 vtysh_DEPENDENCIES = ../lib/libzebra.a
 vtysh_LDFLAGS =
-
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vtysh.Po ./$(DEPDIR)/vtysh_cmd.Po \
@@ -169,6 +137,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
 DIST_SOURCES = $(vtysh_SOURCES)
 DATA = $(sysconf_DATA)
 
@@ -196,7 +165,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
@@ -230,26 +199,17 @@ distclean-depend:
 	-rm -rf ./$(DEPDIR)
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 sysconfDATA_INSTALL = $(INSTALL_DATA)
 install-sysconfDATA: $(sysconf_DATA)
@@ -273,9 +233,6 @@ uninstall-sysconfDATA:
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -301,39 +258,20 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -419,28 +357,19 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
 	uninstall-sysconfDATA
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-depend distclean-generic distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	install-sysconfDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-sysconfDATA
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip install-sysconfDATA \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am uninstall-sysconfDATA
 
 
 rebuild4:
diff --git a/vtysh/vtysh_cmd.c b/vtysh/vtysh_cmd.c
index f71a79a0..4bf2da0f 100644
--- a/vtysh/vtysh_cmd.c
+++ b/vtysh/vtysh_cmd.c
@@ -2,783 +2,389 @@
 #include "command.h"
 #include "vtysh.h"
 
-DEFSH (VTYSH_BGPD, neighbor_version_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "version (4|4-)", 
+DEFSH (VTYSH_OSPFD, neighbor_cmd_vtysh, 
+       "neighbor A.B.C.D", 
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Neighbor's BGP version\n"
-       "Border Gateway Protocol 4\n"
-       "Multiprotocol Extensions for BGP-4(Old Draft)\n")
-
-DEFSH (VTYSH_BGPD, no_set_aspath_prepend_cmd_vtysh, 
-       "no set as-path prepend", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Prepend string for a BGP AS-path attribute\n"
-       "Prepend to the as-path\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ipv6_prefix_list_cmd_vtysh, 
-       "clear ipv6 prefix-list", 
-       "Reset functions\n"
-       "IPv6 information\n"
-       "Build a prefix list\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_soft_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast soft out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Neighbor IP address\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_host_any_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "Any destination host\n")
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_route_flapping_cmd_vtysh, 
+       "show ipv6 ospf6 route flapping", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_description_cmd_vtysh, 
-       "ip prefix-list WORD description .LINE", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n"
-       "Up to 80 characters describing this prefix-list\n")
+DEFSH (VTYSH_OSPFD, refresh_timer_cmd_vtysh, 
+       "refresh timer <10-1800>", 
+       "Adjust refresh parameters\n"
+       "Set refresh timer\n"
+       "Timer value in seconds\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_route_cmd_vtysh, 
-       "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE)", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, show_ip_community_list_arg_cmd_vtysh, 
+       "show ip community-list (<1-199>|WORD)", 
+       "Show running system information\n"
        "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_inter_external_cmd_vtysh, 
-       "distance ospf intra-area <1-255> inter-area <1-255> external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n")
-
-DEFSH (VTYSH_OSPFD, area_default_cost_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) default-cost <0-16777215>", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Set the summary-default cost of a NSSA or stub area\n"
-       "Stub's advertised default summary cost\n")
-
-DEFSH (VTYSH_RIPNGD, default_information_originate_cmd_vtysh, 
-       "default-information originate", 
-       "Default route information\n"
-       "Distribute default route\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_update_source_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "update-source", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Source of routing updates\n"
-       "Interface name\n")
+       "List community-list\n"
+       "Community-list number\n"
+       "Community-list name\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_route_cmd_vtysh, 
-       "show bgp ipv6 X:X::X:X", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_interface_cmd_vtysh, 
+       "show ipv6 ospf6 interface", 
        "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Network in the BGP routing table to display\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Interface infomation\n"
+       )
 
-DEFSH (VTYSH_ZEBRA, no_bandwidth_if_cmd_vtysh, 
-       "no bandwidth", 
+DEFSH (VTYSH_BGPD, no_neighbor_distribute_list_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "distribute-list (<1-199>|<1300-2699>|WORD) (in|out)", 
        "Negate a command or set its defaults\n"
-       "Set bandwidth informational parameter\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_any_cmd_vtysh, 
-       "access-list (<1-99>|<1300-1999>) (deny|permit) any", 
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any source host\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Filter updates to/from this neighbor\n"
+       "IP access-list number\n"
+       "IP access-list number (expanded range)\n"
+       "IP Access-list name\n"
+       "Filter incoming updates\n"
+       "Filter outgoing updates\n")
 
-DEFSH (VTYSH_BGPD, no_match_ipv6_next_hop_cmd_vtysh, 
-       "no match ipv6 next-hop X:X::X:X", 
+DEFSH (VTYSH_RIPD, no_rip_offset_list_ifname_cmd_vtysh, 
+       "no offset-list WORD (in|out) <0-16> IFNAME", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match IPv6 next-hop address of route\n"
-       "IPv6 address of next hop\n")
+       "Modify RIP metric\n"
+       "Access-list name\n"
+       "For incoming updates\n"
+       "For outgoing updates\n"
+       "Metric value\n"
+       "Interface to match\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_external_out_cmd_vtysh, 
-       "clear bgp external out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp * ipv4 (unicast|multicast) soft in", 
        "Reset functions\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_le_cmd_vtysh, 
-       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32>", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_instance_summary_cmd_vtysh, 
-       "show ip bgp view WORD summary", 
-       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Summary of BGP neighbor status\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_metric_routemap_cmd_vtysh, 
-       "redistribute kernel metric <0-16> route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_distance_source_cmd_vtysh, 
-       "no distance <1-255> A.B.C.D/M", 
-       "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n")
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPF6D, no_ospf6_redistribute_cmd_vtysh, 
-       "no redistribute (static|kernel|connected|ripng|bgp)", 
+DEFSH (VTYSH_BGPD, no_neighbor_maximum_prefix_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "maximum-prefix", 
        "Negate a command or set its defaults\n"
-       "Redistribute\n"
-       "Static route\n"
-       "Kernel route\n"
-       "Connected route\n"
-       "RIPng route\n"
-       "BGP route\n"
-      )
-
-DEFSH (VTYSH_RIPNGD, ripng_aggregate_address_cmd_vtysh, 
-       "aggregate-address X:X::X:X/M", 
-       "Set aggregate RIPng route announcement\n"
-       "Aggregate network\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n")
 
-DEFSH (VTYSH_RIPD, send_lifetime_duration_month_day_cmd_vtysh, 
-       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", 
-       "Set send lifetime of the key\n"
+DEFSH (VTYSH_RIPD, accept_lifetime_day_month_day_month_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
+       "Set accept lifetime of the key\n"
        "Time to start\n"
-       "Month of the year to start\n"
        "Day of th month to start\n"
+       "Month of the year to start\n"
        "Year to start\n"
-       "Duration of the key\n"
-       "Duration seconds\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_ge_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_cmd_vtysh, 
-       "clear ip bgp dampening", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear route flap dampening information\n")
-
-DEFSH (VTYSH_RIPNGD, debug_ripng_zebra_cmd_vtysh, 
-       "debug ripng zebra", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng and zebra communication\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_community_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Time to expire\n"
+       "Day of th month to expire\n"
+       "Month of the year to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_cmd_vtysh, 
-       "no redistribute static", 
+DEFSH (VTYSH_BGPD, no_set_community_val_cmd_vtysh, 
+       "no set community .AA:NN", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_community3_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Set values in destination routing protocol\n"
+       "BGP community attribute\n"
+       "Community number in aa:nn format or local-AS|no-advertise|no-export|internet or additive\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged9_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged med next-hop as-path", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community_all_cmd_vtysh, 
-       "show ipv6 bgp community", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_next_hop_prefix_list_val_cmd_vtysh, 
-       "no match ip next-hop prefix-list WORD", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n")
 
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv6_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf6|ripng|static)", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_metric_cmd_vtysh, 
+       "redistribute static metric <0-16>", 
        "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n")
+       "Static routes\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_local_as_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "local-as", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_zebra_sub_cmd_vtysh, 
+       "no debug ospf zebra (interface|redistribute)", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a local-as number\n")
-
-DEFSH (VTYSH_OSPFD, ospf_network_cmd_vtysh, 
-       "ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)", 
-       "OSPF interface commands\n"
-       "Network type\n"
-       "Specify OSPF broadcast multi-access network\n"
-       "Specify OSPF NBMA network\n"
-       "Specify OSPF point-to-multipoint network\n"
-       "Specify OSPF point-to-point network\n")
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Zebra information\n"
+       "Zebra interface\n"
+       "Zebra redistribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_set_metric_cmd_vtysh, 
-       "no set metric", 
+DEFSH (VTYSH_RIPD, no_ip_rip_authentication_string_cmd_vtysh, 
+       "no ip rip authentication string", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Metric value for destination routing protocol\n")
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication string\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_filter_list_cmd_vtysh, 
-       "show ip bgp filter-list WORD", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_soft_cmd_vtysh, 
+       "clear ip bgp view WORD * soft", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
-
-DEFSH (VTYSH_OSPFD, no_area_range_advertise_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "OSPF area range for route advertise (default)\n"
-       "area range prefix\n"
-       "advertise this range\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_seq_ge_cmd_vtysh, 
-       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_timers_cmd_vtysh, 
-       "no timers bgp", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_param1_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
        "Negate a command or set its defaults\n"
-       "Adjust routing timers\n"
-       "BGP timers\n")
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_enforce_first_as_cmd_vtysh, 
-       "no bgp enforce-first-as", 
-       "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Enforce the first AS for EBGP routes\n")
+DEFSH (VTYSH_RIPD, send_lifetime_day_month_month_day_cmd_vtysh, 
+       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Month of the year to expire\n"
+       "Day of th month to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_authentication_mode_cmd_vtysh, 
-       "no ip rip authentication mode", 
+DEFSH (VTYSH_ZEBRA, no_ip_route_distance_cmd_vtysh, 
+       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) <1-255>", 
        "Negate a command or set its defaults\n"
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_cmd_vtysh, 
-       "distance ospf intra-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n")
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n"
+       "Distance value for this route\n")
 
-DEFSH (VTYSH_BGPD, match_ipv6_address_cmd_vtysh, 
-       "match ipv6 address WORD", 
+DEFSH (VTYSH_BGPD, no_match_origin_val_cmd_vtysh, 
+       "no match origin (egp|igp|incomplete)", 
+       "Negate a command or set its defaults\n"
        "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match IPv6 address of route\n"
-       "IPv6 access-list name\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_cmd_vtysh, 
-       "redistribute static", 
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_soft_in_cmd_vtysh, 
-       "clear ip bgp * soft in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "BGP origin code\n"
+       "remote EGP\n"
+       "local IGP\n"
+       "unknown heritage\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_metric_routemap_cmd_vtysh, 
-       "no redistribute ospf6 metric <0-16> route-map WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPF6D, no_router_zebra_cmd_vtysh, 
+       "no router zebra", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Configure routing process\n"
+       "Disable connection to zebra daemon\n")
 
-DEFSH (VTYSH_RIPD, no_router_rip_cmd_vtysh, 
-       "no router rip", 
+DEFSH (VTYSH_BGPD, no_router_bgp_cmd_vtysh, 
+       "no router bgp <1-65535>", 
        "Negate a command or set its defaults\n"
        "Enable a routing process\n"
-       "Routing Information Protocol (RIP)\n")
+       "BGP information\n"
+       "AS number\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_summary_name_cmd_vtysh, 
-       "show ip prefix-list summary WORD", 
+DEFSH (VTYSH_ZEBRA, show_ip_route_cmd_vtysh, 
+       "show ip route", 
        "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Summary of prefix lists\n"
-       "Name of a prefix list\n")
+       "IP routing table\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_cmd_vtysh, 
-       "clear bgp *", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all peers\n")
+DEFSH (VTYSH_OSPFD, no_area_range_cost_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "User specified metric for this range\n"
+       "Advertised metric for this range\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_strict_capability_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "strict-capability-match", 
+DEFSH (VTYSH_BGPD, no_neighbor_default_originate_rmap_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "default-originate route-map WORD", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Strict capability negotiation match\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Originate default route to this neighbor\n"
+       "Route-map to specify criteria to originate default\n"
+       "route-map name\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community2_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_summary_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) summary", 
        "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD, no_set_metric_val_cmd_vtysh, 
-       "no set metric <0-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Metric value for destination routing protocol\n"
-       "Metric value\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_in_cmd_vtysh, 
-       "clear ip bgp * in", 
-       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_out_cmd_vtysh, 
-       "clear ip bgp peer-group WORD out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_OSPFD, no_network_area_cmd_vtysh, 
-       "no network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", 
-       "Negate a command or set its defaults\n"
-       "Enable routing on an IP network\n"
-       "OSPF network prefix\n"
-       "Set the OSPF area ID\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (VTYSH_OSPFD, neighbor_pollinterval_cmd_vtysh, 
-       "neighbor A.B.C.D poll-interval <1-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor IP address\n"
-       "Dead Neighbor Polling interval\n"
+DEFSH (VTYSH_OSPFD, ospf_transmit_delay_cmd_vtysh, 
+       "ospf transmit-delay <1-65535>", 
+       "OSPF interface commands\n"
+       "Link state transmit delay\n"
        "Seconds\n")
 
-DEFSH (VTYSH_BGPD, neighbor_activate_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "activate", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Enable the Address Family for this Neighbor\n")
+DEFSH (VTYSH_RIPNGD, no_ripng_default_metric_cmd_vtysh, 
+       "no default-metric", 
+       "Negate a command or set its defaults\n"
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_route_map_cmd_vtysh, 
-       "show ip bgp flap-statistics route-map WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_summary_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn summary", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (VTYSH_OSPF6D|VTYSH_BGPD, no_match_ipv6_address_prefix_list_cmd_vtysh, 
-       "no match ipv6 address prefix-list WORD", 
+DEFSH (VTYSH_BGPD, no_neighbor_timers_connect_val_cmd_vtysh, 
+       "no neighbor A.B.C.D " "timers connect <0-65535>", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "BGP per neighbor timers\n"
+       "BGP connect timer\n"
+       "Connect timer\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_ipv6_access_list_any_cmd_vtysh, 
-       "no ipv6 access-list WORD (deny|permit) any", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_any_mask_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any A.B.C.D A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
        "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any prefixi to match\n")
-
-DEFSH (VTYSH_ZEBRA, ipv6_nd_reachable_time_cmd_vtysh, 
-       "ipv6 nd reachable-time MILLISECONDS", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Reachable time\n"
-       "Reachable time in milliseconds\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_ge_le_cmd_vtysh, 
-       "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "Any Internet Protocol\n"
+       "Any source host\n"
+       "Destination address\n"
+       "Destination Wildcard bits\n")
 
-DEFSH (VTYSH_BGPD, aggregate_address_mask_cmd_vtysh, 
-       "aggregate-address A.B.C.D A.B.C.D", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_inter_cmd_vtysh, 
+       "distance ospf intra-area <1-255> inter-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_metric_cmd_vtysh, 
-       "redistribute static metric <0-16>", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_routemap_cmd_vtysh, 
+       "redistribute connected route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Static routes\n"
-       "Metric\n"
-       "Metric value\n")
-
-DEFSH (VTYSH_OSPFD, interface_ip_ospf_authentication_cmd_vtysh, 
-       "ip ospf authentication", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n")
-
-DEFSH (VTYSH_OSPFD, area_vlink_authtype_authkey_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(authentication-key|) AUTH_KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n"
-       "Authentication password (key)\n" "The OSPF password (key)")
+       "Connected\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_compatible_rfc1583_cmd_vtysh, 
-       "no compatible rfc1583", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_routemap_cmd_vtysh, 
+       "no redistribute ospf6 route-map WORD", 
        "Negate a command or set its defaults\n"
-       "OSPF compatibility list\n"
-       "compatible with RFC 1583\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_ism_cmd_vtysh, 
-       "debug ospf ism", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n")
-
-DEFSH (VTYSH_RIPD, rip_split_horizon_cmd_vtysh, 
-       "ip split-horizon", 
-       "IP information\n"
-       "Perform split horizon\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community_list_exact_cmd_vtysh, 
-       "show ipv6 mbgp community-list WORD exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_routemap_cmd_vtysh, 
-       "default-information originate always route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
+       "Redistribute information from another routing protocol\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_soft_cmd_vtysh, 
-       "clear bgp ipv6 external soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, rmap_onmatch_goto_cmd_vtysh, 
+       "on-match goto <1-65535>", 
+       "Exit policy on matches\n"
+       "Goto Clause number\n"
+       "Number\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_sequence_number_cmd_vtysh, 
-       "ip prefix-list sequence-number", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_summary_cmd_vtysh, 
+       "show ip bgp summary", 
+       "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Include/exclude sequence numbers in NVGEN\n")
+       "BGP information\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_hello_interval_cmd_vtysh, 
-       "no ip ospf hello-interval", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_authtype_authkey_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) "
+       "(authentication-key|)", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_neighbor_received_routes_cmd_vtysh, 
-       "show bgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n"
+       "Authentication password (key)\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_cost_cmd_vtysh, 
-       "no ip ospf cost", 
+DEFSH (VTYSH_BGPD, no_neighbor_capability_route_refresh_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "capability route-refresh", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise route-refresh capability to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community4_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_view_prefix_cmd_vtysh, 
+       "show ip bgp view WORD A.B.C.D/M", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "BGP view\n"
+       "BGP view name\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_seq_ge_le_cmd_vtysh, 
-       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+DEFSH (VTYSH_BGPD, bgp_deterministic_med_cmd_vtysh, 
+       "bgp deterministic-med", 
+       "BGP specific commands\n"
+       "Pick the best-MED path among paths advertised from the neighboring AS\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_soft_in_cmd_vtysh, 
-       "clear bgp peer-group WORD soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, ospf_default_metric_cmd_vtysh, 
+       "default-metric <0-16777214>", 
+       "Set metric of redistributed routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_as_set_cmd_vtysh, 
-       "no aggregate-address A.B.C.D/M as-set", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_external_inter_cmd_vtysh, 
+       "distance ospf intra-area <1-255> external <1-255> inter-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n")
+
+DEFSH (VTYSH_BGPD, aggregate_address_summary_only_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M summary-only", 
        "Configure BGP aggregate entries\n"
        "Aggregate prefix\n"
-       "Generate AS set path information\n")
+       "Filter more specific routes from updates\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp <1-65535> ipv4 (unicast|multicast) soft out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_soft_out_cmd_vtysh, 
+       "clear ip bgp * vpnv4 unicast soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
+       "Clear all peers\n"
        "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
+       "Address Family Modifier\n"
        "Soft reconfig\n"
        "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_set_local_pref_cmd_vtysh, 
-       "no set local-preference", 
+DEFSH (VTYSH_BGPD, no_set_origin_val_cmd_vtysh, 
+       "no set origin (egp|igp|incomplete)", 
        "Negate a command or set its defaults\n"
        "Set values in destination routing protocol\n"
-       "BGP local preference path attribute\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n"
-       "Push out the existing ORF prefix-list\n")
-
-DEFSH (VTYSH_BGPD, old_no_ipv6_bgp_network_cmd_vtysh, 
-       "no ipv6 bgp network X:X::X:X/M", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
-
-DEFSH (VTYSH_ZEBRA, ipv6_nd_send_ra_cmd_vtysh, 
-       "ipv6 nd send-ra", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Send Router Advertisement\n")
-
-DEFSH (VTYSH_BGPD, debug_bgp_normal_cmd_vtysh, 
-       "debug bgp", 
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_metric_routemap_cmd_vtysh, 
-       "no redistribute static metric <0-16> route-map WORD", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_ZEBRA, no_bandwidth_if_val_cmd_vtysh, 
-       "no bandwidth <1-10000000>", 
-       "Negate a command or set its defaults\n"
-       "Set bandwidth informational parameter\n"
-       "Bandwidth in kilobits\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_adv_router_dump_cmd_vtysh, 
-       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*) (A.B.C.D|*) (A.B.C.D|*) (dump|summary|)", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "LSA Database\n"
-       "Router-LSA\n"
-       "Network-LSA\n"
-       "AS-External-LSA\n"
-       "Intra-Area-Prefix-LSA\n"
-       "Inter-Area-Router-LSA\n"
-       "Inter-Area-Prefix-LSA\n"
-       "Link-LSA\n"
-       "All LS Type\n"
-       "Link State ID\n"
-       "All Link State ID\n"
-       "Advertising Router\n"
-       "All Advertising Router\n"
-       "Dump raw LSA data in Hex\n"
-       "show summary of LSA\n"
-       )
+       "BGP origin code\n"
+       "remote EGP\n"
+       "local IGP\n"
+       "unknown heritage\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_router_id_val_cmd_vtysh, 
-       "no bgp router-id A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Override configured router identifier\n"
-       "Manually configured router identifier\n")
+DEFSH (VTYSH_BGPD, bgp_damp_set3_cmd_vtysh, 
+       "bgp dampening", 
+       "BGP Specific commands\n"
+       "Enable route-flap dampening\n")
 
 DEFSH (VTYSH_RIPD, no_rip_offset_list_cmd_vtysh, 
        "no offset-list WORD (in|out) <0-16>", 
@@ -789,224 +395,201 @@ DEFSH (VTYSH_RIPD, no_rip_offset_list_cmd_vtysh,
        "For outgoing updates\n"
        "Metric value\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_detail_all_cmd_vtysh, 
-       "show ip ospf neighbor detail all", 
+DEFSH (VTYSH_OSPF6D, show_debug_ospf6_damp_cmd_vtysh, 
+       "show debugging ospf6 damp", 
        "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "Neighbor list\n"
-       "detail of all neighbors\n"
-       "include down status neighbor\n")
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Flap-dampening information\n"
+      )
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_prefix_cmd_vtysh, 
-       "show bgp ipv6 X:X::X:X/M", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n")
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_routemap_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "OSPF exterior metric type for redistributed routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_dump_bgp_routes_cmd_vtysh, 
-       "no dump bgp routes-mrt [PATH] [INTERVAL]", 
+DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_name_all_cmd_vtysh, 
+       "no ip extcommunity-list (standard|expanded) WORD", 
        "Negate a command or set its defaults\n"
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump whole BGP routing table\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_external_cmd_vtysh, 
-       "distance ospf inter-area <1-255> external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n")
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Specify standard extcommunity-list\n"
+       "Specify expanded extcommunity-list\n"
+       "Extended Community list name\n")
 
-DEFSH (VTYSH_OSPFD, debug_ospf_event_cmd_vtysh, 
-       "debug ospf event", 
+DEFSH (VTYSH_RIPNGD, debug_ripng_zebra_cmd_vtysh, 
+       "debug ripng zebra", 
        "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF event information\n")
-
-DEFSH (VTYSH_OSPFD, no_ospf_retransmit_interval_cmd_vtysh, 
-       "no ospf retransmit-interval", 
-       "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n")
+       "RIPng configuration\n"
+       "Debug option set for ripng and zebra communication\n")
 
-DEFSH (VTYSH_BGPD, set_community_none_cmd_vtysh, 
-       "set community none", 
+DEFSH (VTYSH_BGPD, set_vpnv4_nexthop_cmd_vtysh, 
+       "set vpnv4 next-hop A.B.C.D", 
        "Set values in destination routing protocol\n"
-       "BGP community attribute\n"
-       "No community attribute\n")
+       "VPNv4 information\n"
+       "VPNv4 next-hop address\n"
+       "IP address of next hop\n")
 
-DEFSH (VTYSH_BGPD, debug_bgp_filter_cmd_vtysh, 
-       "debug bgp filters", 
+DEFSH (VTYSH_BGPD, no_neighbor_remote_as_cmd_vtysh, 
+       "no neighbor A.B.C.D " "remote-as <1-65535>", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Specify a BGP neighbor\n"
+       "AS number\n")
+
+DEFSH (VTYSH_OSPFD, debug_ospf_zebra_cmd_vtysh, 
+       "debug ospf zebra", 
        "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP filters\n")
+       "OSPF information\n"
+       "OSPF Zebra information\n")
 
-DEFSH (VTYSH_OSPF6D, ospf6_routemap_set_forwarding_cmd_vtysh, 
-       "set forwarding-address X:X::X:X", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_prefix_first_match_cmd_vtysh, 
+       "show ip prefix-list WORD A.B.C.D/M first-match", 
+       "Show running system information\n"
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "First matched prefix\n")
+
+DEFSH (VTYSH_OSPF6D, ospf6_routemap_no_set_forwarding_cmd_vtysh, 
+       "no set forwarding-address X:X::X:X", 
+       "Negate a command or set its defaults\n"
        "Set value\n"
        "Forwarding Address\n"
        "IPv6 Address\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_bestpath_compare_router_id_cmd_vtysh, 
-       "no bgp bestpath compare-routerid", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "Compare router-id for identical EBGP paths\n")
-
-DEFSH (VTYSH_RIPD, no_match_ip_address_val_cmd_vtysh, 
-       "no match ip address WORD", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbors_cmd_vtysh, 
+       "show ip bgp vpnv4 all neighbors", 
+       "Show running system information\n"
        "IP information\n"
-       "Match address of route\n"
-       "IP access-list name\n")
-
-DEFSH (VTYSH_ZEBRA, bandwidth_if_cmd_vtysh, 
-       "bandwidth <1-10000000>", 
-       "Set bandwidth informational parameter\n"
-       "Bandwidth in kilobits\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_metric_cmd_vtysh, 
-       "default-metric <0-16777214>", 
-       "Set metric of redistributed routes\n"
-       "Default metric\n")
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "Detailed information on TCP and BGP neighbor connections\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_allowas_in_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "allowas-in", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_send_community_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "send-community", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "allow local ASN appears in aspath attribute\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Send Community attribute to this neighbor\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_default_metric_cmd_vtysh, 
-       "no default-metric", 
-       "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
+DEFSH (VTYSH_BGPD, dump_bgp_updates_cmd_vtysh, 
+       "dump bgp updates PATH", 
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump BGP updates only\n"
+       "Output filename\n")
 
-DEFSH (VTYSH_OSPF6D, reload_cmd_vtysh, 
-       "reload", 
-       "Reloads\n")
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp A.B.C.D in prefix-filter", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP neighbor address to clear\n"
+       "Soft reconfig inbound update\n"
+       "Push out the existing ORF prefix-list\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_spf_tree_cmd_vtysh, 
-       "show ipv6 ospf6 area A.B.C.D spf tree", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_community_list_exact_cmd_vtysh, 
+       "show ip bgp community-list WORD exact-match", 
        "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Area information\n"
-       "Area ID (as an IPv4 notation)\n"
-       "Shortest Path First caculation\n"
-       "Displays spf tree\n")
+       "IP information\n"
+       "BGP information\n"
+       "Display routes matching the community-list\n"
+       "community-list name\n"
+       "Exact match of the communities\n")
 
-DEFSH (VTYSH_BGPD, bgp_damp_unset2_cmd_vtysh, 
-       "no bgp dampening <1-45> <1-20000> <1-20000> <1-255>", 
-       "Negate a command or set its defaults\n"
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n"
-       "Half-life time for the penalty\n"
-       "Value to start reusing a route\n"
-       "Value to start suppressing a route\n"
-       "Maximum duration to suppress a stable route\n")
+DEFSH (VTYSH_RIPD, accept_lifetime_infinite_day_month_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Never expires")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_authentication_key_addr_cmd_vtysh, 
-       "ip ospf authentication-key AUTH_KEY A.B.C.D", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_message_digest_key_cmd_vtysh, 
+       "no ip ospf message-digest-key <1-255>", 
+       "Negate a command or set its defaults\n"
        "IP Information\n"
        "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "The OSPF password (key)\n"
-       "Address of interface")
-
-DEFSH (VTYSH_RIPD, ip_rip_send_version_2_cmd_vtysh, 
-       "ip rip send version 2 1", 
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n"
-       "RIP version 2\n"
-       "RIP version 1\n")
+       "Message digest authentication password (key)\n"
+       "Key ID\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_route_ifname_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n")
+DEFSH (VTYSH_ZEBRA, debug_zebra_packet_cmd_vtysh, 
+       "debug zebra packet", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra packet\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community_all_cmd_vtysh, 
-       "show bgp community", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n")
+DEFSH (VTYSH_BGPD, no_bgp_bestpath_med2_cmd_vtysh, 
+       "no bgp bestpath med confed missing-as-worst", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "MED attribute\n"
+       "Compare MED among confederation paths\n"
+       "Treat missing MED as the least preferred one\n")
 
-DEFSH (VTYSH_BGPD, neighbor_port_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "port <0-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Neighbor's BGP port\n"
-       "TCP port number\n")
+DEFSH (VTYSH_RIPD, no_rip_distance_cmd_vtysh, 
+       "no distance <1-255>", 
+       "Negate a command or set its defaults\n"
+       "Administrative distance\n"
+       "Distance value\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_prefix_cmd_vtysh, 
-       "clear ip bgp dampening A.B.C.D/M", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (VTYSH_BGPD, no_bgp_multiple_instance_cmd_vtysh, 
+       "no bgp multiple-instance", 
+       "Negate a command or set its defaults\n"
        "BGP information\n"
-       "Clear route flap dampening information\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "BGP multiple instance\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 * soft out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp <1-65535> ipv4 (unicast|multicast) soft", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, show_ip_community_list_cmd_vtysh, 
-       "show ip community-list", 
-       "Show running system information\n"
-       "IP information\n"
-       "List community-list\n")
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_mask_host_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D host A.B.C.D", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_metric_val_cmd_vtysh, 
+       "no redistribute kernel metric <0-16>", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Source address\n"
-       "Source wildcard bits\n"
-       "A single destination host\n"
-       "Destination address\n")
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_nd_ra_lifetime_cmd_vtysh, 
-       "ipv6 nd ra-lifetime SECONDS", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Router lifetime\n"
-       "Router lifetime in seconds\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_route_map_all_cmd_vtysh, 
+       "no route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Create route-map or enter route-map command mode\n"
+       "Route map tag\n")
 
-DEFSH (VTYSH_BGPD, set_ecommunity_soo_cmd_vtysh, 
-       "set extcommunity soo .ASN:nn_or_IP-address:nn", 
-       "Set values in destination routing protocol\n"
-       "BGP extended community attribute\n"
-       "Site-of-Origin extended community\n"
-       "VPN extended community\n")
+DEFSH (VTYSH_BGPD, bgp_distance_source_access_list_cmd_vtysh, 
+       "distance <1-255> A.B.C.D/M WORD", 
+       "Define an administrative distance\n"
+       "Administrative distance\n"
+       "IP source prefix\n"
+       "Access list name\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community4_exact_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_community3_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -1019,499 +602,395 @@ DEFSH (VTYSH_BGPD, show_bgp_ipv6_community4_exact_cmd_vtysh,
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_BGPD, no_set_originator_id_cmd_vtysh, 
-       "no set originator-id", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_sequence_number_cmd_vtysh, 
+       "no ip prefix-list sequence-number", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP originator ID attribute\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_prefix_cmd_vtysh, 
-       "show ip prefix-list WORD A.B.C.D/M", 
-       "Show running system information\n"
        "IP information\n"
        "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (VTYSH_RIPD, send_lifetime_infinite_day_month_cmd_vtysh, 
-       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Never expires")
-
-DEFSH (VTYSH_BGPD, no_neighbor_description_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "description .LINE", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Neighbor specific description\n"
-       "Up to 80 characters describing this neighbor\n")
-
-DEFSH (VTYSH_ZEBRA, ipv6_nd_suppress_ra_cmd_vtysh, 
-       "ipv6 nd suppress-ra", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Suppress Router Advertisement\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_default_originate_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "default-originate", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Originate default route to this neighbor\n")
-
-DEFSH (VTYSH_RIPD, no_rip_passive_interface_cmd_vtysh, 
-       "no passive-interface IFNAME", 
-       "Negate a command or set its defaults\n"
-       "Suppress routing updates on an interface\n"
-       "Interface name\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_remark_arg_cmd_vtysh, 
-       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP extended access list\n"
-       "IP standard access list (expanded range)\n"
-       "IP extended access list (expanded range)\n"
-       "IP zebra access-list\n"
-       "Access list entry comment\n"
-       "Comment up to 100 characters\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_as_set_cmd_vtysh, 
-       "aggregate-address A.B.C.D/M as-set", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Generate AS set path information\n")
-
-DEFSH (VTYSH_OSPF6D, interface_area_cmd_vtysh, 
-       "interface IFNAME area A.B.C.D", 
-       "Enable routing on an IPv6 interface\n"
-       "Interface name(e.g. ep0)\n"
-       "Set the OSPF6 area ID\n"
-       "OSPF6 area ID in IPv4 address notation\n"
-      )
-
-DEFSH (VTYSH_BGPD, no_neighbor_send_community_type_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "send-community (both|extended|standard)", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Send Community attribute to this neighbor\n"
-       "Send Standard and Extended Community attributes\n"
-       "Send Extended Community attributes\n"
-       "Send Standard Community attributes\n")
+       "Include/exclude sequence numbers in NVGEN\n")
 
-DEFSH (VTYSH_OSPFD, ospf_hello_interval_cmd_vtysh, 
-       "ospf hello-interval <1-65535>", 
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Seconds\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_type_routemap_cmd_vtysh, 
+       "default-information originate metric <0-16777214> metric-type (1|2) route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_all_cmd_vtysh, 
-       "show ip ospf neighbor all", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_cmd_vtysh, 
+       "show ip ospf database", 
        "Show running system information\n"
        "IP information\n"
        "OSPF information\n"
-       "Neighbor list\n"
-       "include down status neighbor\n")
-
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_cost_cmd_vtysh, 
-       "ipv6 ospf6 cost COST", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Interface cost\n"
-       "<1-65535> Cost\n"
-       )
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_out_cmd_vtysh, 
-       "clear ip bgp external out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD, match_interface_cmd_vtysh, 
-       "match interface WORD", 
-       "Match values from routing table\n"
-       "Match first hop interface of route\n"
-       "Interface name\n")
-
-DEFSH (VTYSH_ZEBRA, debug_zebra_kernel_cmd_vtysh, 
-       "debug zebra kernel", 
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra between kernel interface\n")
-
-DEFSH (VTYSH_BGPD, no_aggregate_address_cmd_vtysh, 
-       "no aggregate-address A.B.C.D/M", 
-       "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
+       "Database summary\n")
 
-DEFSH (VTYSH_ZEBRA, show_ipv6_forwarding_cmd_vtysh, 
-       "show ipv6 forwarding", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "Forwarding status\n")
-
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_prefix_advertisement_cmd_vtysh, 
-       "no ipv6 nd prefix-advertisement IPV6PREFIX", 
-       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n")
-
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_instance_cmd_vtysh, 
-       "ipv6 ospf6 instance-id INSTANCE", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Instance ID\n"
-       "<0-255> Instance ID\n"
-       )
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display information received from a BGP neighbor\n"
+       "Display the prefixlist filter\n")
 
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_rmap_metric_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf|rip|static) route-map WORD metric <0-4294967295>", 
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_routemap_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Connected\n"
        "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
+       "Connected\n"
        "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n"
        "Metric for redistributed routes\n"
-       "Default metric\n")
-
-DEFSH (VTYSH_BGPD, no_aggregate_address_as_set_summary_cmd_vtysh, 
-       "no aggregate-address A.B.C.D/M as-set summary-only", 
-       "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
+       "OSPF default metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_capability_dynamic_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "capability dynamic", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_maximum_prefix_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "maximum-prefix <1-4294967295>", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise dynamic capability to this neighbor\n")
-
-DEFSH (VTYSH_OSPFD, ospf_retransmit_interval_cmd_vtysh, 
-       "ospf retransmit-interval <3-65535>", 
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "Seconds\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n"
+       "maximum no. of prefix limit\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp view WORD * ipv4 (unicast|multicast) soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
        "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Soft reconfig\n"
        "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, bgp_confederation_identifier_cmd_vtysh, 
-       "bgp confederation identifier <1-65535>", 
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "AS number\n"
-       "Set routing domain confederation AS\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_soft_cmd_vtysh, 
-       "clear ip bgp <1-65535> vpnv4 unicast soft", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_all_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
        "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the communities\n")
+
+DEFSH (VTYSH_OSPFD, area_vlink_param2_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_in_prefix_filter_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD in prefix-filter", 
+DEFSH (VTYSH_OSPFD, ip_ospf_cost_cmd_vtysh, 
+       "ip ospf cost <1-65535>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interface cost\n"
+       "Cost")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_host_any_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "Any destination host\n")
+
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_cmd_vtysh, 
+       "redistribute connected", 
+       "Redistribute information from another routing protocol\n"
+       "Connected\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_out_cmd_vtysh, 
+       "clear ip bgp * ipv4 (unicast|multicast) out", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear all peers\n"
        "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged4_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med (as-path|next-hop)", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_metric_cmd_vtysh, 
+       "no redistribute static metric", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n")
+       "Redistribute information from another routing protocol\n"
+       "Static routes\n"
+       "Metric\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_nsm_cmd_vtysh, 
-       "no debug ospf nsm", 
+DEFSH (VTYSH_BGPD, no_bgp_distance_source_access_list_cmd_vtysh, 
+       "no distance <1-255> A.B.C.D/M WORD", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Neighbor State Machine")
+       "Define an administrative distance\n"
+       "Administrative distance\n"
+       "IP source prefix\n"
+       "Access list name\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp view WORD * ipv4 (unicast|multicast) soft out", 
+DEFSH (VTYSH_BGPD, neighbor_update_source_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "update-source WORD", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Source of routing updates\n"
+       "Interface name\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
+       "BGP neighbor address to clear\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Soft reconfig\n"
        "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_ZEBRA, ip_route_mask_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE)", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_soft_cmd_vtysh, 
+       "clear ip bgp * vpnv4 unicast soft", 
+       "Reset functions\n"
        "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n")
+       "BGP information\n"
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_match_ipv6_address_cmd_vtysh, 
-       "no match ipv6 address WORD", 
+DEFSH (VTYSH_OSPF6D, no_ipv6_ospf6_advertise_force_prefix_cmd_vtysh, 
+       "no ipv6 ospf6 advertise force-prefix", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match IPv6 address of route\n"
-       "IPv6 access-list name\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Advertising options\n"
+       "Force to advertise prefix,  applicable if Loopback or P-to-P\n"
+       )
 
-DEFSH (VTYSH_BGPD, bgp_damp_set_cmd_vtysh, 
-       "bgp dampening <1-45> <1-20000> <1-20000> <1-255>", 
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n"
-       "Half-life time for the penalty\n"
-       "Value to start reusing a route\n"
-       "Value to start suppressing a route\n"
-       "Maximum duration to suppress a stable route\n")
+DEFSH (VTYSH_BGPD, no_neighbor_ebgp_multihop_ttl_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "ebgp-multihop <1-255>", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Allow EBGP neighbors not on directly connected networks\n"
+       "maximum hop count\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_timers_arg_cmd_vtysh, 
-       "no timers bgp <0-65535> <0-65535>", 
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_routemap_cmd_vtysh, 
+       "default-information originate route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_interface_cmd_vtysh, 
+       "no neighbor A.B.C.D " "interface WORD", 
        "Negate a command or set its defaults\n"
-       "Adjust routing timers\n"
-       "BGP timers\n"
-       "Keepalive interval\n"
-       "Holdtime\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Interface\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_RIPD, send_lifetime_month_day_month_day_cmd_vtysh, 
-       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Month of the year to expire\n"
-       "Day of th month to expire\n"
-       "Year to expire\n")
+DEFSH (VTYSH_RIPD, no_rip_distance_source_access_list_cmd_vtysh, 
+       "no distance <1-255> A.B.C.D/M WORD", 
+       "Negate a command or set its defaults\n"
+       "Administrative distance\n"
+       "Distance value\n"
+       "IP source prefix\n"
+       "Access list name\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community4_exact_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_cidr_only_cmd_vtysh, 
+       "show ip bgp flap-statistics cidr-only", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Display flap statistics of routes\n"
+       "Display only routes with non-natural netmasks\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_neighborlist_cmd_vtysh, 
-       "show ipv6 ospf6 (summary-list|request-list|retrans-list|dbdesc-list)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_summary_cmd_vtysh, 
+       "show ip bgp vpnv4 all summary", 
        "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Link State summary list\n"
-       "Link State request list\n"
-       "Link State retransmission list\n"
-       "Link State Description list (Used to retrans DbDesc)\n"
-       )
+       "IP information\n"
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_maximum_prefix_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "maximum-prefix <1-4294967295>", 
+DEFSH (VTYSH_BGPD, no_neighbor_shutdown_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "shutdown", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Administratively shut down this neighbor\n")
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_external_inter_cmd_vtysh, 
-       "distance ospf intra-area <1-255> external <1-255> inter-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n")
+DEFSH (VTYSH_RIPD, rip_split_horizon_cmd_vtysh, 
+       "ip split-horizon", 
+       "IP information\n"
+       "Perform split horizon\n")
 
-DEFSH (VTYSH_BGPD, no_set_atomic_aggregate_cmd_vtysh, 
-       "no set atomic-aggregate", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, set_community_none_cmd_vtysh, 
+       "set community none", 
        "Set values in destination routing protocol\n"
-       "BGP atomic aggregate attribute\n" )
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_cmd_vtysh, 
-       "clear bgp ipv6 external", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n")
+       "BGP community attribute\n"
+       "No community attribute\n")
 
-DEFSH (VTYSH_OSPFD, network_area_cmd_vtysh, 
-       "network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", 
-       "Enable routing on an IP network\n"
-       "OSPF network prefix\n"
-       "Set the OSPF area ID\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n")
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged6_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged as-path med next-hop", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Med attribute\n"
+       "Nexthop attribute\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_authtype_cmd_vtysh, 
+DEFSH (VTYSH_OSPFD, area_vlink_authtype_args_md5_cmd_vtysh, 
        "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|)", 
+       "(authentication|) (message-digest|null) "
+       "(message-digest-key|) <1-255> md5 KEY", 
        "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n")
-
-DEFSH (VTYSH_BGPD, bgp_bestpath_aspath_ignore_cmd_vtysh, 
-       "bgp bestpath as-path ignore", 
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "AS-path attribute\n"
-       "Ignore as-path length in selecting a route\n")
+       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n"
+       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_address_cmd_vtysh, 
-       "clear ip bgp dampening A.B.C.D", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD, ip_rip_receive_version_cmd_vtysh, 
+       "ip rip receive version (1|2)", 
        "IP information\n"
-       "BGP information\n"
-       "Clear route flap dampening information\n"
-       "Network to clear damping information\n")
+       "Routing Information Protocol\n"
+       "Advertisement reception\n"
+       "Version control\n"
+       "RIP version 1\n"
+       "RIP version 2\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_metric_cmd_vtysh, 
-       "redistribute kernel metric <0-16>", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_metric_routemap_cmd_vtysh, 
+       "redistribute kernel metric <0-16> route-map WORD", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Metric\n"
-       "Metric value\n")
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_any_any_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any any", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_as_set_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M as-set", 
+       "Negate a command or set its defaults\n"
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Generate AS set path information\n")
+
+DEFSH (VTYSH_OSPFD, show_debugging_ospf_cmd_vtysh, 
+       "show debugging ospf", 
+       "Show running system information\n"
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_all_cmd_vtysh, 
+       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD)", 
        "Negate a command or set its defaults\n"
        "Add an access list entry\n"
+       "IP standard access list\n"
        "IP extended access list\n"
+       "IP standard access list (expanded range)\n"
        "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Any source host\n"
-       "Any destination host\n")
-
-DEFSH (VTYSH_BGPD, bgp_bestpath_med_cmd_vtysh, 
-       "bgp bestpath med (confed|missing-as-worst)", 
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Compare MED among confederation paths\n"
-       "Treat missing MED as the least preferred one\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_all_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n")
+       "IP zebra access-list name\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp peer-group WORD in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (VTYSH_BGPD, bgp_config_type_cmd_vtysh, 
+       "bgp config-type (cisco|zebra)", 
        "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Configuration type\n"
+       "cisco\n"
+       "zebra\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_cmd_vtysh, 
-       "show ipv6 mbgp", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_int_detail_cmd_vtysh, 
+       "show ip ospf neighbor A.B.C.D detail", 
        "Show running system information\n"
        "IP information\n"
-       "MBGP information\n")
+       "OSPF information\n"
+       "Neighbor list\n"
+       "Interface address\n"
+       "detail of all neighbors")
 
-DEFSH (VTYSH_BGPD, no_neighbor_unsuppress_map_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "unsuppress-map WORD", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged10_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged med as-path next-hop", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Route-map to selectively unsuppress suppressed routes\n"
-       "Name of route map\n")
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_routemap_cmd_vtysh, 
-       "no redistribute ospf6 route-map WORD", 
+DEFSH (VTYSH_BGPD, no_bgp_network_backdoor_cmd_vtysh, 
+       "no network A.B.C.D/M backdoor", 
        "Negate a command or set its defaults\n"
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Specify a BGP backdoor route\n")
+
+DEFSH (VTYSH_RIPNGD, no_debug_ripng_events_cmd_vtysh, 
+       "no debug ripng events", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng events\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_in_cmd_vtysh, 
+       "clear ip bgp <1-65535> ipv4 (unicast|multicast) in", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear peers with the AS number\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n")
+
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_routemap_cmd_vtysh, 
+       "redistribute bgp route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n"
+       "Border Gateway Protocol (BGP)\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_OSPFD, no_area_default_cost_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) default-cost <0-16777215>", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Set the summary-default cost of a NSSA or stub area\n"
-       "Stub's advertised default summary cost\n")
+DEFSH (VTYSH_BGPD, aggregate_address_mask_summary_only_cmd_vtysh, 
+       "aggregate-address A.B.C.D A.B.C.D summary-only", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Filter more specific routes from updates\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_summary_cmd_vtysh, 
-       "show ip prefix-list summary", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_community_all_cmd_vtysh, 
+       "show ip bgp community", 
        "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Summary of prefix lists\n")
+       "BGP information\n"
+       "Display routes matching the communities\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_cmd_vtysh, 
-       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*) (A.B.C.D|*|dump|summary)", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged8_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged next-hop as-path med", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n"
+       "Med attribute\n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_cmd_vtysh, 
+       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*|HEX|dump|detail)", 
        "Show running system information\n"
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
@@ -1524,152 +1003,102 @@ DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_cmd_vtysh,
        "Inter-Area-Prefix-LSA\n"
        "Link-LSA\n"
        "All LS Type\n"
-       "Link State ID\n"
-       "All Link State ID\n"
+       "Specify LS Type by Hex\n"
        "Dump raw LSA data in Hex\n"
-       "show summary of LSA\n"
+       "show detail of LSAs\n"
        )
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_summary_name_cmd_vtysh, 
-       "show ipv6 prefix-list summary WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Summary of prefix lists\n"
-       "Name of a prefix list\n")
-
-DEFSH (VTYSH_BGPD, set_aggregator_as_cmd_vtysh, 
-       "set aggregator as <1-65535> A.B.C.D", 
-       "Set values in destination routing protocol\n"
-       "BGP aggregator attribute\n"
-       "AS number of aggregator\n"
-       "AS number\n"
-       "IP address of aggregator\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, match_ip_address_prefix_list_cmd_vtysh, 
-       "match ip address prefix-list WORD", 
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
+DEFSH (VTYSH_RIPNGD, ripng_default_metric_cmd_vtysh, 
+       "default-metric <1-16>", 
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_network_mask_backdoor_cmd_vtysh, 
-       "no network A.B.C.D mask A.B.C.D backdoor", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Specify a BGP backdoor route\n")
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n")
 
-DEFSH (VTYSH_BGPD, no_match_origin_val_cmd_vtysh, 
-       "no match origin (egp|igp|incomplete)", 
+DEFSH (VTYSH_BGPD, no_neighbor_allowas_in_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "allowas-in", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "BGP origin code\n"
-       "remote EGP\n"
-       "local IGP\n"
-       "unknown heritage\n")
-
-DEFSH (VTYSH_RIPD, rip_network_cmd_vtysh, 
-       "network (A.B.C.D/M|WORD)", 
-       "Enable routing on an IP network\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Interface name\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_cost_cmd_vtysh, 
-       "ip ospf cost <1-65535>", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "allow local ASN appears in aspath attribute\n")
 
-DEFSH (VTYSH_BGPD, ipv6_aggregate_address_cmd_vtysh, 
-       "aggregate-address X:X::X:X/M", 
+DEFSH (VTYSH_BGPD, aggregate_address_mask_as_set_cmd_vtysh, 
+       "aggregate-address A.B.C.D A.B.C.D as-set", 
        "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Generate AS set path information\n")
+
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_metric_cmd_vtysh, 
+       "no redistribute bgp metric", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Metric\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_cmd_vtysh, 
-       "clear bgp <1-65535>", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_soft_in_cmd_vtysh, 
+       "clear ip bgp * vpnv4 unicast soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_intra_inter_cmd_vtysh, 
-       "distance ospf external <1-255> intra-area <1-255> inter-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "External routes\n"
-       "Distance for external routes\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n")
-
-DEFSH (VTYSH_OSPFD, ospf_cost_cmd_vtysh, 
-       "ospf cost <1-65535>", 
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost")
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_seq_cmd_vtysh, 
-       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) (X:X::X:X/M|any)", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_cmd_vtysh, 
+       "no redistribute kernel", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Any prefix match.  Same as \"::0/0 le 128\"\n")
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_metric_routemap_cmd_vtysh, 
-       "default-information originate metric-type (1|2) metric <0-16777214> route-map WORD", 
+DEFSH (VTYSH_RIPD, rip_redistribute_type_routemap_cmd_vtysh, 
+       "redistribute (kernel|connected|static|ospf|bgp) route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Open Shortest Path First (OSPF)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_type_cmd_vtysh, 
+       "default-information originate always metric <0-16777214> metric-type (1|2)", 
        "Control distribution of default information\n"
        "Distribute a default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
+       "Always advertise default route\n"
        "OSPF default metric\n"
        "OSPF metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_OSPFD, area_range_subst_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "configure OSPF area range for route summarization\n"
-       "area range prefix\n"
-       "announce area range as another prefix\n"
-       "network prefix to be announced instead of range\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_prefix_cmd_vtysh, 
-       "show ipv6 mbgp X:X::X:X/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "MBGP information\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_other_config_flag_cmd_vtysh, 
-       "no ipv6 nd other-config-flag", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_cmd_vtysh, 
+       "ip prefix-list WORD seq <1-4294967295> (deny|permit) (A.B.C.D/M|any)", 
        "IP information\n"
-       "Neighbor discovery\n"
-       "Other statefull configuration flag\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n")
 
-DEFSH (VTYSH_RIPD, no_key_cmd_vtysh, 
-       "no key <0-2147483647>", 
+DEFSH (VTYSH_OSPFD, no_ospf_network_cmd_vtysh, 
+       "no ospf network", 
        "Negate a command or set its defaults\n"
-       "Delete a key\n"
-       "Key identifier number\n")
+       "OSPF interface commands\n"
+       "Network type\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_ge_cmd_vtysh, 
-       "no ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_prefix_cmd_vtysh, 
+       "no ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", 
        "Negate a command or set its defaults\n"
        "IP information\n"
        "Build a prefix list\n"
@@ -1677,407 +1106,267 @@ DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_ge_cmd_vtysh,
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
-
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged4_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med (as-path|next-hop)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n")
-
-DEFSH (VTYSH_RIPNGD, no_debug_ripng_zebra_cmd_vtysh, 
-       "no debug ripng zebra", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng and zebra communication\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_weight_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "weight <0-65535>", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Set default weight for routes from this neighbor\n"
-       "default weight\n")
-
-DEFSH (VTYSH_RIPD, no_rip_default_information_originate_cmd_vtysh, 
-       "no default-information originate", 
-       "Negate a command or set its defaults\n"
-       "Control distribution of default route\n"
-       "Distribute a default route\n")
+       "Any prefix match.  Same as \"0.0.0.0/0 le 32\"\n")
 
-DEFSH (VTYSH_BGPD, match_community_exact_cmd_vtysh, 
-       "match community (<1-99>|<100-199>|WORD) exact-match", 
-       "Match values from routing table\n"
-       "Match BGP community list\n"
+DEFSH (VTYSH_BGPD, set_community_delete_cmd_vtysh, 
+       "set comm-list (<1-99>|<100-199>|WORD) delete", 
+       "Set values in destination routing protocol\n"
+       "set BGP community list (for deletion)\n"
        "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
+       "Communitly-list number (expanded)\n"
        "Community-list name\n"
-       "Do exact matching of communities\n")
+       "Delete matching communities\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_in_cmd_vtysh, 
-       "clear bgp <1-65535> in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_soft_out_cmd_vtysh, 
+       "clear ip bgp external soft out", 
        "Reset functions\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_any_host_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Any source host\n"
-       "A single destination host\n"
-       "Destination address\n")
-
-DEFSH (VTYSH_BGPD, ipv6_bgp_network_cmd_vtysh, 
-       "network X:X::X:X/M", 
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>\n")
-
-DEFSH (VTYSH_ZEBRA, ip_irdp_preference_cmd_vtysh, 
-
-       "ip irdp preference <0-2147483647>", 
        "IP information\n"
-       "ICMP Router discovery on this interface\n"
-       "Set default preference level for this interface\n"
-       "Preference level\n")
-
-DEFSH (VTYSH_BGPD, bgp_fast_external_failover_cmd_vtysh, 
-       "bgp fast-external-failover", 
        "BGP information\n"
-       "Immediately reset session if a link to a directly connected external peer goes down\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_prefix_list_cmd_vtysh, 
-       "show ipv6 mbgp prefix-list WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the prefix-list\n"
-       "IPv6 prefix-list name\n")
-
-DEFSH (VTYSH_BGPD, bgp_network_mask_cmd_vtysh, 
-       "network A.B.C.D mask A.B.C.D", 
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n")
-
-DEFSH (VTYSH_OSPFD, area_vlink_authtype_md5_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(message-digest-key|) <1-255> md5 KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
+       "Clear all external peers\n"
+       "Soft reconfig\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_cmd_vtysh, 
-       "show bgp", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_neighbor_cmd_vtysh, 
+       "show ipv6 ospf6 neighbor", 
        "Show running system information\n"
-       "BGP information\n")
-
-DEFSH (VTYSH_BGPD, bgp_network_mask_backdoor_cmd_vtysh, 
-       "network A.B.C.D mask A.B.C.D backdoor", 
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Specify a BGP backdoor route\n")
-
-DEFSH (VTYSH_RIPD, ip_rip_authentication_string_cmd_vtysh, 
-       "ip rip authentication string LINE", 
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication string\n"
-       "Authentication string\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Neighbor list\n"
+       )
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_interface_cmd_vtysh, 
-       "show ipv6 ospf6 interface", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_adv_router_cmd_vtysh, 
+       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*|HEX) (A.B.C.D|*) (A.B.C.D|*|dump|detail)", 
        "Show running system information\n"
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "Interface infomation\n"
+       "LSA Database\n"
+       "Router-LSA\n"
+       "Network-LSA\n"
+       "AS-External-LSA\n"
+       "Intra-Area-Prefix-LSA\n"
+       "Inter-Area-Router-LSA\n"
+       "Inter-Area-Prefix-LSA\n"
+       "Link-LSA\n"
+       "All LS Type\n"
+       "Specify LS Type by Hex\n"
+       "Link State ID\n"
+       "All Link State ID\n"
+       "Advertising Router\n"
+       "All Advertising Router\n"
+       "Dump raw LSA data in Hex\n"
+       "show detail of LSAs\n"
        )
 
-DEFSH (VTYSH_ZEBRA, no_ip_route_pref_cmd_vtysh, 
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Distance value for this route\n")
+DEFSH (VTYSH_RIPD, rip_passive_interface_cmd_vtysh, 
+       "passive-interface IFNAME", 
+       "Suppress routing updates on an interface\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_BGPD, no_set_community_none_cmd_vtysh, 
-       "no set community none", 
+DEFSH (VTYSH_BGPD, no_neighbor_capability_orf_prefix_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "capability orf prefix-list (both|send|receive)", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP community attribute\n"
-       "No community attribute\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise ORF capability to the peer\n"
+       "Advertise prefixlist ORF capability to this neighbor\n"
+       "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
+       "Capability to RECEIVE the ORF from this neighbor\n"
+       "Capability to SEND the ORF to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_instance_summary_cmd_vtysh, 
-       "show bgp view WORD summary", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_cmd_vtysh, 
+       "redistribute bgp", 
+       "Redistribute information from another routing protocol\n"
+       "Border Gateway Protocol (BGP)\n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_interface_ifname_cmd_vtysh, 
+       "show ipv6 ospf6 interface IFNAME", 
        "Show running system information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Summary of BGP neighbor status\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Interface infomation\n"
+       "Interface name(e.g. ep0)\n"
+       )
 
-DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_all_cmd_vtysh, 
-       "no ip extcommunity-list (<1-99>|<100-199>)", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a extended community list entry\n"
-       "Extended Community list number (standard)\n"
-       "Extended Community list number (expanded)\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_inter_external_cmd_vtysh, 
+       "distance ospf intra-area <1-255> inter-area <1-255> external <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n")
 
-DEFSH (VTYSH_BGPD, ipv6_bgp_network_route_map_cmd_vtysh, 
-       "network X:X::X:X/M route-map WORD", 
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+DEFSH (VTYSH_OSPFD, area_stub_no_summary_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) stub no-summary", 
+       "OSPF stub parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure OSPF area as stub\n"
+       "Do not inject inter-area routes into stub\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_metric_cmd_vtysh, 
-       "redistribute connected metric <0-16>", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_metric_cmd_vtysh, 
+       "redistribute ospf6 metric <0-16>", 
        "Redistribute information from another routing protocol\n"
-       "Connected\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n"
        "Metric\n"
        "Metric value\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_ge_le_cmd_vtysh, 
-       "no ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_authentication_key_cmd_vtysh, 
-       "ip ospf authentication-key AUTH_KEY", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "The OSPF password (key)")
-
-DEFSH (VTYSH_ZEBRA, ipv6_nd_other_config_flag_cmd_vtysh, 
-       "ipv6 nd other-config-flag", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Other statefull configuration flag\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_neighbor_advertised_route_cmd_vtysh, 
-       "show bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
-
-DEFSH (VTYSH_OSPFD, interface_ip_ospf_authentication_addr_cmd_vtysh, 
-       "ip ospf authentication A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n"
-       "Address of interface")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ip_prefix_list_name_prefix_cmd_vtysh, 
-       "clear ip prefix-list WORD A.B.C.D/M", 
-       "Reset functions\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+DEFSH (VTYSH_RIPNGD, default_information_originate_cmd_vtysh, 
+       "default-information originate", 
+       "Default route information\n"
+       "Distribute default route\n")
 
-DEFSH (VTYSH_BGPD, bgp_client_to_client_reflection_cmd_vtysh, 
-       "bgp client-to-client reflection", 
-       "BGP specific commands\n"
-       "Configure client to client route reflection\n"
-       "reflection of routes allowed\n")
+DEFSH (VTYSH_RIPD, send_lifetime_day_month_day_month_cmd_vtysh, 
+       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Day of th month to expire\n"
+       "Month of the year to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_external_soft_in_cmd_vtysh, 
-       "clear bgp external soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_lsa_sub_cmd_vtysh, 
+       "debug ospf lsa (generate|flooding|install|refresh)", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Link State Advertisement\n"
+       "LSA Generation\n"
+       "LSA Flooding\n"
+       "LSA Install/Delete\n"
+       "LSA Refresh\n")
 
-DEFSH (VTYSH_RIPD, no_rip_redistribute_type_routemap_cmd_vtysh, 
-       "no redistribute (kernel|connected|static|ospf|bgp) route-map WORD", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_metric_routemap_cmd_vtysh, 
+       "no redistribute bgp metric <0-16> route-map WORD", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Open Shortest Path First (OSPF)\n"
        "Border Gateway Protocol (BGP)\n"
+       "Metric\n"
+       "Metric value\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_mask_summary_as_set_cmd_vtysh, 
-       "no aggregate-address A.B.C.D A.B.C.D summary-only as-set", 
-       "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
+DEFSH (VTYSH_OSPFD, area_range_cost_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "User specified metric for this range\n"
+       "Advertised metric for this range\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_tags_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn tags", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_route_cmd_vtysh, 
+       "show ip bgp vpnv4 all A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Display BGP tags for prefixes\n")
-
-DEFSH (VTYSH_BGPD, no_set_ecommunity_soo_cmd_vtysh, 
-       "no set extcommunity soo", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP extended community attribute\n"
-       "Site-of-Origin extended community\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_exact_cmd_vtysh, 
-       "access-list WORD (deny|permit) A.B.C.D/M exact-match", 
-       "Add an access list entry\n"
-       "IP zebra access-list name\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n"
-       "Exact match of the prefixes\n")
+       "Display information about all VPNv4 NLRIs\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_route_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) soft in", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
+       "Clear all external peers\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Network in the BGP routing table to display\n")
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_cmd_vtysh, 
-       "clear bgp ipv6 *", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all peers\n")
+DEFSH (VTYSH_BGPD, aggregate_address_mask_as_set_summary_cmd_vtysh, 
+       "aggregate-address A.B.C.D A.B.C.D as-set summary-only", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Generate AS set path information\n"
+       "Filter more specific routes from updates\n")
 
-DEFSH (VTYSH_BGPD, bgp_confederation_peers_cmd_vtysh, 
-       "bgp confederation peers .<1-65535>", 
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "Peer ASs in BGP confederation\n"
-       "AS number\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_hello_interval_cmd_vtysh, 
+       "ip ospf hello-interval <1-65535>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between HELLO packets\n"
+       "Seconds\n")
 
-DEFSH (VTYSH_BGPD, no_set_ecommunity_soo_val_cmd_vtysh, 
-       "no set extcommunity soo .ASN:nn_or_IP-address:nn", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_metric_cmd_vtysh, 
+       "redistribute kernel metric <0-16>", 
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Metric\n"
+       "Metric value\n")
+
+DEFSH (VTYSH_BGPD, no_set_local_pref_cmd_vtysh, 
+       "no set local-preference", 
        "Negate a command or set its defaults\n"
        "Set values in destination routing protocol\n"
-       "BGP extended community attribute\n"
-       "Site-of-Origin extended community\n"
-       "VPN extended community\n")
+       "BGP local preference path attribute\n")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_routemap_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric for redistributed routes\n"
-       "OSPF default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_BGPD, no_bgp_client_to_client_reflection_cmd_vtysh, 
+       "no bgp client-to-client reflection", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "Configure client to client route reflection\n"
+       "reflection of routes allowed\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_cost_addr_cmd_vtysh, 
-       "ip ospf cost <1-65535> A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost\n"
-       "Address of interface")
+DEFSH (VTYSH_OSPF6D, no_interface_area_cmd_vtysh, 
+       "no interface IFNAME area A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Disable routing on an IPv6 interface\n"
+       "Interface name(e.g. ep0)\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 external soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_BGPD, neighbor_remote_as_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "remote-as <1-65535>", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Specify a BGP neighbor\n"
+       "AS number\n")
 
-DEFSH (VTYSH_RIPD, show_ip_rip_cmd_vtysh, 
-       "show ip rip", 
-       "Show running system information\n"
-       "IP information\n"
-       "Show RIP routes\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_ism_cmd_vtysh, 
+       "debug ospf ism", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Interface State Machine\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_out_cmd_vtysh, 
+       "clear ip bgp peer-group WORD out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_RIPD, show_debugging_rip_cmd_vtysh, 
-       "show debugging rip", 
-       "Show running system information\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_network_mask_route_map_cmd_vtysh, 
-       "no network A.B.C.D mask A.B.C.D route-map WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_address_cmd_vtysh, 
+       "no match ip address", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+       "Match values from routing table\n"
+       "IP information\n"
+       "Match address of route\n")
 
-DEFSH (VTYSH_BGPD, set_local_pref_cmd_vtysh, 
-       "set local-preference <0-4294967295>", 
-       "Set values in destination routing protocol\n"
-       "BGP local preference path attribute\n"
-       "Preference value\n")
+DEFSH (VTYSH_OSPFD, area_authentication_message_digest_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) authentication message-digest", 
+       "OSPF area parameters\n"
+       "Enable authentication\n"
+       "Use message-digest authentication\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_activate_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "activate", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_dead_interval_cmd_vtysh, 
+       "no ip ospf dead-interval", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Enable the Address Family for this Neighbor\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interval after which a neighbor is declared dead\n")
 
-DEFSH (VTYSH_RIPD, no_rip_redistribute_type_metric_cmd_vtysh, 
-       "no redistribute (kernel|connected|static|ospf|bgp) metric <0-16>", 
+DEFSH (VTYSH_RIPD, no_rip_redistribute_type_metric_routemap_cmd_vtysh, 
+       "no redistribute (kernel|connected|static|ospf|bgp) metric <0-16> route-map WORD", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
@@ -2086,688 +1375,543 @@ DEFSH (VTYSH_RIPD, no_rip_redistribute_type_metric_cmd_vtysh,
        "Open Shortest Path First (OSPF)\n"
        "Border Gateway Protocol (BGP)\n"
        "Metric\n"
-       "Metric value\n")
-
-DEFSH (VTYSH_ZEBRA, no_debug_zebra_kernel_cmd_vtysh, 
-       "no debug zebra kernel", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra between kernel interface\n")
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_set_ipv6_nexthop_global_val_cmd_vtysh, 
-       "no set ipv6 next-hop global X:X::X:X", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 global address\n"
-       "IPv6 address of next hop\n")
+DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_all_cmd_vtysh, 
+       "show ip ospf neighbor all", 
+       "Show running system information\n"
+       "IP information\n"
+       "OSPF information\n"
+       "Neighbor list\n"
+       "include down status neighbor\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 * soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, neighbor_priority_poll_interval_cmd_vtysh, 
+       "neighbor A.B.C.D priority <0-255> poll-interval <1-65535>", 
+       "Specify neighbor router\n"
+       "Neighbor IP address\n"
+       "Neighbor Priority\n"
+       "Priority\n"
+       "Dead Neighbor Polling interval\n"
+       "Seconds\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community4_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+DEFSH (VTYSH_BGPD, neighbor_filter_list_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "filter-list WORD (in|out)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Establish BGP filters\n"
+       "AS path access-list name\n"
+       "Filter incoming routes\n"
+       "Filter outgoing routes\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbors_peer_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_attr_info_cmd_vtysh, 
+       "show ip bgp attribute-info", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
-
-DEFSH (VTYSH_RIPD, no_rip_split_horizon_cmd_vtysh, 
-       "no ip split-horizon", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Perform split horizon\n")
+       "List all bgp attribute information\n")
 
-DEFSH (VTYSH_BGPD, neighbor_local_as_no_prepend_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "local-as <1-65535> no-prepend", 
+DEFSH (VTYSH_BGPD, neighbor_strict_capability_cmd_vtysh, 
+       "neighbor A.B.C.D " "strict-capability-match", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a local-as number\n"
-       "AS number used as local AS\n"
-       "Do not prepend local-as to updates from ebgp peers\n")
+       "Neighbor address\n"
+       "Strict capability negotiation match\n")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_routemap_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "OSPF exterior metric type for redistributed routes\n"
+DEFSH (VTYSH_ZEBRA, no_ip_address_secondary_cmd_vtysh, 
+       "no ip address A.B.C.D/M secondary", 
+       "Negate a command or set its defaults\n"
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP address (e.g. 10.0.0.1/8)\n"
+       "Secondary IP address\n")
+
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_metric_routemap_cmd_vtysh, 
+       "default-information originate always metric-type (1|2) metric <0-16777214> route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF metric type for default routes\n"
        "Set OSPF External Type 1 metrics\n"
        "Set OSPF External Type 2 metrics\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_mask_as_set_cmd_vtysh, 
-       "no aggregate-address A.B.C.D A.B.C.D as-set", 
+DEFSH (VTYSH_OSPFD, no_ospf_distance_ospf_cmd_vtysh, 
+       "no distance ospf", 
        "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Generate AS set path information\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_inter_cmd_vtysh, 
-       "distance ospf external <1-255> inter-area <1-255>", 
        "Define an administrative distance\n"
        "OSPF Administrative distance\n"
-       "External routes\n"
-       "Distance for external routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n")
-
-DEFSH (VTYSH_RIPD, accept_lifetime_month_day_month_day_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Month of the year to expire\n"
-       "Day of th month to expire\n"
-       "Year to expire\n")
+       "OSPF Distance\n")
 
-DEFSH (VTYSH_BGPD, no_set_originator_id_val_cmd_vtysh, 
-       "no set originator-id A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP originator ID attribute\n"
-       "IP address of originator\n")
+DEFSH (VTYSH_OSPFD, area_range_advertise_cost_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Advertise this range (default)\n"
+       "User specified metric for this range\n"
+       "Advertised metric for this range\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbor_routes_cmd_vtysh, 
-       "show ip bgp vpnv4 all neighbors A.B.C.D routes", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_prefix_cmd_vtysh, 
+       "show ip bgp A.B.C.D/M", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_metric_routemap_cmd_vtysh, 
-       "no redistribute bgp metric <0-16> route-map WORD", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_metric_routemap_cmd_vtysh, 
+       "redistribute static metric <0-16> route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
+       "Static routes\n"
        "Metric\n"
        "Metric value\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_routemap_cmd_vtysh, 
-       "default-information originate route-map WORD", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_authtype_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|)", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_neighbor_routerid_cmd_vtysh, 
+       "show ipv6 ospf6 neighbor A.B.C.D", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Neighbor list\n"
+       "OSPF6 neighbor Router ID in IP address format\n"
+       )
+
+DEFSH (VTYSH_OSPFD, area_shortcut_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) shortcut (default|enable|disable)", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure the area's shortcutting mode\n"
+       "Set default shortcutting behavior\n"
+       "Enable shortcutting through the area\n"
+       "Disable shortcutting through the area\n")
+
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_routemap_cmd_vtysh, 
+       "default-information originate always metric-type (1|2) route-map WORD", 
        "Control distribution of default information\n"
        "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_list_exact_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community-list WORD exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast)", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_remark_cmd_vtysh, 
-       "access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE", 
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP extended access list\n"
-       "IP standard access list (expanded range)\n"
-       "IP extended access list (expanded range)\n"
-       "IP zebra access-list\n"
-       "Access list entry comment\n"
-       "Comment up to 100 characters\n")
+       "Address Family modifier\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_prefix_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_prefix_cmd_vtysh, 
+       "clear ip bgp dampening A.B.C.D/M", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
+       "Clear route flap dampening information\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_router_id_cmd_vtysh, 
-       "no bgp router-id", 
+DEFSH (VTYSH_BGPD, no_neighbor_maximum_prefix_val2_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "maximum-prefix <1-4294967295> warning-only", 
        "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Override configured router identifier\n")
-
-DEFSH (VTYSH_BGPD, dump_bgp_all_interval_cmd_vtysh, 
-       "dump bgp all PATH INTERVAL", 
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump all BGP packets\n"
-       "Output filename\n"
-       "Interval of output\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n"
+       "maximum no. of prefix limit\n"
+       "Only give warning message when limit is exceeded\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_filter_list_cmd_vtysh, 
-       "show ipv6 mbgp filter-list WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_prefix_list_cmd_vtysh, 
+       "show ip bgp prefix-list WORD", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
-
-DEFSH (VTYSH_BGPD, dump_bgp_updates_cmd_vtysh, 
-       "dump bgp updates PATH", 
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump BGP updates only\n"
-       "Output filename\n")
+       "IP information\n"
+       "BGP information\n"
+       "Display routes conforming to the prefix-list\n"
+       "IP prefix-list name\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_network_backdoor_cmd_vtysh, 
-       "no network A.B.C.D/M backdoor", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_metric_val_cmd_vtysh, 
+       "no redistribute ospf6 metric <0-16>", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Specify a BGP backdoor route\n")
+       "Redistribute information from another routing protocol\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_in_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_name_cmd_vtysh, 
+       "show ip prefix-list WORD", 
+       "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_soft_in_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_RIPD, send_lifetime_month_day_day_month_cmd_vtysh, 
+       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Day of th month to expire\n"
+       "Month of the year to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_OSPF6D, redistribute_ospf6_cmd_vtysh, 
-       "redistribute ospf6", 
-       "Redistribute control\n"
-       "OSPF6 route\n")
+DEFSH (VTYSH_BGPD, debug_bgp_fsm_cmd_vtysh, 
+       "debug bgp fsm", 
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "BGP Finite State Machine\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_ge_le_cmd_vtysh, 
-       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_mask_as_set_summary_cmd_vtysh, 
+       "no aggregate-address A.B.C.D A.B.C.D as-set summary-only", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Generate AS set path information\n"
+       "Filter more specific routes from updates\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_dead_interval_cmd_vtysh, 
-       "no ip ospf dead-interval", 
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_intra_inter_cmd_vtysh, 
+       "distance ospf external <1-255> intra-area <1-255> inter-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "External routes\n"
+       "Distance for external routes\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n")
+
+DEFSH (VTYSH_RIPD, accept_lifetime_day_month_month_day_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Month of the year to expire\n"
+       "Day of th month to expire\n"
+       "Year to expire\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_advertise_interval_cmd_vtysh, 
+       "no neighbor A.B.C.D " "advertisement-interval", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Minimum interval between sending BGP routing updates\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_le_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+DEFSH (VTYSH_BGPD, neighbor_soft_reconfiguration_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "soft-reconfiguration inbound", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Per neighbor soft reconfiguration\n"
+       "Allow inbound soft reconfiguration for this neighbor\n")
 
-DEFSH (VTYSH_OSPF6D, router_id_cmd_vtysh, 
-       "router-id ROUTER_ID", 
-       "Configure ospf Router-ID.\n"
-       "specify by IPv4 address notation(e.g. 0.0.0.0)\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_cmd_vtysh, 
+       "default-information originate always", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n")
 
-DEFSH (VTYSH_BGPD, bgp_bestpath_med2_cmd_vtysh, 
-       "bgp bestpath med confed missing-as-worst", 
+DEFSH (VTYSH_BGPD, no_bgp_scan_time_cmd_vtysh, 
+       "no bgp scan-time", 
+       "Negate a command or set its defaults\n"
        "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Compare MED among confederation paths\n"
-       "Treat missing MED as the least preferred one\n")
+       "Configure background scanner interval\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_in_cmd_vtysh, 
-       "clear bgp ipv6 * in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_BGPD, no_neighbor_description_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "description", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Neighbor specific description\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community3_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+DEFSH (VTYSH_BGPD, undebug_bgp_normal_cmd_vtysh, 
+       "undebug bgp", 
+       "Disable debugging functions (see also 'debug')\n"
+       "BGP information\n")
 
-DEFSH (VTYSH_BGPD, ip_extcommunity_list_standard2_cmd_vtysh, 
-       "ip extcommunity-list <1-99> (deny|permit)", 
+DEFSH (VTYSH_BGPD, aggregate_address_mask_cmd_vtysh, 
+       "aggregate-address A.B.C.D A.B.C.D", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n")
+
+DEFSH (VTYSH_BGPD, ip_community_list_expanded_cmd_vtysh, 
+       "ip community-list <100-199> (deny|permit) .LINE", 
        "IP information\n"
-       "Add a extended community list entry\n"
-       "Extended Community list number (standard)\n"
+       "Add a community list entry\n"
+       "Community list number (expanded)\n"
        "Specify community to reject\n"
-       "Specify community to accept\n")
+       "Specify community to accept\n"
+       "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_OSPFD, passive_interface_addr_cmd_vtysh, 
-       "passive-interface IFNAME A.B.C.D", 
-       "Suppress routing updates on an interface\n"
-       "Interface's name\n")
+DEFSH (VTYSH_RIPNGD, ripng_aggregate_address_cmd_vtysh, 
+       "aggregate-address X:X::X:X/M", 
+       "Set aggregate RIPng route announcement\n"
+       "Aggregate network\n")
 
-DEFSH (VTYSH_BGPD, neighbor_ebgp_multihop_ttl_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "ebgp-multihop <1-255>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Allow EBGP neighbors not on directly connected networks\n"
-       "maximum hop count\n")
+DEFSH (VTYSH_ZEBRA, config_table_cmd_vtysh, 
+       "table TABLENO", 
+       "Configure target kernel routing table\n"
+       "TABLE integer\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_prefix_longer_cmd_vtysh, 
-       "show ip bgp flap-statistics A.B.C.D/M longer-prefixes", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_route_map_cmd_vtysh, 
+       "show ip bgp flap-statistics route-map WORD", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Display route and more specific routes\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_peer_group_cmd_vtysh, 
-       "no neighbor WORD peer-group", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor tag\n"
-       "Configure peer-group\n")
-
-DEFSH (VTYSH_ZEBRA, no_ipv6_route_ifname_cmd_vtysh, 
-       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n")
-
-DEFSH (VTYSH_RIPD, rip_distance_source_access_list_cmd_vtysh, 
-       "distance <1-255> A.B.C.D/M WORD", 
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n"
-       "Access list name\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv6_rmap_metric_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf6|ripng|static) route-map WORD metric <0-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
-
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_advertise_prefix_list_cmd_vtysh, 
-       "ipv6 ospf6 advertise prefix-list WORD", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Advertising options\n"
-       "Filter prefix using prefix-list\n"
-       "Prefix list name\n"
-       )
+       "Display routes matching the route-map\n"
+       "A route-map to match on\n")
 
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_transmitdelay_cmd_vtysh, 
-       "ipv6 ospf6 transmit-delay TRANSMITDELAY", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_route_cmd_vtysh, 
+       "show ipv6 ospf6 route", 
+       "Show running system information\n"
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "Link state transmit delay\n"
-       "<1-65535> Seconds\n"
+       "Routing table\n"
        )
 
-DEFSH (VTYSH_BGPD, neighbor_maximum_prefix_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "maximum-prefix <1-4294967295>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n")
-
-DEFSH (VTYSH_BGPD, vpnv4_network_cmd_vtysh, 
-       "network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", 
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Specify Route Distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "BGP tag\n"
-       "tag value\n")
+DEFSH (VTYSH_OSPF6D, redistribute_ospf6_cmd_vtysh, 
+       "redistribute ospf6", 
+       "Redistribute control\n"
+       "OSPF6 route\n")
 
-DEFSH (VTYSH_ZEBRA, show_ipv6_route_addr_cmd_vtysh, 
-       "show ipv6 route X:X::X:X", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, match_ip_next_hop_prefix_list_cmd_vtysh, 
+       "match ip next-hop prefix-list WORD", 
+       "Match values from routing table\n"
        "IP information\n"
-       "IPv6 routing table\n"
-       "IPv6 Address\n")
+       "Match next-hop address of route\n"
+       "Match entries of prefix-lists\n"
+       "IP prefix-list name\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbors_peer_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X)", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged4_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged med (as-path|next-hop)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_in_cmd_vtysh, 
+       "clear ip bgp * in", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_nsm_cmd_vtysh, 
-       "debug ospf nsm", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Neighbor State Machine\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_message_digest_key_cmd_vtysh, 
-       "ip ospf message-digest-key <1-255> md5 KEY", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n"
-       "Use MD5 algorithm\n"
-       "The OSPF password (key)")
+       "Clear all peers\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_metric_routemap_cmd_vtysh, 
-       "redistribute bgp metric <0-16> route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_BGPD, neighbor_default_originate_rmap_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "default-originate route-map WORD", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Originate default route to this neighbor\n"
+       "Route-map to specify criteria to originate default\n"
+       "route-map name\n")
 
-DEFSH (VTYSH_BGPD, bgp_default_local_preference_cmd_vtysh, 
-       "bgp default local-preference <0-4294967295>", 
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "local preference (higher=more preferred)\n"
-       "Configure default local preference value\n")
+DEFSH (VTYSH_OSPF6D, interface_area_plist_passive_cmd_vtysh, 
+       "interface IFNAME area A.B.C.D prefix-list WORD passive", 
+       "Enable routing on an IPv6 interface\n"
+       "Interface name(e.g. ep0)\n"
+       "Set the OSPF6 area ID\n"
+       "OSPF6 area ID in IPv4 address notation\n"
+       "Advertise I/F Address only match entries of prefix-list\n"
+       "IPv6 prefix-list name\n"
+       "IPv6 prefix-list name\n"
+       "Suppress routing updates on an interface\n"
+      )
 
-DEFSH (VTYSH_RIPD, rip_distance_source_cmd_vtysh, 
-       "distance <1-255> A.B.C.D/M", 
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, match_ip_address_prefix_list_cmd_vtysh, 
+       "match ip address prefix-list WORD", 
+       "Match values from routing table\n"
+       "IP information\n"
+       "Match address of route\n"
+       "Match entries of prefix-lists\n"
+       "IP prefix-list name\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_seq_le_cmd_vtysh, 
-       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128>", 
-       "IPv6 information\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_summary_cmd_vtysh, 
+       "show ip prefix-list summary", 
+       "Show running system information\n"
+       "IP information\n"
        "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "Summary of prefix lists\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_regexp_cmd_vtysh, 
-       "show bgp regexp .LINE", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_prefix_longer_cmd_vtysh, 
+       "show ip bgp A.B.C.D/M longer-prefixes", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Display route and more specific routes\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_regexp_cmd_vtysh, 
-       "show ipv6 bgp regexp .LINE", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, show_ip_access_list_cmd_vtysh, 
+       "show ip access-list", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
+       "List IP access lists\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_priority_cmd_vtysh, 
-       "no ip ospf priority", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_match_metric_cmd_vtysh, 
+       "no match metric", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Router priority\n")
+       "Match values from routing table\n"
+       "Match metric of route\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_set_ip_nexthop_cmd_vtysh, 
-       "no set ip next-hop", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged2_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged as-path (next-hop|med)", 
        "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, set_ip_nexthop_cmd_vtysh, 
+       "set ip next-hop A.B.C.D", 
        "Set values in destination routing protocol\n"
        "IP information\n"
-       "Next hop address\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_dead_interval_addr_cmd_vtysh, 
-       "ip ospf dead-interval <1-65535> A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Seconds\n"
-       "Address of interface")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_name_seq_cmd_vtysh, 
-       "show ipv6 prefix-list WORD seq <1-4294967295>", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n")
+       "Next hop address\n"
+       "IP address of next hop\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, ipv6_access_list_cmd_vtysh, 
-       "ipv6 access-list WORD (deny|permit) X:X::X:X/M", 
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n")
+DEFSH (VTYSH_BGPD, bgp_bestpath_med3_cmd_vtysh, 
+       "bgp bestpath med missing-as-worst confed", 
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "MED attribute\n"
+       "Treat missing MED as the least preferred one\n"
+       "Compare MED among confederation paths\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_cmd_vtysh, 
-       "clear ip bgp external", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_address_mask_cmd_vtysh, 
+       "clear ip bgp dampening A.B.C.D A.B.C.D", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n")
+       "Clear route flap dampening information\n"
+       "Network to clear damping information\n"
+       "Network mask\n")
 
-DEFSH (VTYSH_OSPFD, no_area_authentication_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) authentication", 
+DEFSH (VTYSH_BGPD, dump_bgp_updates_interval_cmd_vtysh, 
+       "dump bgp updates PATH INTERVAL", 
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump BGP updates only\n"
+       "Output filename\n"
+       "Interval of output\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_rmap_metric_cmd_vtysh, 
+       "no redistribute (connected|kernel|ospf|rip|static) route-map WORD metric <0-4294967295>", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Enable authentication\n")
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_ge_le_cmd_vtysh, 
-       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh, 
+       "show ip bgp vpnv4 all neighbors A.B.C.D advertised-routes", 
+       "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (VTYSH_BGPD, no_set_aspath_prepend_val_cmd_vtysh, 
-       "no set as-path prepend .<1-65535>", 
+DEFSH (VTYSH_RIPD, no_match_ip_next_hop_val_cmd_vtysh, 
+       "no match ip next-hop WORD", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Prepend string for a BGP AS-path attribute\n"
-       "Prepend to the as-path\n"
-       "AS number\n")
+       "Match values from routing table\n"
+       "IP information\n"
+       "Match next-hop address of route\n"
+       "IP access-list name\n")
 
-DEFSH (VTYSH_OSPFD, area_stub_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) stub", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area as stub\n")
+DEFSH (VTYSH_BGPD, no_bgp_default_local_preference_cmd_vtysh, 
+       "no bgp default local-preference", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "Configure BGP defaults\n"
+       "local preference (higher=more preferred)\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_cmd_vtysh, 
-       "show ipv6 ospf6 database", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_cmd_vtysh, 
+       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*|HEX) (A.B.C.D|*|dump|detail)", 
        "Show running system information\n"
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
        "LSA Database\n"
+       "Router-LSA\n"
+       "Network-LSA\n"
+       "AS-External-LSA\n"
+       "Intra-Area-Prefix-LSA\n"
+       "Inter-Area-Router-LSA\n"
+       "Inter-Area-Prefix-LSA\n"
+       "Link-LSA\n"
+       "All LS Type\n"
+       "Specify LS Type by Hex\n"
+       "Link State ID\n"
+       "All Link State ID\n"
+       "Dump raw LSA data in Hex\n"
+       "show detail of LSAs\n"
        )
 
-DEFSH (VTYSH_RIPD, no_rip_default_metric_val_cmd_vtysh, 
-       "no default-metric <1-16>", 
-       "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_prefix_cmd_vtysh, 
-       "show ip bgp A.B.C.D/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_external_in_cmd_vtysh, 
-       "clear bgp external in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_zebra_sub_cmd_vtysh, 
+       "debug ospf zebra (interface|redistribute)", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Zebra information\n"
+       "Zebra interface\n"
+       "Zebra redistribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, show_ip_access_list_name_cmd_vtysh, 
-       "show ip access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_tags_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn tags", 
        "Show running system information\n"
        "IP information\n"
-       "List IP access lists\n"
-       "IP standard access list\n"
-       "IP extended access list\n"
-       "IP standard access list (expanded range)\n"
-       "IP extended access list (expanded range)\n"
-       "IP zebra access-list\n")
-
-DEFSH (VTYSH_BGPD, set_community_delete_cmd_vtysh, 
-       "set comm-list (<1-99>|<100-199>|WORD) delete", 
-       "Set values in destination routing protocol\n"
-       "set BGP community list (for deletion)\n"
-       "Community-list number (standard)\n"
-       "Communitly-list number (expanded)\n"
-       "Community-list name\n"
-       "Delete matching communities\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community3_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, no_ip_community_list_all_cmd_vtysh, 
-       "no ip community-list (WORD|<1-99>|<100-199>)", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list name\n"
-       "Community list number (standard)\n"
-       "Community list number (expanded)\n")
-
-DEFSH (VTYSH_RIPD, rip_redistribute_rip_cmd_vtysh, 
-       "redistribute rip", 
-       "Redistribute information from another routing protocol\n"
-       "Routing Information Protocol (RIP)\n")
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Display BGP tags for prefixes\n")
 
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_hellointerval_cmd_vtysh, 
-       "ipv6 ospf6 hello-interval HELLO_INTERVAL", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Time between HELLO packets\n"
-       "<1-65535> Seconds\n"
-       )
+DEFSH (VTYSH_RIPD, send_lifetime_month_day_month_day_cmd_vtysh, 
+       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Month of the year to expire\n"
+       "Day of th month to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_passive_interface_cmd_vtysh, 
-       "no passive-interface IFNAME", 
-       "Negate a command or set its defaults\n"
-       "Suppress routing updates on an interface\n"
-       "Interface name\n")
+DEFSH (VTYSH_OSPF6D, ospf6_routemap_set_forwarding_cmd_vtysh, 
+       "set forwarding-address X:X::X:X", 
+       "Set value\n"
+       "Forwarding Address\n"
+       "IPv6 Address\n")
 
 DEFSH (VTYSH_BGPD, no_bgp_network_mask_natural_backdoor_cmd_vtysh, 
        "no network A.B.C.D backdoor", 
@@ -2776,367 +1920,195 @@ DEFSH (VTYSH_BGPD, no_bgp_network_mask_natural_backdoor_cmd_vtysh,
        "Network number\n"
        "Specify a BGP backdoor route\n")
 
-DEFSH (VTYSH_ZEBRA, multicast_cmd_vtysh, 
-       "multicast", 
-       "Set multicast flag to interface\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_inter_intra_cmd_vtysh, 
-       "distance ospf external <1-255> inter-area <1-255> intra-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "External routes\n"
-       "Distance for external routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n")
-
-DEFSH (VTYSH_RIPD, rip_redistribute_type_cmd_vtysh, 
-       "redistribute (kernel|connected|static|ospf|bgp)", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Open Shortest Path First (OSPF)\n"
-       "Border Gateway Protocol (BGP)\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_host_host_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_any_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip any any", 
        "Add an access list entry\n"
        "IP extended access list\n"
        "IP extended access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "A single destination host\n"
-       "Destination address\n")
-
-DEFSH (VTYSH_BGPD, bgp_config_type_cmd_vtysh, 
-       "bgp config-type (cisco|zebra)", 
-       "BGP information\n"
-       "Configuration type\n"
-       "cisco\n"
-       "zebra\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_community2_exact_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_view_cmd_vtysh, 
-       "show ip bgp view WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "BGP view name\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_address_mask_cmd_vtysh, 
-       "clear ip bgp dampening A.B.C.D A.B.C.D", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear route flap dampening information\n"
-       "Network to clear damping information\n"
-       "Network mask\n")
-
-DEFSH (VTYSH_OSPFD, area_authentication_message_digest_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) authentication message-digest", 
-       "OSPF area parameters\n"
-       "Enable authentication\n"
-       "Use message-digest authentication\n")
+       "Any source host\n"
+       "Any destination host\n")
 
-DEFSH (VTYSH_OSPFD, no_area_range_advertise_cost_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>", 
+DEFSH (VTYSH_OSPFD, no_area_authentication_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) authentication", 
        "Negate a command or set its defaults\n"
        "OSPF area parameters\n"
        "OSPF area ID in IP address format\n"
        "OSPF area ID as a decimal value\n"
-       "Configure OSPF area range for route summarization\n"
-       "area range prefix\n"
-       "advertise this range\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
-
-DEFSH (VTYSH_RIPD, no_rip_neighbor_cmd_vtysh, 
-       "no neighbor A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "Specify a neighbor router\n"
-       "Neighbor address\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_metric_routemap_cmd_vtysh, 
-       "redistribute connected metric <0-16> route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_deterministic_med_cmd_vtysh, 
-       "no bgp deterministic-med", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Pick the best-MED path among paths advertised from the neighboring AS\n")
+       "Enable authentication\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community4_exact_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp <1-65535> ipv4 (unicast|multicast) soft out", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Soft reconfig\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_set_aggregator_as_cmd_vtysh, 
-       "no set aggregator as", 
+DEFSH (VTYSH_BGPD, no_neighbor_maximum_prefix_val_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "maximum-prefix <1-4294967295>", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP aggregator attribute\n"
-       "AS number of aggregator\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n"
+       "maximum no. of prefix limit\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_soft_cmd_vtysh, 
-       "clear bgp ipv6 * soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all peers\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_OSPFD, neighbor_poll_interval_priority_cmd_vtysh, 
+       "neighbor A.B.C.D poll-interval <1-65535> priority <0-255>", 
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "OSPF dead-router polling interval\n"
+       "Seconds\n"
+       "OSPF priority of non-broadcast neighbor\n"
+       "Priority\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_param1_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+DEFSH (VTYSH_BGPD, no_bgp_network_mask_backdoor_cmd_vtysh, 
+       "no network A.B.C.D mask A.B.C.D backdoor", 
+       "Negate a command or set its defaults\n"
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Network mask\n"
+       "Network mask\n"
+       "Specify a BGP backdoor route\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf|rip|static)", 
+DEFSH (VTYSH_RIPNGD, no_default_information_originate_cmd_vtysh, 
+       "no default-information originate", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n")
+       "Default route information\n"
+       "Distribute default route\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) soft in", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, no_neighbor_send_community_type_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "send-community (both|extended|standard)", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Send Community attribute to this neighbor\n"
+       "Send Standard and Extended Community attributes\n"
+       "Send Extended Community attributes\n"
+       "Send Standard Community attributes\n")
+
+DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_name_expanded_cmd_vtysh, 
+       "no ip extcommunity-list expanded WORD (deny|permit) .LINE", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Add a extended community list entry\n"
+       "Specify expanded extcommunity-list\n"
+       "Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_cmd_vtysh, 
-       "ipv6 prefix-list WORD (deny|permit) (X:X::X:X/M|any)", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Any prefix match.  Same as \"::0/0 le 128\"\n")
+DEFSH (VTYSH_BGPD, no_bgp_bestpath_aspath_ignore_cmd_vtysh, 
+       "no bgp bestpath as-path ignore", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "AS-path attribute\n"
+       "Ignore as-path length in selecting a route\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_soft_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast soft", 
-       "Reset functions\n"
+DEFSH (VTYSH_ZEBRA, show_ip_route_prefix_cmd_vtysh, 
+       "show ip route A.B.C.D/M", 
+       "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
+       "IP routing table\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, debug_bgp_keepalive_cmd_vtysh, 
-       "debug bgp keepalives", 
-       "Debugging functions (see also 'undebug')\n"
+DEFSH (VTYSH_BGPD, undebug_bgp_update_cmd_vtysh, 
+       "undebug bgp updates", 
+       "Disable debugging functions (see also 'debug')\n"
        "BGP information\n"
-       "BGP keepalives\n")
+       "BGP updates\n")
 
-DEFSH (VTYSH_BGPD, no_router_bgp_cmd_vtysh, 
-       "no router bgp <1-65535>", 
+DEFSH (VTYSH_BGPD, no_set_vpnv4_nexthop_val_cmd_vtysh, 
+       "no set vpnv4 next-hop A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Enable a routing process\n"
-       "BGP information\n"
-       "AS number\n")
+       "Set values in destination routing protocol\n"
+       "VPNv4 information\n"
+       "VPNv4 next-hop address\n"
+       "IP address of next hop\n")
+
+DEFSH (VTYSH_OSPFD, no_ospf_rfc1583_flag_cmd_vtysh, 
+       "no ospf rfc1583compatibility", 
+       "Negate a command or set its defaults\n"
+       "OSPF specific commands\n"
+       "Disable the RFC1583Compatibility flag\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_route_ifname_pref_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255>", 
+DEFSH (VTYSH_BGPD, show_ip_community_list_cmd_vtysh, 
+       "show ip community-list", 
+       "Show running system information\n"
        "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n")
+       "List community-list\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_transmit_delay_addr_cmd_vtysh, 
-       "no ip ospf transmit-delay A.B.C.D", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, set_weight_cmd_vtysh, 
+       "set weight <0-4294967295>", 
+       "Set values in destination routing protocol\n"
+       "BGP weight for routing table\n"
+       "Weight value\n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_neighborlist_cmd_vtysh, 
+       "show ipv6 ospf6 (summary-list|request-list|retrans-list|dbdesc-list)", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Link State summary list\n"
+       "Link State request list\n"
+       "Link State retransmission list\n"
+       "Link State Description list (Used to retrans DbDesc)\n"
+       )
+
+DEFSH (VTYSH_OSPFD, ip_ospf_transmit_delay_addr_cmd_vtysh, 
+       "ip ospf transmit-delay <1-65535> A.B.C.D", 
        "IP Information\n"
        "OSPF interface commands\n"
        "Link state transmit delay\n"
+       "Seconds\n"
        "Address of interface")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_ge_cmd_vtysh, 
-       "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_cmd_vtysh, 
-       "distance <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n")
-
-DEFSH (VTYSH_OSPFD, area_range_advertise_cost_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area range for route summarization\n"
-       "area range prefix\n"
-       "advertise this range\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_remark_cmd_vtysh, 
-       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP extended access list\n"
-       "IP standard access list (expanded range)\n"
-       "IP extended access list (expanded range)\n"
-       "IP zebra access-list\n"
-       "Access list entry comment\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_routemap_cmd_vtysh, 
-       "no redistribute connected route-map WORD", 
+DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_rmap_cmd_vtysh, 
+       "no redistribute (connected|kernel|ospf|rip|static) route-map WORD", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
        "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged5_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path next-hop med", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
-
-DEFSH (VTYSH_OSPFD, no_ospf_distance_ospf_cmd_vtysh, 
-       "no distance ospf", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_md5_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(message-digest-key|) <1-255>", 
        "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "OSPF Distance\n")
-
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214>", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric for redistributed routes\n"
-       "OSPF default metric\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_neighbor_cmd_vtysh, 
-       "show ipv6 ospf6 neighbor", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Neighbor list\n"
-       )
-
-DEFSH (VTYSH_RIPD, key_string_cmd_vtysh, 
-       "key-string LINE", 
-       "Set key string\n"
-       "The key\n")
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, no_neighbor_enforce_multihop_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "enforce-multihop", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_version_cmd_vtysh, 
+       "neighbor A.B.C.D " "version (4|4-)", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Enforce EBGP neighbors perform multihop\n")
-
-DEFSH (VTYSH_RIPNGD, debug_ripng_events_cmd_vtysh, 
-       "debug ripng events", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng events\n")
-
-DEFSH (VTYSH_OSPF6D, no_redistribute_ospf6_cmd_vtysh, 
-       "no redistribute ospf6", 
-       "Negate a command or set its defaults\n"
-       "Redistribute control\n"
-       "OSPF6 route\n")
+       "Neighbor address\n"
+       "Neighbor's BGP version\n"
+       "Border Gateway Protocol 4\n"
+       "Multiprotocol Extensions for BGP-4(Old Draft)\n")
 
-DEFSH (VTYSH_BGPD, neighbor_description_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "description .LINE", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Neighbor specific description\n"
-       "Up to 80 characters describing this neighbor\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_cmd_vtysh, 
+       "default-information originate always metric-type (1|2)", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_route_pref_cmd_vtysh, 
-       "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255>", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_packet_send_recv_cmd_vtysh, 
+       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_packet_send_recv_cmd_vtysh, 
-       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)", 
        "Debugging functions\n"
        "OSPF information\n"
        "OSPF packets\n"
@@ -3148,706 +2120,445 @@ DEFSH (VTYSH_OSPFD, debug_ospf_packet_send_recv_cmd_vtysh,
        "OSPF all packets\n"
        "Packet sent\n"
        "Packet received\n"
-       "Detail information\n")
-
-DEFSH (VTYSH_OSPFD, area_range_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area range for route summarization\n"
-       "area range prefix\n")
+       "Detail Information\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_seq_le_ge_cmd_vtysh, 
-       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+DEFSH (VTYSH_BGPD, neighbor_transparent_nexthop_cmd_vtysh, 
+       "neighbor A.B.C.D " "transparent-nexthop", 
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Do not change nexthop even peer is EBGP peer\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (VTYSH_BGPD, undebug_bgp_filter_cmd_vtysh, 
+       "undebug bgp filters", 
+       "Disable debugging functions (see also 'debug')\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "BGP filters\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_any_mask_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_RIPD, accept_lifetime_duration_month_day_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Duration of the key\n"
+       "Duration seconds\n")
+
+DEFSH (VTYSH_OSPFD, no_ospf_router_id_cmd_vtysh, 
+       "no ospf router-id", 
+       "Negate a command or set its defaults\n"
+       "OSPF specific commands\n"
+       "router-id for the OSPF process\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_exact_cmd_vtysh, 
+       "no access-list WORD (deny|permit) A.B.C.D/M exact-match", 
        "Negate a command or set its defaults\n"
        "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
+       "IP zebra access-list name\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Any source host\n"
-       "Destination address\n"
-       "Destination Wildcard bits\n")
+       "Prefix to match. e.g. 10.0.0.0/8\n"
+       "Exact match of the prefixes\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_authentication_key_chain2_cmd_vtysh, 
-       "no ip rip authentication key-chain LINE", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication key-chain\n"
-       "name of key-chain\n")
+DEFSH (VTYSH_ZEBRA, debug_zebra_kernel_cmd_vtysh, 
+       "debug zebra kernel", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra between kernel interface\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_cidr_only_cmd_vtysh, 
-       "show ip bgp cidr-only", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_cmd_vtysh, 
+       "show ip ospf", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Display only routes with non-natural netmasks\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_description_cmd_vtysh, 
-       "no ipv6 prefix-list WORD description", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n")
+       "OSPF information\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_send_version_num_cmd_vtysh, 
-       "no ip rip send version (1|2)", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n"
-       "Version 1\n"
-       "Version 2\n")
+DEFSH (VTYSH_BGPD, neighbor_unsuppress_map_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "unsuppress-map WORD", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Route-map to selectively unsuppress suppressed routes\n"
+       "Name of route map\n")
 
-DEFSH (VTYSH_OSPFD, no_refresh_timer_cmd_vtysh, 
-       "no refresh timer", 
-       "Adjust refresh parameters\n"
-       "Unset refresh timer\n")
+DEFSH (VTYSH_OSPFD, ospf_retransmit_interval_cmd_vtysh, 
+       "ospf retransmit-interval <3-65535>", 
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n"
+       "Seconds\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_routemap_cmd_vtysh, 
-       "redistribute ospf6 route-map WORD", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_cmd_vtysh, 
+       "no redistribute static", 
+       "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Static routes\n")
 
-DEFSH (VTYSH_ZEBRA, no_shutdown_if_cmd_vtysh, 
-       "no shutdown", 
+DEFSH (VTYSH_RIPD, no_rip_default_information_originate_cmd_vtysh, 
+       "no default-information originate", 
        "Negate a command or set its defaults\n"
-       "Shutdown the selected interface\n")
+       "Control distribution of default route\n"
+       "Distribute a default route\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_soft_in_cmd_vtysh, 
-       "clear ip bgp view WORD * soft in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_BGPD, no_dump_bgp_all_cmd_vtysh, 
+       "no dump bgp all [PATH] [INTERVAL]", 
+       "Negate a command or set its defaults\n"
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump all BGP packets\n")
 
-DEFSH (VTYSH_BGPD, show_ip_extcommunity_list_arg_cmd_vtysh, 
-       "show ip extcommunity-list (<1-199>|WORD)", 
+DEFSH (VTYSH_BGPD, neighbor_advertise_interval_cmd_vtysh, 
+       "neighbor A.B.C.D " "advertisement-interval <0-600>", 
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Minimum interval between sending BGP routing updates\n"
+       "time in seconds\n")
+
+DEFSH (VTYSH_OSPFD, show_ip_ospf_interface_cmd_vtysh, 
+       "show ip ospf interface [INTERFACE]", 
        "Show running system information\n"
        "IP information\n"
-       "List extended-community list\n"
-       "Extcommunity-list number\n"
-       "Extcommunity-list name\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n")
+       "OSPF information\n"
+       "Interface information\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_exact_cmd_vtysh, 
-       "no access-list WORD (deny|permit) A.B.C.D/M exact-match", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_cmd_vtysh, 
+       "access-list WORD (deny|permit) A.B.C.D/M", 
        "Add an access list entry\n"
        "IP zebra access-list name\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n"
-       "Exact match of the prefixes\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_soft_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D soft in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_OSPFD, no_ip_ospf_cost_addr_cmd_vtysh, 
-       "no ip ospf cost A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Address of interface")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, rmap_onmatch_next_cmd_vtysh, 
-       "on-match next", 
-       "Exit policy on matches\n"
-       "Next clause\n")
-
-DEFSH (VTYSH_ZEBRA, ipv6_route_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE)", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n")
-
-DEFSH (VTYSH_BGPD, neighbor_enforce_multihop_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "enforce-multihop", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Enforce EBGP neighbors perform multihop\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_topology_router_cmd_vtysh, 
-       "show ipv6 ospf6 topology (A.B.C.D|<0-4294967295>|detail)", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Inter Area topology information\n"
-       "Specify Router-ID\n"
-       "Specify Router-ID\n"
-       "Detailed information\n"
-       )
+       "Prefix to match. e.g. 10.0.0.0/8\n")
 
-DEFSH (VTYSH_OSPFD, debug_ospf_packet_all_cmd_vtysh, 
-       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n")
+DEFSH (VTYSH_RIPD, rip_distance_cmd_vtysh, 
+       "distance <1-255>", 
+       "Administrative distance\n"
+       "Distance value\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp <1-65535> in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp * in prefix-filter", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
+       "Clear all peers\n"
        "Soft reconfig inbound update\n"
        "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_match_aspath_cmd_vtysh, 
-       "no match as-path", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match BGP AS path list\n")
-
-DEFSH (VTYSH_RIPD, no_debug_rip_events_cmd_vtysh, 
-       "no debug rip events", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP events\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_network_mask_natural_cmd_vtysh, 
-       "no network A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "Network number\n")
-
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged5_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path next-hop med", 
+DEFSH (VTYSH_BGPD, neighbor_dont_capability_negotiate_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "dont-capability-negotiate", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
-
-DEFSH (VTYSH_RIPD, rip_default_information_originate_cmd_vtysh, 
-       "default-information originate", 
-       "Control distribution of default route\n"
-       "Distribute a default route\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Do not perform capability negotiation\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_abr_type_cmd_vtysh, 
-       "no ospf abr-type (cisco|ibm|shortcut)", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_cmd_vtysh, 
+       "no ip prefix-list WORD", 
        "Negate a command or set its defaults\n"
-       "OSPF specific commands\n"
-       "Set OSPF ABR type\n"
-       "Alternative ABR,  cisco implementation\n"
-       "Alternative ABR,  IBM implementation\n"
-       "Shortcut ABR\n")
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv6_rmap_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf6|ripng|static) route-map WORD", 
+DEFSH (VTYSH_BGPD, no_bgp_default_ipv4_unicast_cmd_vtysh, 
+       "no bgp default ipv4-unicast", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "BGP specific commands\n"
+       "Configure BGP defaults\n"
+       "Activate ipv4-unicast for a peer by default\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_transmit_delay_cmd_vtysh, 
-       "no ospf transmit-delay", 
+DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_expanded_cmd_vtysh, 
+       "no ip extcommunity-list <100-199> (deny|permit) .LINE", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, ipv6_access_list_remark_cmd_vtysh, 
-       "ipv6 access-list WORD remark .LINE", 
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Access list entry comment\n"
-       "Comment up to 100 characters\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_detail_cmd_vtysh, 
-       "show ipv6 prefix-list detail", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Detail of prefix lists\n")
-
-DEFSH (VTYSH_BGPD, ip_extcommunity_list_standard_cmd_vtysh, 
-       "ip extcommunity-list <1-99> (deny|permit) .AA:NN", 
        "IP information\n"
        "Add a extended community list entry\n"
-       "Extended Community list number (standard)\n"
+       "Extended Community list number (expanded)\n"
        "Specify community to reject\n"
        "Specify community to accept\n"
-       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
+       "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_reachable_time_cmd_vtysh, 
-       "no ipv6 nd reachable-time", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Reachable time\n")
+DEFSH (VTYSH_RIPD, accept_lifetime_month_day_month_day_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Month of the year to expire\n"
+       "Day of th month to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community3_exact_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+DEFSH (VTYSH_OSPFD, no_ospf_default_information_originate_cmd_vtysh, 
+       "no default-information originate", 
+       "Negate a command or set its defaults\n"
+       "Control distribution of default information\n"
+       "Distribute a default route\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_ge_le_cmd_vtysh, 
-       "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", 
+DEFSH (VTYSH_BGPD, no_neighbor_activate_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "activate", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Enable the Address Family for this Neighbor\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_nomask_cmd_vtysh, 
+       "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", 
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "Address to match\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_retransmit_interval_cmd_vtysh, 
-       "no ip ospf retransmit-interval", 
+DEFSH (VTYSH_RIPD, no_rip_timers_cmd_vtysh, 
+       "no timers basic", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community2_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_mask_as_set_summary_cmd_vtysh, 
-       "aggregate-address A.B.C.D A.B.C.D as-set summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
+       "Adjust routing timers\n"
+       "Basic routing protocol update timers\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_mask_cmd_vtysh, 
-       "no aggregate-address A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_BGPD, no_set_community_cmd_vtysh, 
+       "no set community", 
        "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_prefix_longer_cmd_vtysh, 
-       "show ip bgp A.B.C.D/M longer-prefixes", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Display route and more specific routes\n")
-
-DEFSH (VTYSH_BGPD, set_metric_cmd_vtysh, 
-       "set metric (<0-4294967295>|<+/-metric>)", 
        "Set values in destination routing protocol\n"
-       "Metric value for destination routing protocol\n"
-       "Metric value\n"
-       "Add or subtract metric\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "BGP community attribute\n")
 
-DEFSH (VTYSH_BGPD, ipv6_bgp_neighbor_routes_cmd_vtysh, 
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_cmd_vtysh, 
+       "distance <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_description_arg_cmd_vtysh, 
-       "no ip prefix-list WORD description .LINE", 
+DEFSH (VTYSH_BGPD, no_neighbor_passive_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "passive", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n"
-       "Up to 80 characters describing this prefix-list\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbors_cmd_vtysh, 
-       "show ip bgp neighbors", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
-
-DEFSH (VTYSH_BGPD, neighbor_advertise_interval_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "advertisement-interval <0-600>", 
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Minimum interval between sending BGP routing updates\n"
-       "time in seconds\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Don't send open messages to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_soft_cmd_vtysh, 
-       "clear ip bgp external soft", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n")
+       "BGP neighbor address to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_remove_private_as_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "remove-private-AS", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Remove private AS number from outbound updates\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_remark_cmd_vtysh, 
+       "access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE", 
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP extended access list\n"
+       "IP standard access list (expanded range)\n"
+       "IP extended access list (expanded range)\n"
+       "IP zebra access-list\n"
+       "Access list entry comment\n"
+       "Comment up to 100 characters\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_send_version_cmd_vtysh, 
-       "no ip rip send version", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPNGD, show_ipv6_ripng_cmd_vtysh, 
+       "show ipv6 ripng", 
+       "Show running system information\n"
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_external_in_prefix_filter_cmd_vtysh, 
-       "clear bgp external in prefix-filter", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Show RIPng routes\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_route_cmd_vtysh, 
-       "show ip bgp A.B.C.D", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_adv_router_dump_cmd_vtysh, 
+       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*|HEX) (A.B.C.D|*) (A.B.C.D|*) (dump|detail|)", 
        "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Network in the BGP routing table to display\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "LSA Database\n"
+       "Router-LSA\n"
+       "Network-LSA\n"
+       "AS-External-LSA\n"
+       "Intra-Area-Prefix-LSA\n"
+       "Inter-Area-Router-LSA\n"
+       "Inter-Area-Prefix-LSA\n"
+       "Link-LSA\n"
+       "All LS Type\n"
+       "Specify LS Type by Hex\n"
+       "Link State ID\n"
+       "All Link State ID\n"
+       "Advertising Router\n"
+       "All Advertising Router\n"
+       "Dump raw LSA data in Hex\n"
+       "show detail of LSAs\n"
+       )
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ipv6_prefix_list_name_cmd_vtysh, 
-       "clear ipv6 prefix-list WORD", 
-       "Reset functions\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n")
+DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_cmd_vtysh, 
+       "no redistribute (connected|kernel|ospf|rip|static)", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_timers_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "timers", 
+DEFSH (VTYSH_OSPFD, no_set_metric_type_cmd_vtysh, 
+       "no set metric-type", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP per neighbor timers\n")
+       "Set values in destination routing protocol\n"
+       "Type of metric for destination routing protocol\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_soft_in_cmd_vtysh, 
-       "clear ip bgp peer-group WORD soft in", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_set_ip_nexthop_val_cmd_vtysh, 
+       "no set ip next-hop A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Next hop address\n"
+       "IP address of next hop\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_routemap_cmd_vtysh, 
-       "default-information originate always metric-type (1|2) route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_OSPF6D, show_debug_ospf6_cmd_vtysh, 
+      "show debugging ospf6", 
+      "Show running system information\n"
+      "Debugging functions (see also 'undebug')\n"
+      "Open Shortest Path First (OSPF) for IPv6\n")
 
-DEFSH (VTYSH_BGPD, ip_extcommunity_list_expanded_cmd_vtysh, 
-       "ip extcommunity-list <100-199> (deny|permit) .LINE", 
+DEFSH (VTYSH_BGPD, no_ip_community_list_standard_cmd_vtysh, 
+       "no ip community-list <1-99> (deny|permit) .AA:NN", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Add a extended community list entry\n"
-       "Extended Community list number (expanded)\n"
+       "Add a community list entry\n"
+       "Community list number (standard)\n"
        "Specify community to reject\n"
        "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, ipv6_access_list_exact_cmd_vtysh, 
-       "ipv6 access-list WORD (deny|permit) X:X::X:X/M exact-match", 
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n"
-       "Exact match of the prefixes\n")
+DEFSH (VTYSH_RIPD, send_lifetime_duration_month_day_cmd_vtysh, 
+       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Duration of the key\n"
+       "Duration seconds\n")
 
-DEFSH (VTYSH_BGPD, show_ip_community_list_arg_cmd_vtysh, 
-       "show ip community-list (<1-199>|WORD)", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_prefix_longer_cmd_vtysh, 
+       "show ip prefix-list WORD A.B.C.D/M longer", 
        "Show running system information\n"
        "IP information\n"
-       "List community-list\n"
-       "Community-list number\n"
-       "Community-list name\n")
-
-DEFSH (VTYSH_BGPD, bgp_timers_cmd_vtysh, 
-       "timers bgp <0-65535> <0-65535>", 
-       "Adjust routing timers\n"
-       "BGP timers\n"
-       "Keepalive interval\n"
-       "Holdtime\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Lookup longer prefix\n")
 
-DEFSH (VTYSH_RIPD, rip_neighbor_cmd_vtysh, 
-       "neighbor A.B.C.D", 
-       "Specify a neighbor router\n"
-       "Neighbor address\n")
+DEFSH (VTYSH_BGPD, bgp_network_mask_cmd_vtysh, 
+       "network A.B.C.D mask A.B.C.D", 
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Network mask\n"
+       "Network mask\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_prefix_first_match_cmd_vtysh, 
-       "show ipv6 prefix-list WORD X:X::X:X/M first-match", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_detail_name_cmd_vtysh, 
+       "show ip prefix-list detail WORD", 
        "Show running system information\n"
-       "IPv6 information\n"
+       "IP information\n"
        "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "First matched prefix\n")
-
-DEFSH (VTYSH_BGPD, neighbor_shutdown_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "shutdown", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Administratively shut down this neighbor\n")
+       "Detail of prefix lists\n"
+       "Name of a prefix list\n")
 
-DEFSH (VTYSH_BGPD, no_debug_bgp_fsm_cmd_vtysh, 
-       "no debug bgp fsm", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_cost_cmd_vtysh, 
+       "no ip ospf cost", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "Finite State Machine\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interface cost\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535> soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_detail_all_cmd_vtysh, 
+       "show ip ospf neighbor detail all", 
+       "Show running system information\n"
+       "IP information\n"
+       "OSPF information\n"
+       "Neighbor list\n"
+       "detail of all neighbors\n"
+       "include down status neighbor\n")
 
-DEFSH (VTYSH_BGPD, neighbor_weight_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "weight <0-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Set default weight for routes from this neighbor\n"
-       "default weight\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_packet_send_recv_detail_cmd_vtysh, 
+       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)", 
+       "Debugging functions\n"
+       "OSPF information\n"
+       "OSPF packets\n"
+       "OSPF Hello\n"
+       "OSPF Database Description\n"
+       "OSPF Link State Request\n"
+       "OSPF Link State Update\n"
+       "OSPF Link State Acknowledgment\n"
+       "OSPF all packets\n"
+       "Packet sent\n"
+       "Packet received\n"
+       "Detail Information\n")
 
-DEFSH (VTYSH_BGPD, neighbor_transparent_nexthop_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "transparent-nexthop", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Do not change nexthop even peer is EBGP peer\n")
+DEFSH (VTYSH_BGPD, bgp_network_backdoor_cmd_vtysh, 
+       "network A.B.C.D/M backdoor", 
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Specify a BGP backdoor route\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_soft_cmd_vtysh, 
-       "clear ip bgp A.B.C.D soft", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_cmd_vtysh, 
+       "clear ip bgp view WORD *", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig\n")
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh, 
-       "show ip bgp vpnv4 all neighbors A.B.C.D", 
+DEFSH (VTYSH_BGPD, no_match_ecommunity_val_cmd_vtysh, 
+       "no match extcommunity (<1-99>|<100-199>|WORD)", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match BGP/VPN extended community list\n"
+       "Extended community-list number (standard)\n"
+       "Extended community-list number (expanded)\n"
+       "Extended community-list name\n")
+
+DEFSH (VTYSH_OSPFD, show_ip_ospf_route_cmd_vtysh, 
+       "show ip ospf route", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n")
+       "OSPF information\n"
+       "OSPF routing table\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community_list_cmd_vtysh, 
-       "show ipv6 bgp community-list WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_prefix_longer_cmd_vtysh, 
+       "show ip bgp flap-statistics A.B.C.D/M longer-prefixes", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_soft_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast soft in", 
-       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_le_cmd_vtysh, 
-       "no ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
+       "Display flap statistics of routes\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "Display route and more specific routes\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_bestpath_med2_cmd_vtysh, 
-       "no bgp bestpath med confed missing-as-worst", 
+DEFSH (VTYSH_BGPD, no_set_weight_cmd_vtysh, 
+       "no set weight", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Compare MED among confederation paths\n"
-       "Treat missing MED as the least preferred one\n")
+       "Set values in destination routing protocol\n"
+       "BGP weight for routing table\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_priority_cmd_vtysh, 
-       "no ospf priority", 
+DEFSH (VTYSH_BGPD, no_match_community_cmd_vtysh, 
+       "no match community", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Router priority\n")
-
-DEFSH (VTYSH_BGPD, bgp_network_mask_natural_cmd_vtysh, 
-       "network A.B.C.D", 
-       "Specify a network to announce via BGP\n"
-       "Network number\n")
-
-DEFSH (VTYSH_OSPFD, area_stub_nosum_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) stub no-summary", 
-       "OSPF stub parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area as stub\n"
-       "Do not inject inter-area routes into stub\n")
+       "Match values from routing table\n"
+       "Match BGP community list\n")
 
-DEFSH (VTYSH_BGPD, no_synchronization_cmd_vtysh, 
-       "no synchronization", 
-       "Negate a command or set its defaults\n"
-       "Perform IGP synchronization\n")
+DEFSH (VTYSH_BGPD, neighbor_distribute_list_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "distribute-list (<1-199>|<1300-2699>|WORD) (in|out)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Filter updates to/from this neighbor\n"
+       "IP access-list number\n"
+       "IP access-list number (expanded range)\n"
+       "IP Access-list name\n"
+       "Filter incoming updates\n"
+       "Filter outgoing updates\n")
 
-DEFSH (VTYSH_OSPFD, no_area_range_not_advertise_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M not-advertise", 
+DEFSH (VTYSH_BGPD, no_set_aggregator_as_cmd_vtysh, 
+       "no set aggregator as", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "OSPF area range for route DoNotAdvertise\n"
-       "area range prefix\n"
-       "do not advertise this range\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, set_ip_nexthop_cmd_vtysh, 
-       "set ip next-hop A.B.C.D", 
        "Set values in destination routing protocol\n"
-       "IP information\n"
-       "Next hop address\n"
-       "IP address of next hop\n")
-
-DEFSH (VTYSH_RIPD, no_rip_version_val_cmd_vtysh, 
-       "no version <1-2>", 
-       "Negate a command or set its defaults\n"
-       "Set routing protocol version\n"
-       "version\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_scan_time_cmd_vtysh, 
-       "no bgp scan-time", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Configure background scanner interval\n")
+       "BGP aggregator attribute\n"
+       "AS number of aggregator\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_metric_cmd_vtysh, 
-       "no redistribute connected metric", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Metric\n")
+DEFSH (VTYSH_BGPD, bgp_damp_set2_cmd_vtysh, 
+       "bgp dampening <1-45>", 
+       "BGP Specific commands\n"
+       "Enable route-flap dampening\n"
+       "Half-life time for the penalty\n")
 
 DEFSH (VTYSH_OSPF6D, debug_ospf6_all_cmd_vtysh, 
        "debug ospf6 all", 
@@ -3855,450 +2566,183 @@ DEFSH (VTYSH_OSPF6D, debug_ospf6_all_cmd_vtysh,
        "Open Shortest Path First (OSPF) for IPv6\n"
        "Turn on ALL OSPFv3 debugging\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_authentication_key_addr_cmd_vtysh, 
-       "no ip ospf authentication-key A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "Address of interface")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_route_cmd_vtysh, 
-       "no route IPV6ADDR", 
-       "Negate a command or set its defaults\n"
-       "Static route setup\n"
-       "Delete static RIPng route announcement\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_nsm_sub_cmd_vtysh, 
-       "debug ospf nsm (status|events|timers)", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Neighbor State Machine\n"
-       "NSM Status Information\n"
-       "NSM Event Information\n"
-       "NSM Timer Information\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_soft_out_cmd_vtysh, 
-       "clear ip bgp <1-65535> vpnv4 unicast soft out", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_statistics_cmd_vtysh, 
+       "show ip bgp flap-statistics", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, no_debug_bgp_all_cmd_vtysh, 
-       "no debug all bgp", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "Enable all debugging\n"
-       "BGP information\n")
+       "Display flap statistics of routes\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_soft_out_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast soft out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_soft_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
+       "BGP neighbor address to clear\n"
        "Address family\n"
        "Address Family Modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_distance_cmd_vtysh, 
-       "no distance bgp <1-255> <1-255> <1-255>", 
-       "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "BGP distance\n"
-       "Distance for routes external to the AS\n"
-       "Distance for routes internal to the AS\n"
-       "Distance for local routes\n")
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_RIPNGD, debug_ripng_packet_cmd_vtysh, 
+       "debug ripng packet", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng packet\n")
 
-DEFSH (VTYSH_RIPD, no_rip_timers_cmd_vtysh, 
+DEFSH (VTYSH_RIPNGD, no_ripng_timers_cmd_vtysh, 
        "no timers basic", 
        "Negate a command or set its defaults\n"
-       "Adjust routing timers\n"
-       "Basic routing protocol update timers\n")
+       "RIPng timers setup\n"
+       "Basic timer\n")
 
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_passive_cmd_vtysh, 
-       "ipv6 ospf6 passive", 
+DEFSH (VTYSH_RIPNGD, ripng_route_cmd_vtysh, 
+       "route IPV6ADDR", 
+       "Static route setup\n"
+       "Set static RIPng route announcement\n")
+
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_advertise_force_prefix_cmd_vtysh, 
+       "ipv6 ospf6 advertise force-prefix", 
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "passive interface: No Adjacency will be formed on this I/F\n"
+       "Advertising options\n"
+       "Force advertising prefix,  applicable if Loopback or P-to-P\n"
        )
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_external_intra_cmd_vtysh, 
-       "distance ospf inter-area <1-255> external <1-255> intra-area <1-255>", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D out", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP neighbor address to clear\n"
+       "Soft reconfig outbound update\n")
+
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_inter_intra_cmd_vtysh, 
+       "distance ospf external <1-255> inter-area <1-255> intra-area <1-255>", 
        "Define an administrative distance\n"
        "OSPF Administrative distance\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
        "External routes\n"
        "Distance for external routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n"
        "Intra-area routes\n"
        "Distance for intra-area routes\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_metric_routemap_cmd_vtysh, 
-       "default-information originate always metric-type (1|2) metric <0-16777214> route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_RIPNGD, no_debug_ripng_events_cmd_vtysh, 
-       "no debug ripng events", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng events\n")
-
-DEFSH (VTYSH_RIPD, accept_lifetime_duration_month_day_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Duration of the key\n"
-       "Duration seconds\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_metric_routemap_cmd_vtysh, 
-       "redistribute ospf6 metric <0-16> route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_match_metric_cmd_vtysh, 
-       "no match metric", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match metric of route\n")
-
-DEFSH (VTYSH_RIPD, match_ip_next_hop_cmd_vtysh, 
-       "match ip next-hop WORD", 
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match next-hop address of route\n"
-       "IP access-list name\n")
-
-DEFSH (VTYSH_ZEBRA, ip_irdp_cmd_vtysh, 
-       "ip irdp", 
-       "IP information\n"
-       "ICMP Router discovery on this interface\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_summary_only_cmd_vtysh, 
-       "aggregate-address A.B.C.D/M summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_in_prefix_filter_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535> in prefix-filter", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_network_route_map_cmd_vtysh, 
-       "no network A.B.C.D/M route-map WORD", 
-       "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_instance_neighbors_peer_cmd_vtysh, 
-       "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X)", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_cmd_vtysh, 
-       "no redistribute connected", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_summary_as_set_cmd_vtysh, 
-       "aggregate-address A.B.C.D/M summary-only as-set", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_in_cmd_vtysh, 
-       "clear ip bgp external in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_hello_interval_addr_cmd_vtysh, 
+       "ip ospf hello-interval <1-65535> A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between HELLO packets\n"
+       "Seconds\n"
+       "Address of interface")
 
-DEFSH (VTYSH_RIPD, no_debug_rip_packet_direct_cmd_vtysh, 
-       "no debug rip packet (recv|send)", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, debug_bgp_update_cmd_vtysh, 
+       "debug bgp updates", 
        "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n"
-       "RIP option set for receive packet\n"
-       "RIP option set for send packet\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community2_exact_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
        "BGP information\n"
-       "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, no_neighbor_nexthop_self_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "next-hop-self", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Disable the next hop calculation for this neighbor\n")
-
-DEFSH (VTYSH_OSPFD, area_range_not_advertise_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M not-advertise", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "OSPF area range for route DoNotAdvertise\n"
-       "area range prefix\n"
-       "do not advertise this range\n")
+       "BGP updates\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_authentication_mode_type_cmd_vtysh, 
-       "no ip rip authentication mode (md5|text)", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_ge_cmd_vtysh, 
+       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32>", 
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n"
-       "Keyed message digest\n"
-       "Clear text authentication\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_summary_cmd_vtysh, 
-       "show ipv6 prefix-list summary", 
-       "Show running system information\n"
-       "IPv6 information\n"
        "Build a prefix list\n"
-       "Summary of prefix lists\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_any_cmd_vtysh, 
-       "no access-list WORD (deny|permit) any", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP zebra access-list name\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n")
-
-DEFSH (VTYSH_BGPD, bgp_bestpath_med3_cmd_vtysh, 
-       "bgp bestpath med missing-as-worst confed", 
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Treat missing MED as the least preferred one\n"
-       "Compare MED among confederation paths\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community4_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_soft_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D soft out", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_retransmit_interval_addr_cmd_vtysh, 
-       "ip ospf retransmit-interval <3-65535> A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "Seconds\n"
-       "Address of interface")
+       "BGP neighbor address to clear\n"
+       "Soft reconfig\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_RIPD, match_ip_address_cmd_vtysh, 
-       "match ip address WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_address_prefix_list_val_cmd_vtysh, 
+       "no match ip address prefix-list WORD", 
+       "Negate a command or set its defaults\n"
        "Match values from routing table\n"
        "IP information\n"
        "Match address of route\n"
-       "IP access-list name\n")
+       "Match entries of prefix-lists\n"
+       "IP prefix-list name\n")
 
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_deadinterval_cmd_vtysh, 
-       "ipv6 ospf6 dead-interval ROUTER_DEAD_INTERVAL", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_topology_router_lsid_cmd_vtysh, 
+       "show ipv6 ospf6 topology (A.B.C.D|<0-4294967295>) (A.B.C.D|<0-4294967295>)", 
+       "Show running system information\n"
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "Interval after which a neighbor is declared dead\n"
-       "<1-65535> Seconds\n"
+       "Inter Area topology information\n"
+       "Specify Router-ID\n"
+       "Specify Router-ID\n"
+       "Specify Link State ID\n"
+       "Specify Link State ID\n"
        )
 
-DEFSH (VTYSH_OSPFD, debug_ospf_zebra_sub_cmd_vtysh, 
-       "debug ospf zebra (interface|redistribute)", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
-
-DEFSH (VTYSH_BGPD, match_aspath_cmd_vtysh, 
-       "match as-path WORD", 
-       "Match values from routing table\n"
-       "Match BGP AS path list\n"
-       "AS path access-list name\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_cidr_only_cmd_vtysh, 
-       "show ip bgp flap-statistics cidr-only", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD, ip_rip_authentication_string_cmd_vtysh, 
+       "ip rip authentication string LINE", 
        "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display only routes with non-natural netmasks\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_description_arg_cmd_vtysh, 
-       "no ipv6 prefix-list WORD description .LINE", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n"
-       "Up to 80 characters describing this prefix-list\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication string\n"
+       "Authentication string\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_ra_interval_cmd_vtysh, 
-       "no ipv6 nd ra-interval", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_metric_routemap_cmd_vtysh, 
+       "no redistribute ospf6 metric <0-16> route-map WORD", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Router Advertisement interval\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_soft_cmd_vtysh, 
-       "clear ip bgp * soft", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_metric_routemap_cmd_vtysh, 
-       "redistribute static metric <0-16> route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Static routes\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n"
        "Metric\n"
        "Metric value\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv6_rmap_metric_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf6|ripng|static) route-map WORD metric <0-4294967295>", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
+DEFSH (VTYSH_BGPD, bgp_timers_cmd_vtysh, 
+       "timers bgp <0-65535> <0-65535>", 
+       "Adjust routing timers\n"
+       "BGP timers\n"
+       "Keepalive interval\n"
+       "Holdtime\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_route_map_cmd_vtysh, 
-       "show bgp ipv6 route-map WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
+DEFSH (VTYSH_BGPD, set_metric_cmd_vtysh, 
+       "set metric (<0-4294967295>|<+/-metric>)", 
+       "Set values in destination routing protocol\n"
+       "Metric value for destination routing protocol\n"
+       "Metric value\n"
+       "Add or subtract metric\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_next_hop_prefix_list_cmd_vtysh, 
-       "no match ip next-hop prefix-list", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_nsm_sub_cmd_vtysh, 
+       "debug ospf nsm (status|events|timers)", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Neighbor State Machine\n"
+       "NSM Status Information\n"
+       "NSM Event Information\n"
+       "NSM Timer Information\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_set_peer_group_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "peer-group WORD", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Member of the peer-group\n"
-       "peer-group name\n")
+DEFSH (VTYSH_OSPFD, auto_cost_reference_bandwidth_cmd_vtysh, 
+       "auto-cost reference-bandwidth <1-4294967>", 
+       "Calculate OSPF interface cost according to bandwidth\n"
+       "Use reference bandwidth method to assign OSPF cost\n"
+       "The reference bandwidth in terms of Mbits per second\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_neighbor_routes_cmd_vtysh, 
-       "show bgp neighbors (A.B.C.D|X:X::X:X) routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+DEFSH (VTYSH_OSPFD, no_refresh_timer_cmd_vtysh, 
+       "no refresh timer", 
+       "Adjust refresh parameters\n"
+       "Unset refresh timer\n")
+
+DEFSH (VTYSH_BGPD, no_ip_as_path_all_cmd_vtysh, 
+       "no ip as-path access-list WORD", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "BGP autonomous system path filter\n"
+       "Specify an access list name\n"
+       "Regular expression access list name\n")
 
 DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_route_prefix_cmd_vtysh, 
        "show ipv6 ospf6 route (X::X|detail)", 
@@ -4309,576 +2753,397 @@ DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_route_prefix_cmd_vtysh,
        "match IPv6 prefix\n"
        )
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_cmd_vtysh, 
-       "redistribute bgp", 
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n")
+DEFSH (VTYSH_OSPF6D, flap_damping_route_cmd_vtysh, 
+       "flap-damping route <0-4294967295> <0-4294967295> "
+                          "<0-4294967295> <0-4294967295>", 
+       "enable flap dampening\n"
+       "enable route flap dampening\n"
+       "half-life in second\n"
+       "reuse value\n"
+       "suppress value\n"
+       "t-hold in second (maximum time that the target can be damped)\n"
+      )
 
-DEFSH (VTYSH_ZEBRA, ip_irdp_multicast_cmd_vtysh, 
-       "ip irdp multicast", 
-       "IP information\n"
-       "ICMP Router discovery on this interface\n"
-       "Send IRDP advertisement to the multicast address\n")
+DEFSH (VTYSH_BGPD, match_origin_cmd_vtysh, 
+       "match origin (egp|igp|incomplete)", 
+       "Match values from routing table\n"
+       "BGP origin code\n"
+       "remote EGP\n"
+       "local IGP\n"
+       "unknown heritage\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_host_mask_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", 
+       "Negate a command or set its defaults\n"
        "Add an access list entry\n"
        "IP extended access list\n"
        "IP extended access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "Any Internet Protocol\n"
-       "A single source host\n"
        "Source address\n"
+       "Source wildcard bits\n"
        "Destination address\n"
        "Destination Wildcard bits\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_authtype_authkey_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(authentication-key|)", 
+DEFSH (VTYSH_BGPD, no_neighbor_timers_connect_cmd_vtysh, 
+       "no neighbor A.B.C.D " "timers connect", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n"
-       "Authentication password (key)\n" "The OSPF password (key)")
-
-DEFSH (VTYSH_BGPD, debug_bgp_events_cmd_vtysh, 
-       "debug bgp events", 
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP events\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "BGP per neighbor timers\n"
+       "BGP connect timer\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_param1_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+DEFSH (VTYSH_BGPD, set_aspath_prepend_cmd_vtysh, 
+       "set as-path prepend .<1-65535>", 
+       "Set values in destination routing protocol\n"
+       "Prepend string for a BGP AS-path attribute\n"
+       "Prepend to the as-path\n"
+       "AS number\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_ge_cmd_vtysh, 
-       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32>", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_in_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) in", 
+       "Reset functions\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
-
-DEFSH (VTYSH_RIPNGD, debug_ripng_packet_cmd_vtysh, 
-       "debug ripng packet", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng packet\n")
+       "BGP information\n"
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_out_cmd_vtysh, 
-       "clear ip bgp <1-65535> out", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_regexp_cmd_vtysh, 
+       "show ip bgp regexp .LINE", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig outbound update\n")
+       "Display routes matching the AS path regular expression\n"
+       "A regular-expression to match the BGP AS paths\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_metric_cmd_vtysh, 
-       "no redistribute static metric", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n"
-       "Metric\n")
+DEFSH (VTYSH_OSPF6D, reload_cmd_vtysh, 
+       "reload", 
+       "Reloads\n")
 
-DEFSH (VTYSH_OSPFD, no_interface_ip_ospf_authentication_cmd_vtysh, 
-       "no ip ospf authentication", 
+DEFSH (VTYSH_BGPD, no_neighbor_weight_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "weight", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Set default weight for routes from this neighbor\n")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_routemap_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) route-map WORD", 
+DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_rmap_cmd_vtysh, 
+       "redistribute (connected|kernel|ospf|rip|static) route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
        "Connected\n"
-       "Static routes\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
        "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
+       "Static routes\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community2_exact_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_in_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, no_neighbor_priority_pollinterval_cmd_vtysh, 
-       "no neighbor A.B.C.D priority <0-255> poll-interval <1-65535>", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
+DEFSH (VTYSH_BGPD, dump_bgp_routes_interval_cmd_vtysh, 
+       "dump bgp routes-mrt PATH INTERVAL", 
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump whole BGP routing table\n"
+       "Output filename\n"
+       "Interval of output\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_external_soft_cmd_vtysh, 
-       "clear bgp external soft", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD, accept_lifetime_duration_day_month_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> duration <1-2147483646>", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Duration of the key\n"
+       "Duration seconds\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_dampened_paths_cmd_vtysh, 
+       "show ip bgp dampened-paths", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n")
+       "Display paths suppressed due to dampening\n")
 
-DEFSH (VTYSH_BGPD, no_ipv6_aggregate_address_cmd_vtysh, 
-       "no aggregate-address X:X::X:X/M", 
+DEFSH (VTYSH_RIPD, no_ip_rip_send_version_num_cmd_vtysh, 
+       "no ip rip send version (1|2)", 
        "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n"
+       "Version 1\n"
+       "Version 2\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_in_prefix_filter_cmd_vtysh, 
-       "clear bgp * in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_in_cmd_vtysh, 
+       "clear ip bgp peer-group WORD in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_timers_connect_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "timers connect <0-65535>", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "BGP per neighbor timers\n"
-       "BGP connect timer\n"
-       "Connect timer\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, no_auto_cost_reference_bandwidth_cmd_vtysh, 
-       "no auto-cost reference-bandwidth", 
+DEFSH (VTYSH_BGPD, no_ip_community_list_cmd_vtysh, 
+       "no ip community-list WORD (deny|permit) .AA:NN", 
        "Negate a command or set its defaults\n"
-       "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_cmd_vtysh, 
-       "show ip bgp", 
-       "Show running system information\n"
        "IP information\n"
-       "BGP information\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_message_digest_key_addr_cmd_vtysh, 
-       "ip ospf message-digest-key <1-255> md5 KEY A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n"
-       "Use MD5 algorithm\n"
-       "The OSPF password (key)"
-       "Address of interface")
-
-DEFSH (VTYSH_BGPD, show_debugging_bgp_cmd_vtysh, 
-       "show debugging bgp", 
-       "Show running system information\n"
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n")
-
-DEFSH (VTYSH_OSPFD|VTYSH_OSPF6D, ospf6_routemap_set_metric_type_cmd_vtysh, 
-       "set metric-type (type-1|type-2)", 
-       "Set value\n"
-       "Type of metric\n"
-       "OSPF6 external type 1 metric\n"
-       "OSPF6 external type 2 metric\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_mask_summary_only_cmd_vtysh, 
-       "aggregate-address A.B.C.D A.B.C.D summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n")
+       "Add a community list entry\n"
+       "Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_passive_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "passive", 
+DEFSH (VTYSH_BGPD, no_neighbor_nexthop_self_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "next-hop-self", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Don't send open messages to this neighbor\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_cmd_vtysh, 
-       "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D A.B.C.D", 
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Address to match\n"
-       "Wildcard bits\n")
-
-DEFSH (VTYSH_ZEBRA, no_zebra_interface_cmd_vtysh, 
-       "no interface IFNAME", 
-       "Delete a pseudo interface's configuration\n"
-       "Interface's name\n")
-
-DEFSH (VTYSH_RIPD, debug_rip_zebra_cmd_vtysh, 
-       "debug rip zebra", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP and ZEBRA communication\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_mask_any_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Source address\n"
-       "Source wildcard bits\n"
-       "Any destination host\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Disable the next hop calculation for this neighbor\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_paths_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) paths", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_cmd_vtysh, 
+       "show ipv6 ospf6 database", 
        "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Path information\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "LSA Database\n"
+       )
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_metric_routemap_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) metric <0-16777214> route-map WORD", 
+DEFSH (VTYSH_OSPFD, no_ospf_redistribute_source_cmd_vtysh, 
+       "no redistribute (kernel|connected|static|rip|bgp)", 
+       "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Connected\n"
        "Static routes\n"
        "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "OSPF exterior metric type for redistributed routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "Metric for redistributed routes\n"
-       "OSPF default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Border Gateway Protocol (BGP)\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_soft_out_cmd_vtysh, 
-       "clear bgp peer-group WORD soft out", 
-       "Reset functions\n"
+DEFSH (VTYSH_OSPFD, ospf_network_cmd_vtysh, 
+       "ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)", 
+       "OSPF interface commands\n"
+       "Network type\n"
+       "Specify OSPF broadcast multi-access network\n"
+       "Specify OSPF NBMA network\n"
+       "Specify OSPF point-to-multipoint network\n"
+       "Specify OSPF point-to-point network\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_tags_cmd_vtysh, 
+       "show ip bgp vpnv4 all tags", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "Display BGP tags for prefixes\n")
 
-DEFSH (VTYSH_OSPFD, no_area_filter_list_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) filter-list prefix WORD (in|out)", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_fsm_cmd_vtysh, 
+       "no debug bgp fsm", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Filter networks between OSPF areas\n"
-       "Filter prefixes between OSPF areas\n"
-       "Name of an IP prefix-list\n"
-       "Filter networks sent to this area\n"
-       "Filter networks sent from this area\n")
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "Finite State Machine\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_route_cmd_vtysh, 
-       "show ipv6 bgp X:X::X:X", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_prefix_cmd_vtysh, 
+       "show ip bgp flap-statistics A.B.C.D/M", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (VTYSH_BGPD, bgp_network_mask_natural_backdoor_cmd_vtysh, 
-       "network A.B.C.D backdoor", 
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Specify a BGP backdoor route\n")
-
-DEFSH (VTYSH_RIPD, rip_route_cmd_vtysh, 
-       "route A.B.C.D/M", 
-       "RIP static route configuration\n"
-       "IP prefix <network>/<length>\n")
+       "Display flap statistics of routes\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_cost_cmd_vtysh, 
-       "no ospf cost", 
+DEFSH (VTYSH_RIPD, no_rip_redistribute_rip_cmd_vtysh, 
+       "no redistribute rip", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Interface cost\n")
+       "Redistribute information from another routing protocol\n"
+       "Routing Information Protocol (RIP)\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_soft_out_cmd_vtysh, 
-       "clear bgp * soft out", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_view_route_cmd_vtysh, 
+       "show ip bgp view WORD A.B.C.D", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_sequence_number_cmd_vtysh, 
-       "ipv6 prefix-list sequence-number", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Include/exclude sequence numbers in NVGEN\n")
+       "BGP view\n"
+       "BGP view name\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (VTYSH_RIPD, no_debug_rip_packet_cmd_vtysh, 
-       "no debug rip packet", 
+DEFSH (VTYSH_ZEBRA, no_debug_zebra_events_cmd_vtysh, 
+       "no debug zebra events", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n")
+       "Zebra configuration\n"
+       "Debug option set for zebra events\n")
 
-DEFSH (VTYSH_ZEBRA, show_ip_route_prefix_longer_cmd_vtysh, 
-       "show ip route A.B.C.D/M longer-prefixes", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_metric_routemap_cmd_vtysh, 
+       "no redistribute connected metric <0-16> route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_le_cmd_vtysh, 
+       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32>", 
        "IP information\n"
-       "IP routing table\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Show route matching the specified Network/Mask pair only\n")
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n")
+
+DEFSH (VTYSH_BGPD, no_set_ecommunity_rt_val_cmd_vtysh, 
+       "no set extcommunity rt .ASN:nn_or_IP-address:nn", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Route Target extened communityt\n"
+       "VPN extended community\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, show_ipv6_access_list_name_cmd_vtysh, 
-       "show ipv6 access-list WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbors_cmd_vtysh, 
+       "show ip bgp neighbors", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "List IPv6 access lists\n"
-       "IPv6 zebra access-list\n")
+       "IP information\n"
+       "BGP information\n"
+       "Detailed information on TCP and BGP neighbor connections\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ripng_cmd_vtysh, 
-       "no redistribute ripng", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "RIPng route\n")
+DEFSH (VTYSH_BGPD, bgp_network_mask_natural_cmd_vtysh, 
+       "network A.B.C.D", 
+       "Specify a network to announce via BGP\n"
+       "Network number\n")
 
-DEFSH (VTYSH_BGPD, no_set_community_val_cmd_vtysh, 
-       "no set community .AA:NN", 
+DEFSH (VTYSH_OSPFD, no_ospf_distance_cmd_vtysh, 
+       "no distance <1-255>", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP community attribute\n"
-       "Community number in aa:nn format or local-AS|no-advertise|no-export|internet or additive\n")
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_out_cmd_vtysh, 
-       "clear bgp peer-group WORD out", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, debug_bgp_events_cmd_vtysh, 
+       "debug bgp events", 
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig outbound update\n")
+       "BGP events\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_prefix_longer_cmd_vtysh, 
-       "show ipv6 prefix-list WORD X:X::X:X/M longer", 
-       "Show running system information\n"
-       "IPv6 information\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_ge_le_cmd_vtysh, 
+       "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
+       "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Lookup longer prefix\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_metric_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_authkey_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication-key|) AUTH_KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Authentication password (key)\n" "The OSPF password (key)")
+DEFSH (VTYSH_OSPFD, network_area_cmd_vtysh, 
+       "network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", 
+       "Enable routing on an IP network\n"
+       "OSPF network prefix\n"
+       "Set the OSPF area ID\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_prefix_list_cmd_vtysh, 
-       "show ip bgp flap-statistics prefix-list WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_paths_cmd_vtysh, 
+       "show ip bgp paths", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display routes conforming to the prefix-list\n"
-       "IP prefix-list name\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_aggregate_address_cmd_vtysh, 
-       "no aggregate-address X:X::X:X/M", 
-       "Negate a command or set its defaults\n"
-       "Delete aggregate RIPng route announcement\n"
-       "Aggregate network")
+       "Path information\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) routes", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_in_cmd_vtysh, 
+       "clear ip bgp * ipv4 (unicast|multicast) in", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
+       "Clear all peers\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
-
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_retransmitinterval_cmd_vtysh, 
-       "ipv6 ospf6 retransmit-interval RXMTINTERVAL", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "<1-65535> Seconds\n"
-       )
-
-DEFSH (VTYSH_RIPD, debug_rip_packet_detail_cmd_vtysh, 
-       "debug rip packet (recv|send) detail", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n"
-       "RIP receive packet\n"
-       "RIP send packet\n"
-       "Detailed information display\n")
-
-DEFSH (VTYSH_ZEBRA, show_ip_route_protocol_cmd_vtysh, 
-       "show ip route (bgp|connected|kernel|ospf|rip|static)", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP routing table\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Connected\n"
-       "Kernel\n"
-       "Open Shortest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_client_to_client_reflection_cmd_vtysh, 
-       "no bgp client-to-client reflection", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Configure client to client route reflection\n"
-       "reflection of routes allowed\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_rmap_onmatch_next_cmd_vtysh, 
-       "no on-match next", 
-       "Negate a command or set its defaults\n"
-       "Exit policy on matches\n"
-       "Next clause\n")
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_multiple_instance_cmd_vtysh, 
-       "no bgp multiple-instance", 
+DEFSH (VTYSH_OSPFD, no_area_default_cost_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) default-cost <0-16777215>", 
        "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "BGP multiple instance\n")
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Set the summary-default cost of a NSSA or stub area\n"
+       "Stub's advertised default summary cost\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_nsm_sub_cmd_vtysh, 
-       "no debug ospf nsm (status|events|timers)", 
+DEFSH (VTYSH_OSPFD, no_router_ospf_cmd_vtysh, 
+       "no router ospf", 
        "Negate a command or set its defaults\n"
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n"
-       "NSM Status Information\n"
-       "NSM Event Information\n"
-       "NSM Timer Information\n")
-
-DEFSH (VTYSH_OSPFD, area_vlink_param2_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
-
-DEFSH (VTYSH_BGPD, bgp_distance_cmd_vtysh, 
-       "distance bgp <1-255> <1-255> <1-255>", 
-       "Define an administrative distance\n"
-       "BGP distance\n"
-       "Distance for routes external to the AS\n"
-       "Distance for routes internal to the AS\n"
-       "Distance for local routes\n")
+       "Enable a routing process\n"
+       "Start OSPF configuration\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_soft_cmd_vtysh, 
-       "clear bgp peer-group WORD soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_transmit_delay_cmd_vtysh, 
+       "ip ospf transmit-delay <1-65535>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Link state transmit delay\n"
+       "Seconds\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_metric_rmap_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295> route-map WORD", 
+DEFSH (VTYSH_BGPD, no_bgp_scan_time_val_cmd_vtysh, 
+       "no bgp scan-time <5-60>", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "BGP specific commands\n"
+       "Configure background scanner interval\n"
+       "Scanner interval (seconds)\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_host_any_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_all_cmd_vtysh, 
+       "no debug all bgp", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "Any destination host\n")
+       "Debugging functions (see also 'undebug')\n"
+       "Enable all debugging\n"
+       "BGP information\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_attr_info_cmd_vtysh, 
-       "show ip bgp attribute-info", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_address_cmd_vtysh, 
+       "show ip bgp flap-statistics A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "List all bgp attribute information\n")
-
-DEFSH (VTYSH_RIPNGD, no_default_information_originate_cmd_vtysh, 
-       "no default-information originate", 
-       "Negate a command or set its defaults\n"
-       "Default route information\n"
-       "Distribute default route\n")
+       "Display flap statistics of routes\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_host_cmd_vtysh, 
-       "no access-list (<1-99>|<1300-1999>) (deny|permit) host A.B.C.D", 
+DEFSH (VTYSH_BGPD, no_bgp_cluster_id_arg_cmd_vtysh, 
+       "no bgp cluster-id A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "A single host address\n"
-       "Address to match\n")
+       "BGP information\n"
+       "Configure Route-Reflector Cluster-id\n"
+       "Route-Reflector Cluster-id in IP address format\n")
 
-DEFSH (VTYSH_RIPD, show_ip_protocols_rip_cmd_vtysh, 
-       "show ip protocols", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP routing protocol process parameters and statistics\n")
+DEFSH (VTYSH_OSPFD, router_id_cmd_vtysh, 
+       "router-id A.B.C.D", 
+       "router-id for the OSPF process\n"
+       "OSPF router-id in IP address format\n")
 
-DEFSH (VTYSH_RIPD, send_lifetime_day_month_day_month_cmd_vtysh, 
-       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Day of th month to expire\n"
-       "Month of the year to expire\n"
-       "Year to expire\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD, no_match_interface_val_cmd_vtysh, 
+       "no match interface WORD", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match first hop interface of route\n"
+       "Interface name\n")
 
 DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_topology_cmd_vtysh, 
        "show ipv6 ospf6 topology", 
@@ -4888,505 +3153,414 @@ DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_topology_cmd_vtysh,
        "Inter Area topology information\n"
        )
 
-DEFSH (VTYSH_OSPFD, no_ospf_redistribute_source_cmd_vtysh, 
-       "no redistribute (kernel|connected|static|rip|bgp)", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_any_host_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n")
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "Any source host\n"
+       "A single destination host\n"
+       "Destination address\n")
 
-DEFSH (VTYSH_RIPD, ip_rip_receive_version_cmd_vtysh, 
-       "ip rip receive version (1|2)", 
+DEFSH (VTYSH_RIPD, no_rip_version_val_cmd_vtysh, 
+       "no version <1-2>", 
+       "Negate a command or set its defaults\n"
+       "Set routing protocol version\n"
+       "version\n")
+
+DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_all_cmd_vtysh, 
+       "no ip extcommunity-list (<1-99>|<100-199>)", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement reception\n"
-       "Version control\n"
-       "RIP version 1\n"
-       "RIP version 2\n")
+       "Add a extended community list entry\n"
+       "Extended Community list number (standard)\n"
+       "Extended Community list number (expanded)\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_priority_addr_cmd_vtysh, 
-       "ip ospf priority <0-255> A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Router priority\n"
-       "Priority\n"
-       "Address of interface")
+DEFSH (VTYSH_OSPFD, no_area_vlink_param2_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (VTYSH_ZEBRA, debug_zebra_events_cmd_vtysh, 
-       "debug zebra events", 
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra events\n")
+DEFSH (VTYSH_ZEBRA, no_zebra_interface_cmd_vtysh, 
+       "no interface IFNAME", 
+       "Delete a pseudo interface's configuration\n"
+       "Interface's name\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbors_peer_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, match_metric_cmd_vtysh, 
-       "match metric <0-4294967295>", 
-       "Match values from routing table\n"
-       "Match metric of route\n"
-       "Metric value\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_cmd_vtysh, 
+       "distance ospf inter-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_prefix_longer_cmd_vtysh, 
-       "show bgp ipv6 X:X::X:X/M longer-prefixes", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_out_cmd_vtysh, 
+       "clear ip bgp <1-65535> out", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Display route and more specific routes\n")
-
-DEFSH (VTYSH_OSPF6D, no_ipv6_ospf6_passive_cmd_vtysh, 
-       "no ipv6 ospf6 passive", 
-       "Negate a command or set its defaults\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "passive interface: No Adjacency will be formed on this I/F\n"
-       )
+       "Clear peers with the AS number\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_RIPD, accept_lifetime_infinite_day_month_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Never expires")
+DEFSH (VTYSH_BGPD, set_community_cmd_vtysh, 
+       "set community .AA:NN", 
+       "Set values in destination routing protocol\n"
+       "BGP community attribute\n"
+       "Community number in aa:nn format or local-AS|no-advertise|no-export|internet or additive\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged6_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path med next-hop", 
+DEFSH (VTYSH_BGPD, no_bgp_network_mask_natural_cmd_vtysh, 
+       "no network A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Med attribute\n"
-       "Nexthop attribute\n")
+       "Specify a network to announce via BGP\n"
+       "Network number\n")
 
-DEFSH (VTYSH_OSPFD, no_area_import_list_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) import-list NAME", 
+DEFSH (VTYSH_RIPD, no_rip_passive_interface_cmd_vtysh, 
+       "no passive-interface IFNAME", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Unset the filter for networks announced to other areas\n"
-       "Name of the access-list\n")
+       "Suppress routing updates on an interface\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_seq_ge_cmd_vtysh, 
-       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128>", 
+DEFSH (VTYSH_RIPD, no_key_chain_cmd_vtysh, 
+       "no key chain WORD", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "Authentication key management\n"
+       "Key-chain management\n"
+       "Key-chain name\n")
 
-DEFSH (VTYSH_OSPFD, no_interface_ip_ospf_authentication_addr_cmd_vtysh, 
-       "no ip ospf authentication A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_set_metric_cmd_vtysh, 
+       "no set metric", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n"
-       "Address of interface")
+       "Set values in destination routing protocol\n"
+       "Metric value for destination routing protocol\n")
 
-DEFSH (VTYSH_BGPD, neighbor_route_reflector_client_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "route-reflector-client", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Configure a neighbor as Route Reflector client\n")
+DEFSH (VTYSH_RIPD, no_debug_rip_events_cmd_vtysh, 
+       "no debug rip events", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP events\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community_list_cmd_vtysh, 
-       "show bgp community-list WORD", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, undebug_bgp_events_cmd_vtysh, 
+       "undebug bgp events", 
+       "Disable debugging functions (see also 'debug')\n"
        "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
+       "BGP events\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_ripng_cmd_vtysh, 
-       "redistribute ripng", 
-       "Redistribute information from another routing protocol\n"
-       "RIPng route\n")
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp view WORD * ipv4 (unicast|multicast) in prefix-filter", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_host_cmd_vtysh, 
-       "access-list (<1-99>|<1300-1999>) (deny|permit) host A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_cmd_vtysh, 
+       "no access-list WORD (deny|permit) A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
        "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
+       "IP zebra access-list name\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "A single host address\n"
-       "Address to match\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_metric_cmd_vtysh, 
-       "redistribute bgp metric <0-16>", 
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric\n"
-       "Metric value\n")
-
-DEFSH (VTYSH_OSPF6D|VTYSH_BGPD, match_ipv6_address_prefix_list_cmd_vtysh, 
-       "match ipv6 address prefix-list WORD", 
-       "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_neighbor_received_prefix_filter_cmd_vtysh, 
-       "show bgp neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n")
+       "Prefix to match. e.g. 10.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_instance_neighbors_cmd_vtysh, 
-       "show ip bgp view WORD neighbors", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_id_self_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") A.B.C.D (self-originate|)", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
+       "Link State ID (as an IP address)\n"
+       "Self-originated link states\n"
+       "\n")
 
-DEFSH (VTYSH_OSPF6D, show_zebra_cmd_vtysh, 
-       "show zebra", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_cmd_vtysh, 
+       "show ip bgp", 
        "Show running system information\n"
-       "Zebra information\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_peer_out_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_description_cmd_vtysh, 
-       "no ip prefix-list WORD description", 
-       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n")
-
-DEFSH (VTYSH_ZEBRA, no_ip_forwarding_cmd_vtysh, 
-       "no ip forwarding", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Turn off IP forwarding")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_routemap_cmd_vtysh, 
-       "redistribute bgp route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, no_debug_bgp_update_cmd_vtysh, 
-       "no debug bgp updates", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP updates\n")
+       "BGP information\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_cmd_vtysh, 
-       "no redistribute ospf6", 
+DEFSH (VTYSH_BGPD, no_neighbor_remove_private_as_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "remove-private-AS", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Remove private AS number from outbound updates\n")
 
-DEFSH (VTYSH_ZEBRA, no_ip_address_cmd_vtysh, 
-       "no ip address A.B.C.D/M", 
-       "Negate a command or set its defaults\n"
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IP Address (e.g. 10.0.0.1/8)")
+DEFSH (VTYSH_BGPD, neighbor_local_as_no_prepend_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "local-as <1-65535> no-prepend", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Specify a local-as number\n"
+       "AS number used as local AS\n"
+       "Do not prepend local-as to updates from ebgp peers\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_route_map_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) route-map WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbor_routes_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D routes", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
-
-DEFSH (VTYSH_ZEBRA, no_ipv6_address_cmd_vtysh, 
-       "no ipv6 address X:X::X:X/M", 
-       "Negate a command or set its defaults\n"
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IPv6 address (e.g. 3ffe:506::1/48)\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_shutdown_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "shutdown", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Administratively shut down this neighbor\n")
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Display routes learned from neighbor\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_authentication_string2_cmd_vtysh, 
-       "no ip rip authentication string LINE", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication string\n"
-       "Authentication string\n")
+DEFSH (VTYSH_BGPD, bgp_router_id_cmd_vtysh, 
+       "bgp router-id A.B.C.D", 
+       "BGP information\n"
+       "Override configured router identifier\n"
+       "Manually configured router identifier\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_network_cmd_vtysh, 
-       "ip ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Network type\n"
-       "Specify OSPF broadcast multi-access network\n"
-       "Specify OSPF NBMA network\n"
-       "Specify OSPF point-to-multipoint network\n"
-       "Specify OSPF point-to-point network\n")
+DEFSH (VTYSH_BGPD, aggregate_address_summary_as_set_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M summary-only as-set", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Filter more specific routes from updates\n"
+       "Generate AS set path information\n")
 
-DEFSH (VTYSH_BGPD, neighbor_send_community_type_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "send-community (both|extended|standard)", 
+DEFSH (VTYSH_BGPD, neighbor_port_cmd_vtysh, 
+       "neighbor A.B.C.D " "port <0-65535>", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Send Community attribute to this neighbor\n"
-       "Send Standard and Extended Community attributes\n"
-       "Send Extended Community attributes\n"
-       "Send Standard Community attributes\n")
+       "Neighbor address\n"
+       "Neighbor's BGP port\n"
+       "TCP port number\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_metric_cmd_vtysh, 
-       "no redistribute kernel metric", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_metric_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) metric <0-16777214>", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
-       "Metric\n")
-
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_rmap_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf|rip|static) route-map WORD", 
-       "Redistribute information from another routing protocol\n"
        "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
        "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "OSPF exterior metric type for redistributed routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "Metric for redistributed routes\n"
+       "OSPF default metric\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_le_cmd_vtysh, 
-       "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_cmd_vtysh, 
+       "distance ospf external <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "External routes\n"
+       "Distance for external routes\n")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_community_list_cmd_vtysh, 
+       "show ip bgp community-list WORD", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Display routes matching the community-list\n"
+       "community-list name\n")
+
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214>", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Connected\n"
        "Static routes\n"
        "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n")
+       "Border Gateway Protocol (BGP)\n"
+       "Metric for redistributed routes\n"
+       "OSPF default metric\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_nd_prefix_advertisement_cmd_vtysh, 
-       "ipv6 nd prefix-advertisement IPV6PREFIX VALID PREFERRED [onlink] [autoconfig]", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_sequence_number_cmd_vtysh, 
+       "ip prefix-list sequence-number", 
        "IP information\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Preferred lifetime in seconds\n"
-       "On link flag\n"
-       "Autonomous address-configuration flag\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, show_ipv6_access_list_cmd_vtysh, 
-       "show ipv6 access-list", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "List IPv6 access lists\n")
+       "Build a prefix list\n"
+       "Include/exclude sequence numbers in NVGEN\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_override_capability_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "override-capability", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_maximum_prefix_warning_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "maximum-prefix <1-4294967295> warning-only", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Override capability negotiation result\n")
-
-DEFSH (VTYSH_BGPD, undebug_bgp_update_cmd_vtysh, 
-       "undebug bgp updates", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP updates\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n"
+       "maximum no. of prefix limit\n"
+       "Only give warning message when limit is exceeded\n")
 
-DEFSH (VTYSH_RIPNGD, no_debug_ripng_packet_cmd_vtysh, 
-       "no debug ripng packet", 
+DEFSH (VTYSH_BGPD, no_ip_community_list_name_all_cmd_vtysh, 
+       "no ip community-list (standard|expanded) WORD", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng packet\n")
-
-DEFSH (VTYSH_ZEBRA, ip_route_pref_cmd_vtysh, 
-       "ip route A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>", 
        "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Distance value for this route\n")
+       "Add a community list entry\n"
+       "Add a standard community-list entry\n"
+       "Add an expanded community-list entry\n"
+       "Community list name\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_prefix_list_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) prefix-list WORD", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_next_hop_prefix_list_val_cmd_vtysh, 
+       "no match ip next-hop prefix-list WORD", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
        "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes conforming to the prefix-list\n"
+       "Match next-hop address of route\n"
+       "Match entries of prefix-lists\n"
        "IP prefix-list name\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community2_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged6_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path med next-hop", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Med attribute\n"
-       "Nexthop attribute\n")
+DEFSH (VTYSH_BGPD, undebug_bgp_all_cmd_vtysh, 
+       "undebug all bgp", 
+       "Disable debugging functions (see also 'debug')\n"
+       "Enable all debugging\n"
+       "BGP information\n")
 
-DEFSH (VTYSH_OSPFD, no_timers_spf_cmd_vtysh, 
-       "no timers spf", 
+DEFSH (VTYSH_OSPFD, no_ospf_default_metric_val_cmd_vtysh, 
+       "no default-metric <0-16777214>", 
        "Negate a command or set its defaults\n"
-       "Adjust routing timers\n"
-       "OSPF SPF timers\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_filter_list_cmd_vtysh, 
-       "show ip bgp flap-statistics filter-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
+       "Set metric of redistributed routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D advertised-routes", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD, ip_rip_authentication_key_chain_cmd_vtysh, 
+       "ip rip authentication key-chain LINE", 
        "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication key-chain\n"
+       "name of key-chain\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_routemap_cmd_vtysh, 
-       "no redistribute kernel route-map WORD", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_routemap_cmd_vtysh, 
+       "default-information originate always route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_route_cmd_vtysh, 
-       "show ip bgp vpnv4 all A.B.C.D", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_metric_cmd_vtysh, 
+       "redistribute bgp metric <0-16>", 
+       "Redistribute information from another routing protocol\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Metric\n"
+       "Metric value\n")
+
+DEFSH (VTYSH_BGPD, ip_extcommunity_list_standard2_cmd_vtysh, 
+       "ip extcommunity-list <1-99> (deny|permit)", 
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Extended Community list number (standard)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n")
+
+DEFSH (VTYSH_RIPD, rip_version_cmd_vtysh, 
+       "version <1-2>", 
+       "Set routing protocol version\n"
+       "version\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp view WORD * ipv4 (unicast|multicast) soft", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Network in the BGP routing table to display\n")
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_regexp_cmd_vtysh, 
-       "show bgp ipv6 regexp .LINE", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_soft_cmd_vtysh, 
+       "clear ip bgp <1-65535> vpnv4 unicast soft", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
+       "Address Family Modifier\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_OSPFD, no_passive_interface_addr_cmd_vtysh, 
-       "no passive-interface IFNAME A.B.C.D", 
+DEFSH (VTYSH_BGPD, no_set_community_delete_val_cmd_vtysh, 
+       "no set comm-list (<1-99>|<100-199>|WORD) delete", 
        "Negate a command or set its defaults\n"
-       "Allow routing updates on an interface\n"
-       "Interface's name\n")
-
-DEFSH (VTYSH_OSPFD, ospf_authentication_key_cmd_vtysh, 
-       "ospf authentication-key AUTH_KEY", 
-       "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "The OSPF password (key)")
+       "Set values in destination routing protocol\n"
+       "set BGP community list (for deletion)\n"
+       "Community-list number (standard)\n"
+       "Communitly-list number (expanded)\n"
+       "Community-list name\n"
+       "Delete matching communities\n")
 
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_priority_cmd_vtysh, 
-       "ipv6 ospf6 priority PRIORITY", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Router priority\n"
-       "<0-255> Priority\n"
-       )
+DEFSH (VTYSH_BGPD, neighbor_remove_private_as_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "remove-private-AS", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Remove private AS number from outbound updates\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_md5_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(message-digest-key|) <1-255>", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_any_cmd_vtysh, 
+       "no access-list WORD (deny|permit) any", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
+       "Add an access list entry\n"
+       "IP zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Prefix to match. e.g. 10.0.0.0/8\n")
 
-DEFSH (VTYSH_RIPD, no_rip_distance_source_access_list_cmd_vtysh, 
-       "no distance <1-255> A.B.C.D/M WORD", 
+DEFSH (VTYSH_BGPD, no_ip_community_list_expanded_cmd_vtysh, 
+       "no ip community-list <100-199> (deny|permit) .LINE", 
        "Negate a command or set its defaults\n"
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n"
-       "Access list name\n")
+       "IP information\n"
+       "Add a community list entry\n"
+       "Community list number (expanded)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_router_id_cmd_vtysh, 
-       "no ospf router-id", 
+DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_standard_cmd_vtysh, 
+       "no ip extcommunity-list <1-99> (deny|permit) .AA:NN", 
        "Negate a command or set its defaults\n"
-       "OSPF specific commands\n"
-       "router-id for the OSPF process\n")
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Extended Community list number (standard)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
+
+DEFSH (VTYSH_OSPF6D, interface_area_passive_cmd_vtysh, 
+       "interface IFNAME area A.B.C.D passive", 
+       "Enable routing on an IPv6 interface\n"
+       "Interface name(e.g. ep0)\n"
+       "Set the OSPF6 area ID\n"
+       "OSPF6 area ID in IPv4 address notation\n"
+       "Suppress routing updates on an interface\n"
+      )
+
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_le_ge_cmd_vtysh, 
+       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
 DEFSH (VTYSH_BGPD, bgp_bestpath_compare_router_id_cmd_vtysh, 
        "bgp bestpath compare-routerid", 
@@ -5394,118 +3568,21 @@ DEFSH (VTYSH_BGPD, bgp_bestpath_compare_router_id_cmd_vtysh,
        "Change the default bestpath selection\n"
        "Compare router-id for identical EBGP paths\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_metric_val_cmd_vtysh, 
-       "no redistribute bgp metric <0-16>", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, match_metric_cmd_vtysh, 
+       "match metric <0-4294967295>", 
+       "Match values from routing table\n"
+       "Match metric of route\n"
        "Metric value\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community3_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_ZEBRA, debug_zebra_packet_direct_cmd_vtysh, 
-       "debug zebra packet (recv|send)", 
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra packet\n"
-       "Debug option set for receive packet\n"
-       "Debug option set for send packet\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_topology_router_cmd_vtysh, 
-       "show ipv6 ospf6 area A.B.C.D topology (A.B.C.D|<0-4294967295>|detail)", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Area information\n"
-       "Area ID (as an IPv4 notation)\n"
-       "Shortest Path First tree information\n"
-       "Displays SPF topology table\n"
-       "Specify Router-ID\n"
-       "Specify Router-ID\n"
-       )
-
-DEFSH (VTYSH_OSPFD, no_router_id_cmd_vtysh, 
-       "no router-id", 
-       "Negate a command or set its defaults\n"
-       "router-id for the OSPF process\n")
-
-DEFSH (VTYSH_BGPD, set_ipv6_nexthop_global_cmd_vtysh, 
-       "set ipv6 next-hop global X:X::X:X", 
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 global address\n"
-       "IPv6 address of next hop\n")
-
-DEFSH (VTYSH_RIPNGD, no_debug_ripng_packet_direct_cmd_vtysh, 
-       "no debug ripng packet (recv|send)", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng packet\n"
-       "Debug option set for receive packet\n"
-       "Debug option set for send packet\n")
-
-DEFSH (VTYSH_RIPD, send_lifetime_infinite_month_day_cmd_vtysh, 
-       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Never expires")
-
-DEFSH (VTYSH_BGPD, no_set_local_pref_val_cmd_vtysh, 
-       "no set local-preference <0-4294967295>", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_metric_cmd_vtysh, 
+       "no redistribute connected metric", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP local preference path attribute\n"
-       "Preference value\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_cmd_vtysh, 
-       "redistribute ospf6", 
        "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_any_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip any any", 
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Any source host\n"
-       "Any destination host\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_local_as_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "local-as <1-65535>", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a local-as number\n"
-       "AS number used as local AS\n")
+       "Connected\n"
+       "Metric\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_mask_host_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D host A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_mask_any_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", 
        "Add an access list entry\n"
        "IP extended access list\n"
        "IP extended access list (expanded range)\n"
@@ -5514,142 +3591,57 @@ DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_mask_host_cmd_vty
        "Any Internet Protocol\n"
        "Source address\n"
        "Source wildcard bits\n"
-       "A single destination host\n"
-       "Destination address\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_name_cmd_vtysh, 
-       "show ip prefix-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n")
-
-DEFSH (VTYSH_ZEBRA, show_ipv6_route_prefix_cmd_vtysh, 
-       "show ipv6 route X:X::X:X/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "IPv6 routing table\n"
-       "IPv6 prefix\n")
+       "Any destination host\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_soft_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast soft", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
        "BGP neighbor address to clear\n"
        "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_next_hop_cmd_vtysh, 
-       "no match ip next-hop", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match next-hop address of route\n")
-
-DEFSH (VTYSH_OSPF6D, ospf6_routemap_no_set_forwarding_cmd_vtysh, 
-       "no set forwarding-address X:X::X:X", 
-       "Negate a command or set its defaults\n"
-       "Set value\n"
-       "Forwarding Address\n"
-       "IPv6 Address\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community2_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, no_area_range_cost_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_ge_cmd_vtysh, 
+       "no ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area range for route summarization\n"
-       "area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
-
-DEFSH (VTYSH_RIPD, ip_rip_authentication_key_chain_cmd_vtysh, 
-       "ip rip authentication key-chain LINE", 
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication key-chain\n"
-       "name of key-chain\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_distribute_list_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "distribute-list (<1-199>|<1300-2699>|WORD) (in|out)", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Filter updates to/from this neighbor\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n"
-       "Filter incoming updates\n"
-       "Filter outgoing updates\n")
-
-DEFSH (VTYSH_ZEBRA, show_table_cmd_vtysh, 
-       "show table", 
-       "Show running system information\n"
-       "default routing table to use for all clients\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv6_metric_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295>", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_routemap_cmd_vtysh, 
+       "no redistribute connected route-map WORD", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
        "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
-
-DEFSH (VTYSH_OSPFD, no_area_vlink_authkey_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication-key|)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Authentication password (key)\n" "The OSPF password (key)")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_cmd_vtysh, 
-       "show ipv6 prefix-list", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n")
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_prefix_longer_cmd_vtysh, 
-       "show ip prefix-list WORD A.B.C.D/M longer", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_soft_in_cmd_vtysh, 
+       "clear ip bgp view WORD * soft in", 
+       "Reset functions\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Lookup longer prefix\n")
+       "BGP information\n"
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_intra_external_cmd_vtysh, 
-       "distance ospf inter-area <1-255> intra-area <1-255> external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n")
+DEFSH (VTYSH_BGPD, bgp_network_mask_backdoor_cmd_vtysh, 
+       "network A.B.C.D mask A.B.C.D backdoor", 
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Network mask\n"
+       "Network mask\n"
+       "Specify a BGP backdoor route\n")
 
 DEFSH (VTYSH_BGPD, no_bgp_bestpath_med3_cmd_vtysh, 
        "no bgp bestpath med missing-as-worst confed", 
@@ -5660,563 +3652,323 @@ DEFSH (VTYSH_BGPD, no_bgp_bestpath_med3_cmd_vtysh,
        "Treat missing MED as the least preferred one\n"
        "Compare MED among confederation paths\n")
 
-DEFSH (VTYSH_RIPNGD, debug_ripng_packet_direct_cmd_vtysh, 
-       "debug ripng packet (recv|send)", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng packet\n"
-       "Debug option set for receive packet\n"
-       "Debug option set for send packet\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_ZEBRA, ip_address_secondary_cmd_vtysh, 
-       "ip address A.B.C.D/M secondary", 
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IP address (e.g. 10.0.0.1/8)\n"
-       "Secondary IP address\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_soft_out_cmd_vtysh, 
-       "clear ip bgp * soft out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_neighbor_received_prefix_filter_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_route_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D", 
        "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) soft out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD, accept_lifetime_day_month_day_month_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Day of th month to expire\n"
-       "Month of the year to expire\n"
-       "Year to expire\n")
+       "Network in the BGP routing table to display\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_cluster_id_cmd_vtysh, 
-       "no bgp cluster-id", 
+DEFSH (VTYSH_BGPD, no_set_origin_cmd_vtysh, 
+       "no set origin", 
        "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Configure Route-Reflector Cluster-id\n")
+       "Set values in destination routing protocol\n"
+       "BGP origin code\n")
 
-DEFSH (VTYSH_BGPD, neighbor_maximum_prefix_warning_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "maximum-prefix <1-4294967295> warning-only", 
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged8_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged next-hop as-path med", 
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n"
-       "Only give warning message when limit is exceeded\n")
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n"
+       "Med attribute\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (VTYSH_OSPFD, ospf_cost_cmd_vtysh, 
+       "ospf cost <1-65535>", 
+       "OSPF interface commands\n"
+       "Interface cost\n"
+       "Cost")
+
+DEFSH (VTYSH_ZEBRA, ip_route_distance_cmd_vtysh, 
+       "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) <1-255>", 
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n"
+       "Distance value for this route\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_list_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community-list WORD", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Display routes matching the community-list\n"
+       "community-list name\n")
 
-DEFSH (VTYSH_OSPFD, no_area_stub_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) stub", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_metric_val_cmd_vtysh, 
+       "no redistribute static metric <0-16>", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area as stub\n")
+       "Redistribute information from another routing protocol\n"
+       "Static routes\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_ZEBRA, no_debug_zebra_events_cmd_vtysh, 
-       "no debug zebra events", 
+DEFSH (VTYSH_BGPD, no_neighbor_description_val_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "description .LINE", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra events\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Neighbor specific description\n"
+       "Up to 80 characters describing this neighbor\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_in_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_hellointerval_cmd_vtysh, 
+       "ipv6 ospf6 hello-interval HELLO_INTERVAL", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Time between HELLO packets\n"
+       "<1-65535> Seconds\n"
+       )
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_prefix_list_cmd_vtysh, 
-       "show ipv6 bgp prefix-list WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the prefix-list\n"
-       "IPv6 prefix-list name\n")
+DEFSH (VTYSH_OSPFD|VTYSH_BGPD, match_ip_address_cmd_vtysh, 
+       "match ip address (<1-199>|<1300-2699>|WORD)", 
+       "Match values from routing table\n"
+       "IP information\n"
+       "Match address of route\n"
+       "IP access-list number\n"
+       "IP access-list number (expanded range)\n"
+       "IP Access-list name\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_distance2_cmd_vtysh, 
-       "no distance bgp", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_summary_as_set_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M summary-only as-set", 
        "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "BGP distance\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_in_cmd_vtysh, 
-       "clear bgp ipv6 external WORD in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound update\n")
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Filter more specific routes from updates\n"
+       "Generate AS set path information\n")
 
-DEFSH (VTYSH_BGPD, no_set_aggregator_as_val_cmd_vtysh, 
-       "no set aggregator as <1-65535> A.B.C.D", 
+DEFSH (VTYSH_RIPD, no_rip_network_cmd_vtysh, 
+       "no network (A.B.C.D/M|WORD)", 
        "Negate a command or set its defaults\n"
+       "Enable routing on an IP network\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Interface name\n")
+
+DEFSH (VTYSH_BGPD, set_aggregator_as_cmd_vtysh, 
+       "set aggregator as <1-65535> A.B.C.D", 
        "Set values in destination routing protocol\n"
        "BGP aggregator attribute\n"
        "AS number of aggregator\n"
        "AS number\n"
        "IP address of aggregator\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_type_routemap_cmd_vtysh, 
-       "default-information originate metric <0-16777214> metric-type (1|2) route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, ip_community_list_name_standard_cmd_vtysh, 
-       "ip community-list standard WORD (deny|permit) .AA:NN", 
-       "IP information\n"
-       "Add a community list entry\n"
-       "Add a standard community-list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_intra_external_cmd_vtysh, 
+       "distance ospf inter-area <1-255> intra-area <1-255> external <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_self_cmd_vtysh, 
-       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") (self-originate|)", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_soft_in_cmd_vtysh, 
+       "clear ip bgp <1-65535> soft in", 
+       "Reset functions\n"
        "IP information\n"
-       "OSPF information\n"
-       "Database summary\n"
-       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
-       "Self-originated link states\n")
-
-DEFSH (VTYSH_BGPD, bgp_router_id_cmd_vtysh, 
-       "bgp router-id A.B.C.D", 
        "BGP information\n"
-       "Override configured router identifier\n"
-       "Manually configured router identifier\n")
-
-DEFSH (VTYSH_ZEBRA, show_ip_forwarding_cmd_vtysh, 
-       "show ip forwarding", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP forwarding status\n")
+       "Clear peers with the AS number\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, ip_community_list_standard_cmd_vtysh, 
-       "ip community-list <1-99> (deny|permit) .AA:NN", 
+DEFSH (VTYSH_RIPD, no_ip_rip_authentication_key_chain2_cmd_vtysh, 
+       "no ip rip authentication key-chain LINE", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication key-chain\n"
+       "name of key-chain\n")
 
-DEFSH (VTYSH_ZEBRA, no_multicast_cmd_vtysh, 
-       "no multicast", 
+DEFSH (VTYSH_OSPFD, no_ospf_authentication_key_cmd_vtysh, 
+       "no ospf authentication-key", 
        "Negate a command or set its defaults\n"
-       "Unset multicast flag to interface\n")
+       "OSPF interface commands\n"
+       "Authentication password (key)\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_instance_ipv4_summary_cmd_vtysh, 
-       "show ip bgp view WORD ipv4 (unicast|multicast) summary", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Summary of BGP neighbor status\n")
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged3_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged next-hop (as-path|med)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n"
+       "Med attribute\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_soft_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged7_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged next-hop med as-path", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Nexthop attribute\n"
+       "Med attribute\n"
+       "As-path attribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_BGPD, bgp_bestpath_med2_cmd_vtysh, 
+       "bgp bestpath med confed missing-as-worst", 
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "MED attribute\n"
+       "Compare MED among confederation paths\n"
+       "Treat missing MED as the least preferred one\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_nomask_cmd_vtysh, 
+       "no access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", 
+       "Negate a command or set its defaults\n"
        "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Source address\n"
-       "Source wildcard bits\n"
-       "Destination address\n"
-       "Destination Wildcard bits\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_filter_list_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) filter-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_summary_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) summary", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Summary of BGP neighbor status\n")
+       "Address to match\n")
 
-DEFSH (VTYSH_RIPD, no_rip_redistribute_type_metric_routemap_cmd_vtysh, 
-       "no redistribute (kernel|connected|static|ospf|bgp) metric <0-16> route-map WORD", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_type_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> metric-type (1|2)", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Connected\n"
        "Static routes\n"
-       "Open Shortest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
        "Border Gateway Protocol (BGP)\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Metric for redistributed routes\n"
+       "OSPF default metric\n"
+       "OSPF exterior metric type for redistributed routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (VTYSH_BGPD, no_bgp_enforce_first_as_cmd_vtysh, 
+       "no bgp enforce-first-as", 
+       "Negate a command or set its defaults\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n")
+       "Enforce the first AS for EBGP routes\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_host_cmd_vtysh, 
+       "access-list (<1-99>|<1300-1999>) (deny|permit) host A.B.C.D", 
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "A single host address\n"
+       "Address to match\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_route_cmd_vtysh, 
-       "show ip ospf route", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_mask_summary_only_cmd_vtysh, 
+       "no aggregate-address A.B.C.D A.B.C.D summary-only", 
+       "Negate a command or set its defaults\n"
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Filter more specific routes from updates\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_detail_cmd_vtysh, 
+       "show ip prefix-list detail", 
        "Show running system information\n"
        "IP information\n"
-       "OSPF information\n"
-       "OSPF routing table\n")
-
-DEFSH (VTYSH_OSPFD, interface_ip_ospf_authentication_args_addr_cmd_vtysh, 
-       "ip ospf authentication (null|message-digest) A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n"
-       "Use null authentication\n"
-       "Use message-digest authentication\n"
-       "Address of interface")
+       "Build a prefix list\n"
+       "Detail of prefix lists\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_authtype_args_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null)", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n")
+DEFSH (VTYSH_RIPNGD, debug_ripng_packet_detail_cmd_vtysh, 
+       "debug ripng packet (recv|send) detail", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng packet\n"
+       "Debug option set for receive packet\n"
+       "Debug option set for send packet\n"
+       "Debug option set detaied information\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_network_cmd_vtysh, 
-       "no network A.B.C.D/M", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_priority_cmd_vtysh, 
+       "no ip ospf priority", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Router priority\n")
 
-DEFSH (VTYSH_BGPD, no_ip_as_path_cmd_vtysh, 
-       "no ip as-path access-list WORD (deny|permit) .LINE", 
+DEFSH (VTYSH_BGPD, no_neighbor_unsuppress_map_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "unsuppress-map WORD", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "BGP autonomous system path filter\n"
-       "Specify an access list name\n"
-       "Regular expression access list name\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "A regular-expression to match the BGP AS paths\n")
-
-DEFSH (VTYSH_BGPD, neighbor_distribute_list_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "distribute-list (<1-199>|<1300-2699>|WORD) (in|out)", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Filter updates to/from this neighbor\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n"
-       "Filter incoming updates\n"
-       "Filter outgoing updates\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Route-map to selectively unsuppress suppressed routes\n"
+       "Name of route map\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_le_ge_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_le_cmd_vtysh, 
+       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
        "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "Maximum prefix length\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_ipv6_access_list_all_cmd_vtysh, 
-       "no ipv6 access-list WORD", 
+DEFSH (VTYSH_BGPD, no_neighbor_route_map_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "route-map WORD (in|out)", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n")
-
-DEFSH (VTYSH_BGPD, ip_community_list_name_expanded_cmd_vtysh, 
-       "ip community-list expanded WORD (deny|permit) .LINE", 
-       "IP information\n"
-       "Add a community list entry\n"
-       "Add an expanded community-list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
-
-DEFSH (VTYSH_BGPD, neighbor_timers_connect_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "timers connect <0-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "BGP per neighbor timers\n"
-       "BGP connect timer\n"
-       "Connect timer\n")
-
-DEFSH (VTYSH_ZEBRA, ipv6_address_cmd_vtysh, 
-       "ipv6 address X:X::X:X/M", 
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IPv6 address (e.g. 3ffe:506::1/48)\n")
-
-DEFSH (VTYSH_BGPD, ip_community_list_expanded_cmd_vtysh, 
-       "ip community-list <100-199> (deny|permit) .LINE", 
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (expanded)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
-
-DEFSH (VTYSH_RIPD, rip_offset_list_ifname_cmd_vtysh, 
-       "offset-list WORD (in|out) <0-16> IFNAME", 
-       "Modify RIP metric\n"
-       "Access-list name\n"
-       "For incoming updates\n"
-       "For outgoing updates\n"
-       "Metric value\n"
-       "Interface to match\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_prefix_longer_cmd_vtysh, 
-       "show ipv6 mbgp X:X::X:X/M longer-prefixes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Display route and more specific routes\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_ism_sub_cmd_vtysh, 
-       "debug ospf ism (status|events|timers)", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n"
-       "ISM Status Information\n"
-       "ISM Event Information\n"
-       "ISM TImer Information\n")
-
-DEFSH (VTYSH_BGPD, neighbor_send_community_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "send-community", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Send Community attribute to this neighbor\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_route_map_cmd_vtysh, 
-       "show bgp route-map WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_route_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (VTYSH_ZEBRA, no_ipv6_route_ifname_pref_cmd_vtysh, 
-       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n")
-
-DEFSH (VTYSH_BGPD, dump_bgp_updates_interval_cmd_vtysh, 
-       "dump bgp updates PATH INTERVAL", 
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump BGP updates only\n"
-       "Output filename\n"
-       "Interval of output\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_confederation_identifier_arg_cmd_vtysh, 
-       "no bgp confederation identifier <1-65535>", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "AS number\n"
-       "Set routing domain confederation AS\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Apply route map to neighbor\n"
+       "Name of route map\n"
+       "Apply map to incoming routes\n"
+       "Apply map to outbound routes\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_cmd_vtysh, 
-       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*|dump|summary)", 
-       "Show running system information\n"
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_advertise_prefix_list_cmd_vtysh, 
+       "ipv6 ospf6 advertise prefix-list WORD", 
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "LSA Database\n"
-       "Router-LSA\n"
-       "Network-LSA\n"
-       "AS-External-LSA\n"
-       "Intra-Area-Prefix-LSA\n"
-       "Inter-Area-Router-LSA\n"
-       "Inter-Area-Prefix-LSA\n"
-       "Link-LSA\n"
-       "All LS Type\n"
-       "Dump raw LSA data in Hex\n"
-       "show summary of LSA\n"
+       "Advertising options\n"
+       "Filter prefix using prefix-list\n"
+       "Prefix list name\n"
        )
 
-DEFSH (VTYSH_BGPD, no_neighbor_route_server_client_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "route-server-client", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Configure a neighbor as Route Server client\n")
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community_all_cmd_vtysh, 
-       "show ip bgp community", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp peer-group WORD in prefix-filter", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Display routes matching the communities\n")
-
-DEFSH (VTYSH_OSPFD, ospf_message_digest_key_cmd_vtysh, 
-       "ospf message-digest-key <1-255> md5 KEY", 
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n"
-       "Use MD5 algorithm\n"
-       "The OSPF password (key)")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_in_prefix_filter_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) in prefix-filter", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig inbound update\n"
-       "Push out the existing ORF prefix-list\n")
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_match_community_cmd_vtysh, 
-       "no match community", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match BGP community list\n")
+DEFSH (VTYSH_OSPFD, ospf_abr_type_cmd_vtysh, 
+       "ospf abr-type (cisco|ibm|shortcut|standard)", 
+       "OSPF specific commands\n"
+       "Set OSPF ABR type\n"
+       "Alternative ABR,  cisco implementation\n"
+       "Alternative ABR,  IBM implementation\n"
+       "Shortcut ABR\n"
+       "Standard behavior (RFC2328)\n")
 
 DEFSH (VTYSH_RIPD, rip_redistribute_type_metric_cmd_vtysh, 
        "redistribute (kernel|connected|static|ospf|bgp) metric <0-16>", 
@@ -6229,207 +3981,42 @@ DEFSH (VTYSH_RIPD, rip_redistribute_type_metric_cmd_vtysh,
        "Metric\n"
        "Metric value\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_summary_cmd_vtysh, 
-       "show ip bgp vpnv4 all summary", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Summary of BGP neighbor status\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community2_exact_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_regexp_cmd_vtysh, 
-       "show ipv6 mbgp regexp .LINE", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the MBGP AS paths\n")
-
-DEFSH (VTYSH_BGPD, no_set_community_delete_cmd_vtysh, 
-       "no set comm-list", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "set BGP community list (for deletion)\n")
-
-DEFSH (VTYSH_OSPFD, no_debug_ospf_zebra_cmd_vtysh, 
-       "no debug ospf zebra", 
+DEFSH (VTYSH_ZEBRA, no_shutdown_if_cmd_vtysh, 
+       "no shutdown", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Zebra information\n")
+       "Shutdown the selected interface\n")
 
-DEFSH (VTYSH_ZEBRA, debug_zebra_packet_cmd_vtysh, 
-       "debug zebra packet", 
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra packet\n")
+DEFSH (VTYSH_BGPD, set_originator_id_cmd_vtysh, 
+       "set originator-id A.B.C.D", 
+       "Set values in destination routing protocol\n"
+       "BGP originator ID attribute\n"
+       "IP address of originator\n")
 
-DEFSH (VTYSH_RIPD, no_rip_redistribute_rip_cmd_vtysh, 
-       "no redistribute rip", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_type_routemap_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> metric-type (1|2) route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Routing Information Protocol (RIP)\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_type_cmd_vtysh, 
-       "default-information originate metric <0-16777214> metric-type (1|2)", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Metric for redistributed routes\n"
        "OSPF default metric\n"
-       "OSPF metric\n"
-       "OSPF metric type for default routes\n"
+       "OSPF exterior metric type for redistributed routes\n"
        "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_out_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD, no_rip_version_cmd_vtysh, 
-       "no version", 
-       "Negate a command or set its defaults\n"
-       "Set routing protocol version\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_topology_cmd_vtysh, 
-       "show ipv6 ospf6 area A.B.C.D topology", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Area information\n"
-       "Area ID (as an IPv4 notation)\n"
-       "Shortest Path First tree information\n"
-       "Displays SPF topology table\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_match_metric_val_cmd_vtysh, 
-       "no match metric <0-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match metric of route\n"
-       "Metric value\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_prefix_cmd_vtysh, 
-       "show ip bgp flap-statistics A.B.C.D/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (VTYSH_BGPD, bgp_always_compare_med_cmd_vtysh, 
-       "bgp always-compare-med", 
-       "BGP specific commands\n"
-       "Allow comparing MED from different neighbors\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_instance_all_soft_out_cmd_vtysh, 
-       "clear bgp view WORD * soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Set OSPF External Type 2 metrics\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_param2_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_filter_cmd_vtysh, 
+       "no debug bgp filters", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_advertised_route_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
-
-DEFSH (VTYSH_RIPD, rip_offset_list_cmd_vtysh, 
-       "offset-list WORD (in|out) <0-16>", 
-       "Modify RIP metric\n"
-       "Access-list name\n"
-       "For incoming updates\n"
-       "For outgoing updates\n"
-       "Metric value\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_out_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535> out", 
-       "Reset functions\n"
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, dump_bgp_routes_cmd_vtysh, 
-       "dump bgp routes-mrt PATH", 
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump whole BGP routing table\n"
-       "Output filename\n")
-
-DEFSH (VTYSH_OSPFD, no_area_vlink_authtype_md5_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(message-digest-key|)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
-
-DEFSH (VTYSH_OSPF6D, no_ipv6_ospf6_advertise_prefix_list_cmd_vtysh, 
-       "no ipv6 ospf6 advertise prefix-list", 
-       "Negate a command or set its defaults\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Advertising options\n"
-       "Filter prefix using prefix-list\n"
-       )
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_route_ospf6_external_cmd_vtysh, 
-       "show ipv6 ospf6 route redistribute", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Routing Table\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "redistributing External information\n"
-       )
+       "BGP filters\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh, 
-       "show ip bgp vpnv4 all neighbors A.B.C.D advertised-routes", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbor_routes_cmd_vtysh, 
+       "show ip bgp vpnv4 all neighbors A.B.C.D routes", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
@@ -6437,366 +4024,284 @@ DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh,
        "Display information about all VPNv4 NLRIs\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
-
-DEFSH (VTYSH_RIPD, rip_passive_interface_cmd_vtysh, 
-       "passive-interface IFNAME", 
-       "Suppress routing updates on an interface\n"
-       "Interface name\n")
+       "Display routes learned from neighbor\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_lsa_cmd_vtysh, 
-       "no debug ospf lsa", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_nsm_cmd_vtysh, 
+       "no debug ospf nsm", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
        "OSPF information\n"
-       "OSPF Link State Advertisement\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_network_cmd_vtysh, 
-       "no network IF_OR_ADDR", 
-       "Negate a command or set its defaults\n"
-       "RIPng enable on specified interface or network.\n"
-       "Interface or address")
+       "OSPF Neighbor State Machine")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_type_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> metric-type (1|2)", 
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2)", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Connected\n"
        "Static routes\n"
        "Routing Information Protocol (RIP)\n"
        "Border Gateway Protocol (BGP)\n"
-       "Metric for redistributed routes\n"
-       "OSPF default metric\n"
        "OSPF exterior metric type for redistributed routes\n"
        "Set OSPF External Type 1 metrics\n"
        "Set OSPF External Type 2 metrics\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_external_soft_out_cmd_vtysh, 
-       "clear bgp external soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_name_standard_cmd_vtysh, 
-       "no ip extcommunity-list standard WORD (deny|permit) .AA:NN", 
+DEFSH (VTYSH_OSPFD, no_neighbor_priority_cmd_vtysh, 
+       "no neighbor A.B.C.D priority <0-255>", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a extended community list entry\n"
-       "Specify standard extcommunity-list\n"
-       "Extended Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
+       "Specify neighbor router\n"
+       "Neighbor IP address\n"
+       "Neighbor Priority\n"
+       "Priority\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_default_metric_cmd_vtysh, 
-       "no default-metric", 
+DEFSH (VTYSH_RIPD, no_debug_rip_packet_cmd_vtysh, 
+       "no debug rip packet", 
        "Negate a command or set its defaults\n"
-       "Set metric of redistributed routes\n")
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP packet\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_paths_cmd_vtysh, 
-       "show ip bgp paths", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_le_ge_cmd_vtysh, 
+       "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
        "IP information\n"
-       "BGP information\n"
-       "Path information\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_advertised_route_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_cmd_vtysh, 
+       "ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", 
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_community_info_cmd_vtysh, 
+       "show ip bgp community-info", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+       "List all bgp community information\n")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2)", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "OSPF exterior metric type for redistributed routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n")
+DEFSH (VTYSH_OSPF6D, debug_ospf6_damp_cmd_vtysh, 
+       "debug ospf6 damp", 
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Flap-dampening information\n"
+      )
 
-DEFSH (VTYSH_BGPD, match_ipv6_next_hop_cmd_vtysh, 
-       "match ipv6 next-hop X:X::X:X", 
-       "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match IPv6 next-hop address of route\n"
-       "IPv6 address of next hop\n")
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged9_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged med next-hop as-path", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_transmit_delay_cmd_vtysh, 
-       "ip ospf transmit-delay <1-65535>", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n"
-       "Seconds\n")
+DEFSH (VTYSH_ZEBRA, debug_zebra_packet_direct_cmd_vtysh, 
+       "debug zebra packet (recv|send)", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra packet\n"
+       "Debug option set for receive packet\n"
+       "Debug option set for send packet\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_soft_in_cmd_vtysh, 
-       "clear ip bgp <1-65535> vpnv4 unicast soft in", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_remark_cmd_vtysh, 
+       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP extended access list\n"
+       "IP standard access list (expanded range)\n"
+       "IP extended access list (expanded range)\n"
+       "IP zebra access-list\n"
+       "Access list entry comment\n")
+
+DEFSH (VTYSH_BGPD, no_set_ecommunity_soo_val_cmd_vtysh, 
+       "no set extcommunity soo .ASN:nn_or_IP-address:nn", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Site-of-Origin extended community\n"
+       "VPN extended community\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
        "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_RIPD, rip_redistribute_type_routemap_cmd_vtysh, 
-       "redistribute (kernel|connected|static|ospf|bgp) route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Open Shortest Path First (OSPF)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_filter_list_cmd_vtysh, 
-       "show ipv6 bgp filter-list WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_instance_ipv6_summary_cmd_vtysh, 
-       "show bgp view WORD ipv6 summary", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_instance_neighbors_peer_cmd_vtysh, 
+       "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "BGP view\n"
        "View name\n"
-       "Address family\n"
-       "Summary of BGP neighbor status\n")
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_ra_lifetime_cmd_vtysh, 
-       "no ipv6 nd ra-lifetime", 
+DEFSH (VTYSH_BGPD, no_bgp_always_compare_med_cmd_vtysh, 
+       "no bgp always-compare-med", 
        "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "Allow comparing MED from different neighbors\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp external in prefix-filter", 
+       "Reset functions\n"
        "IP information\n"
-       "Neighbor discovery\n"
-       "Router lifetime\n")
+       "BGP information\n"
+       "Clear all external peers\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_OSPFD, no_area_export_list_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) export-list NAME", 
+DEFSH (VTYSH_BGPD, no_neighbor_version_cmd_vtysh, 
+       "no neighbor A.B.C.D " "version", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Unset the filter for networks announced to other areas\n"
-       "Name of the access-list\n")
-
-DEFSH (VTYSH_BGPD, bgp_distance_source_cmd_vtysh, 
-       "distance <1-255> A.B.C.D/M", 
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Neighbor's BGP version\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_route_ospf6_external_cmd_vtysh, 
+       "show ipv6 ospf6 route redistribute", 
        "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n")
+       "IPv6 Information\n"
+       "Routing Table\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "redistributing External information\n"
+       )
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_routes_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) routes", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_soft_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast soft in", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "BGP neighbor address to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, no_set_origin_cmd_vtysh, 
-       "no set origin", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP origin code\n")
+DEFSH (VTYSH_OSPF6D, ospf6_redistribute_routemap_cmd_vtysh, 
+       "redistribute (static|kernel|connected|ripng|bgp) route-map WORD", 
+       "Redistribute\n"
+       "Static routes\n"
+       "Kernel route\n"
+       "Connected route\n"
+       "RIPng route\n"
+       "BGP route\n"
+       "Route map reference\n"
+       "Route map name\n"
+      )
 
-DEFSH (VTYSH_BGPD, no_set_community_delete_val_cmd_vtysh, 
-       "no set comm-list (<1-99>|<100-199>|WORD) delete", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, set_ecommunity_rt_cmd_vtysh, 
+       "set extcommunity rt .ASN:nn_or_IP-address:nn", 
        "Set values in destination routing protocol\n"
-       "set BGP community list (for deletion)\n"
-       "Community-list number (standard)\n"
-       "Communitly-list number (expanded)\n"
-       "Community-list name\n"
-       "Delete matching communities\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_bestpath_aspath_ignore_cmd_vtysh, 
-       "no bgp bestpath as-path ignore", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "AS-path attribute\n"
-       "Ignore as-path length in selecting a route\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community_exact_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_scan_cmd_vtysh, 
-       "show ip bgp scan", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP scan status\n")
+       "BGP extended community attribute\n"
+       "Route Target extened communityt\n"
+       "VPN extended community\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_suppress_ra_cmd_vtysh, 
-       "no ipv6 nd suppress-ra", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Suppress Router Advertisement\n")
+DEFSH (VTYSH_BGPD, neighbor_local_as_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "local-as <1-65535>", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Specify a local-as number\n"
+       "AS number used as local AS\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_cluster_id_arg_cmd_vtysh, 
-       "no bgp cluster-id A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_host_cmd_vtysh, 
+       "no access-list (<1-99>|<1300-1999>) (deny|permit) host A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Configure Route-Reflector Cluster-id\n"
-       "Route-Reflector Cluster-id in IP address format\n")
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "A single host address\n"
+       "Address to match\n")
 
-DEFSH (VTYSH_OSPFD, no_area_shortcut_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) shortcut (enable|disable)", 
+DEFSH (VTYSH_OSPFD, no_area_import_list_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) import-list NAME", 
        "Negate a command or set its defaults\n"
        "OSPF area parameters\n"
        "OSPF area ID in IP address format\n"
        "OSPF area ID as a decimal value\n"
-       "Deconfigure the area's shortcutting mode\n"
-       "Deconfigure enabled shortcutting through the area\n"
-       "Deconfigure disabled shortcutting through the area\n")
-
-DEFSH (VTYSH_OSPF6D, interface_area_passive_cmd_vtysh, 
-       "interface IFNAME area A.B.C.D passive", 
-       "Enable routing on an IPv6 interface\n"
-       "Interface name(e.g. ep0)\n"
-       "Set the OSPF6 area ID\n"
-       "OSPF6 area ID in IPv4 address notation\n"
-       "Suppress routing updates on an interface\n"
-      )
+       "Unset the filter for networks announced to other areas\n"
+       "Name of the access-list\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_id_cmd_vtysh, 
-       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") A.B.C.D", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_cidr_only_cmd_vtysh, 
+       "show ip bgp cidr-only", 
        "Show running system information\n"
        "IP information\n"
-       "OSPF information\n"
-       "Database summary\n"
-       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
-       "Link State ID (as an IP address)\n")
+       "BGP information\n"
+       "Display only routes with non-natural netmasks\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_confederation_peers_cmd_vtysh, 
-       "no bgp confederation peers .<1-65535>", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "Peer ASs in BGP confederation\n"
-       "AS number\n")
+DEFSH (VTYSH_RIPNGD, ripng_timers_cmd_vtysh, 
+       "timers basic <0-65535> <0-65535> <0-65535>", 
+       "RIPng timers setup\n"
+       "Basic timer\n"
+       "Routing table update timer value in second. Default is 30.\n"
+       "Routing information timeout timer. Default is 180.\n"
+       "Garbage collection timer. Default is 120.\n")
 
-DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_name_expanded_cmd_vtysh, 
-       "no ip extcommunity-list expanded WORD (deny|permit) .LINE", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_transparent_as_cmd_vtysh, 
+       "neighbor A.B.C.D " "transparent-as", 
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Do not append my AS number even peer is EBGP peer\n")
+
+DEFSH (VTYSH_BGPD, ip_extcommunity_list_expanded_cmd_vtysh, 
+       "ip extcommunity-list <100-199> (deny|permit) .LINE", 
        "IP information\n"
        "Add a extended community list entry\n"
-       "Specify expanded extcommunity-list\n"
-       "Community list name\n"
+       "Extended Community list number (expanded)\n"
        "Specify community to reject\n"
        "Specify community to accept\n"
        "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community_list_exact_cmd_vtysh, 
-       "show bgp community-list WORD exact-match", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
-
-DEFSH (VTYSH_BGPD, ipv6_bgp_neighbor_received_routes_cmd_vtysh, 
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
-
-DEFSH (VTYSH_OSPFD, no_ospf_hello_interval_cmd_vtysh, 
-       "no ospf hello-interval", 
+DEFSH (VTYSH_RIPD, no_router_rip_cmd_vtysh, 
+       "no router rip", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n")
+       "Enable a routing process\n"
+       "Routing Information Protocol (RIP)\n")
 
-DEFSH (VTYSH_BGPD, no_set_weight_cmd_vtysh, 
-       "no set weight", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_le_cmd_vtysh, 
+       "no ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP weight for routing table\n")
-
-DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_int_detail_cmd_vtysh, 
-       "show ip ospf neighbor A.B.C.D detail", 
-       "Show running system information\n"
        "IP information\n"
-       "OSPF information\n"
-       "Neighbor list\n"
-       "Interface address\n"
-       "detail of all neighbors")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community_list_cmd_vtysh, 
-       "show bgp ipv6 community-list WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_route_cmd_vtysh, 
+       "show ip bgp A.B.C.D", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_in_prefix_filter_cmd_vtysh, 
-       "clear bgp peer-group WORD in prefix-filter", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, set_ecommunity_rt_cmd_vtysh, 
-       "set extcommunity rt .ASN:nn_or_IP-address:nn", 
-       "Set values in destination routing protocol\n"
-       "BGP extended community attribute\n"
-       "Route Target extened communityt\n"
-       "VPN extended community\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_description_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "description", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Neighbor specific description\n")
+       "Network in the BGP routing table to display\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_le_cmd_vtysh, 
-       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32>", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_ge_le_cmd_vtysh, 
+       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
        "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
@@ -6805,649 +4310,360 @@ DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_le_cmd_vtysh,
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n"
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_md5_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(message-digest-key|) <1-255> md5 KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
-
-DEFSH (VTYSH_ZEBRA, no_ipv6_forwarding_cmd_vtysh, 
-       "no ipv6 forwarding", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Doesn't forward IPv6 protocol packet")
-
-DEFSH (VTYSH_BGPD, show_bgp_community_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_OSPFD, ospf_router_id_cmd_vtysh, 
-       "ospf router-id A.B.C.D", 
-       "OSPF specific commands\n"
-       "router-id for the OSPF process\n"
-       "OSPF router-id in IP address format\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_community_exact_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D advertised-routes", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, no_neighbor_capability_orf_prefix_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "capability orf prefix-list (both|send|receive)", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise ORF capability to the peer\n"
-       "Advertise prefixlist ORF capability to this neighbor\n"
-       "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
-       "Capability to RECEIVE the ORF from this neighbor\n"
-       "Capability to SEND the ORF to this neighbor\n")
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n")
+DEFSH (VTYSH_OSPFD, ospf_priority_cmd_vtysh, 
+       "ospf priority <0-255>", 
+       "OSPF interface commands\n"
+       "Router priority\n"
+       "Priority\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_hello_interval_addr_cmd_vtysh, 
-       "ip ospf hello-interval <1-65535> A.B.C.D", 
-       "IP Information\n"
+DEFSH (VTYSH_OSPFD, ospf_hello_interval_cmd_vtysh, 
+       "ospf hello-interval <1-65535>", 
        "OSPF interface commands\n"
        "Time between HELLO packets\n"
-       "Seconds\n"
-       "Address of interface")
+       "Seconds\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_mask_summary_only_cmd_vtysh, 
-       "no aggregate-address A.B.C.D A.B.C.D summary-only", 
+DEFSH (VTYSH_BGPD, no_bgp_network_mask_cmd_vtysh, 
+       "no network A.B.C.D mask A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_intra_cmd_vtysh, 
-       "distance ospf external <1-255> intra-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "External routes\n"
-       "Distance for external routes\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n")
-
-DEFSH (VTYSH_OSPFD, area_vlink_param3_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
-
-DEFSH (VTYSH_BGPD, neighbor_soft_reconfiguration_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "soft-reconfiguration inbound", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Per neighbor soft reconfiguration\n"
-       "Allow inbound soft reconfiguration for this neighbor\n")
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Network mask\n"
+       "Network mask\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_ipv6_access_list_exact_cmd_vtysh, 
-       "no ipv6 access-list WORD (deny|permit) X:X::X:X/M exact-match", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_summary_only_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M summary-only", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n"
-       "Exact match of the prefixes\n")
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Filter more specific routes from updates\n")
 
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_metric_rmap_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295> route-map WORD", 
+DEFSH (VTYSH_RIPD, rip_redistribute_type_cmd_vtysh, 
+       "redistribute (kernel|connected|static|ospf|bgp)", 
        "Redistribute information from another routing protocol\n"
-       "Connected\n"
        "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp external in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv6_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf6|ripng|static)", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
        "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n")
-
-DEFSH (VTYSH_ZEBRA, show_ipv6_route_cmd_vtysh, 
-       "show ipv6 route", 
-       "Show running system information\n"
-       "IP information\n"
-       "IPv6 routing table\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_fast_external_failover_cmd_vtysh, 
-       "no bgp fast-external-failover", 
-       "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Immediately reset session if a link to a directly connected external peer goes down\n")
+       "Static routes\n"
+       "Open Shortest Path First (OSPF)\n"
+       "Border Gateway Protocol (BGP)\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_mask_as_set_summary_cmd_vtysh, 
-       "no aggregate-address A.B.C.D A.B.C.D as-set summary-only", 
-       "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
+DEFSH (VTYSH_BGPD, neighbor_capability_orf_prefix_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "capability orf prefix-list (both|send|receive)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise ORF capability to the peer\n"
+       "Advertise prefixlist ORF capability to this neighbor\n"
+       "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
+       "Capability to RECEIVE the ORF from this neighbor\n"
+       "Capability to SEND the ORF to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_soft_out_cmd_vtysh, 
-       "clear ip bgp external soft out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
        "Clear all external peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_summary_cmd_vtysh, 
-       "show bgp ipv6 summary", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Summary of BGP neighbor status\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_regexp_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) regexp .LINE", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
-
-DEFSH (VTYSH_OSPFD, no_area_vlink_authtype_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n")
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_out_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_soft_out_cmd_vtysh, 
+       "clear ip bgp view WORD * soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
+       "BGP view\n"
+       "view name\n"
        "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
+       "Soft reconfig\n"
        "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_ZEBRA, no_ip_address_label_cmd_vtysh, 
-       "no ip address A.B.C.D/M label LINE", 
-       "Negate a command or set its defaults\n"
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IP address (e.g. 10.0.0.1/8)\n"
-       "Label of this address\n"
-       "Label\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged7_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop med as-path", 
+DEFSH (VTYSH_BGPD, no_neighbor_set_peer_group_cmd_vtysh, 
+       "no neighbor A.B.C.D " "peer-group WORD", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "Med attribute\n"
-       "As-path attribute\n")
+       "Neighbor address\n"
+       "Member of the peer-group\n"
+       "peer-group name\n")
 
-DEFSH (VTYSH_BGPD, no_ipv6_bgp_network_route_map_cmd_vtysh, 
-       "no network X:X::X:X/M route-map WORD", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, bgp_network_mask_route_map_cmd_vtysh, 
+       "network A.B.C.D mask A.B.C.D route-map WORD", 
        "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>\n"
+       "Network number\n"
+       "Network mask\n"
+       "Network mask\n"
        "Route-map to modify the attributes\n"
        "Name of the route map\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, neighbor_ebgp_multihop_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "ebgp-multihop", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Allow EBGP neighbors not on directly connected networks\n")
-
-DEFSH (VTYSH_OSPFD, no_ip_ospf_authentication_key_cmd_vtysh, 
-       "no ip ospf authentication-key", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n")
+DEFSH (VTYSH_BGPD, aggregate_address_as_set_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M as-set", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Generate AS set path information\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbor_routes_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D routes", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_topology_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D topology", 
        "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Shortest Path First tree information\n"
+       "Displays SPF topology table\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_ism_sub_cmd_vtysh, 
-       "no debug ospf ism (status|events|timers)", 
+DEFSH (VTYSH_BGPD, no_neighbor_peer_group_remote_as_cmd_vtysh, 
+       "no neighbor WORD remote-as <1-65535>", 
        "Negate a command or set its defaults\n"
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n"
-       "ISM Status Information\n"
-       "ISM Event Information\n"
-       "ISM Timer Information\n")
-
-DEFSH (VTYSH_OSPFD, refresh_timer_cmd_vtysh, 
-       "refresh timer <10-1800>", 
-       "Adjust refresh parameters\n"
-       "Set refresh timer\n"
-       "Timer value in seconds\n")
+       "Specify neighbor router\n"
+       "Neighbor tag\n"
+       "Specify a BGP neighbor\n"
+       "AS number\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_nd_managed_config_flag_cmd_vtysh, 
-       "ipv6 nd managed-config-flag", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_ge_cmd_vtysh, 
+       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Neighbor discovery\n"
-       "Managed address configuration flag\n")
-
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_inter_cmd_vtysh, 
-       "distance ospf intra-area <1-255> inter-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_metric_val_cmd_vtysh, 
-       "no redistribute ospf6 metric <0-16>", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_routemap_cmd_vtysh, 
+       "no redistribute static route-map WORD", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n"
-       "Metric\n"
-       "Metric value\n")
+       "Static routes\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_set_ipv6_nexthop_local_val_cmd_vtysh, 
-       "no set ipv6 next-hop local X:X::X:X", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 local address\n"
-       "IPv6 address of next hop\n")
+DEFSH (VTYSH_RIPD, rip_network_cmd_vtysh, 
+       "network (A.B.C.D/M|WORD)", 
+       "Enable routing on an IP network\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_BGPD, ip_community_list_name_standard2_cmd_vtysh, 
-       "ip community-list standard WORD (deny|permit)", 
+DEFSH (VTYSH_ZEBRA, ip_route_mask_cmd_vtysh, 
+       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0)", 
        "IP information\n"
-       "Add a community list entry\n"
-       "Add a standard community-list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n")
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_capability_route_refresh_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "capability route-refresh", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise route-refresh capability to this neighbor\n")
+DEFSH (VTYSH_RIPD, debug_rip_zebra_cmd_vtysh, 
+       "debug rip zebra", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP and ZEBRA communication\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_cmd_vtysh, 
-       "no access-list WORD (deny|permit) A.B.C.D/M", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_match_metric_val_cmd_vtysh, 
+       "no match metric <0-4294967295>", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP zebra access-list name\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n")
+       "Match values from routing table\n"
+       "Match metric of route\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_ZEBRA, show_zebra_client_cmd_vtysh, 
-       "show zebra client", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_cmd_vtysh, 
+       "show ip ospf neighbor", 
        "Show running system information\n"
-       "Zebra information"
-       "Client information")
-
-DEFSH (VTYSH_BGPD, neighbor_allowas_in_arg_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "allowas-in <1-10>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Accept as-path with my AS present in it\n"
-       "Number of occurances of AS number\n")
+       "IP information\n"
+       "OSPF information\n"
+       "Neighbor list\n")
 
-DEFSH (VTYSH_BGPD, bgp_cluster_id_cmd_vtysh, 
-       "bgp cluster-id A.B.C.D", 
-       "BGP information\n"
-       "Configure Route-Reflector Cluster-id\n"
-       "Route-Reflector Cluster-id in IP address format\n")
+DEFSH (VTYSH_RIPNGD, no_ripng_default_metric_val_cmd_vtysh, 
+       "no default-metric <1-16>", 
+       "Negate a command or set its defaults\n"
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, no_router_bgp_view_cmd_vtysh, 
-       "no router bgp <1-65535> view WORD", 
+DEFSH (VTYSH_RIPNGD, no_debug_ripng_zebra_cmd_vtysh, 
+       "no debug ripng zebra", 
        "Negate a command or set its defaults\n"
-       "Enable a routing process\n"
-       "BGP information\n"
-       "AS number\n"
-       "BGP view\n"
-       "view name\n")
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng and zebra communication\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_packet_send_recv_cmd_vtysh, 
-       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)", 
+DEFSH (VTYSH_ZEBRA, no_ip_forwarding_cmd_vtysh, 
+       "no ip forwarding", 
        "Negate a command or set its defaults\n"
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
+       "IP information\n"
+       "Turn off IP forwarding")
 
-DEFSH (VTYSH_BGPD, no_set_community_cmd_vtysh, 
-       "no set community", 
+DEFSH (VTYSH_BGPD, no_set_aspath_prepend_val_cmd_vtysh, 
+       "no set as-path prepend .<1-65535>", 
        "Negate a command or set its defaults\n"
        "Set values in destination routing protocol\n"
-       "BGP community attribute\n")
+       "Prepend string for a BGP AS-path attribute\n"
+       "Prepend to the as-path\n"
+       "AS number\n")
 
-DEFSH (VTYSH_OSPFD|VTYSH_OSPF6D, ospf6_routemap_no_set_metric_type_cmd_vtysh, 
-       "no set metric-type (type-1|type-2)", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged4_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged med (as-path|next-hop)", 
        "Negate a command or set its defaults\n"
-       "Set value\n"
-       "Type of metric\n"
-       "OSPF6 external type 1 metric\n"
-       "OSPF6 external type 2 metric\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_name_seq_cmd_vtysh, 
-       "show ip prefix-list WORD seq <1-4294967295>", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_id_adv_router_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") A.B.C.D adv-router A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n")
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
+       "Link State ID (as an IP address)\n"
+       "Advertising Router link states\n"
+       "Advertising Router (as an IP address)\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp <1-65535> ipv4 (unicast|multicast) soft in", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_le_cmd_vtysh, 
+       "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", 
        "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n")
 
-DEFSH (VTYSH_OSPFD, ospf_rfc1583_flag_cmd_vtysh, 
-       "ospf rfc1583compatibility", 
-       "OSPF specific commands\n"
-       "Enable the RFC1583Compatibility flag\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD, match_interface_cmd_vtysh, 
+       "match interface WORD", 
+       "Match values from routing table\n"
+       "Match first hop interface of route\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_ZEBRA, no_debug_zebra_packet_cmd_vtysh, 
-       "no debug zebra packet", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_authentication_cmd_vtysh, 
+       "no ip ospf authentication", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra packet\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community4_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_RIPD, ip_rip_authentication_mode_cmd_vtysh, 
-       "ip rip authentication mode (md5|text)", 
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n"
-       "Keyed message digest\n"
-       "Clear text authentication\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n")
 
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_send_ra_cmd_vtysh, 
-       "no ipv6 nd send-ra", 
+DEFSH (VTYSH_BGPD, no_bgp_default_local_preference_val_cmd_vtysh, 
+       "no bgp default local-preference <0-4294967295>", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Send Router Advertisement\n")
+       "BGP specific commands\n"
+       "Configure BGP defaults\n"
+       "local preference (higher=more preferred)\n"
+       "Configure default local preference value\n")
 
-DEFSH (VTYSH_OSPFD, no_neighbor_pollinterval_cmd_vtysh, 
-       "no neighbor A.B.C.D poll-interval <1-65535>", 
+DEFSH (VTYSH_OSPFD, no_area_range_advertise_cost_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor IP address\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_exact_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp <1-65535> ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Advertise this range (default)\n"
+       "User specified metric for this range\n"
+       "Advertised metric for this range\n")
 
-DEFSH (VTYSH_OSPFD, ospf_abr_type_cmd_vtysh, 
-       "ospf abr-type (cisco|ibm|shortcut|standard)", 
+DEFSH (VTYSH_OSPFD, ospf_rfc1583_flag_cmd_vtysh, 
+       "ospf rfc1583compatibility", 
        "OSPF specific commands\n"
-       "Set OSPF ABR type\n"
-       "Alternative ABR,  cisco implementation\n"
-       "Alternative ABR,  IBM implementation\n"
-       "Shortcut ABR\n"
-       "Standard behavior (RFC2328)\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_maximum_prefix_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "maximum-prefix", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Maximum number of prefix accept from this peer\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_soft_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_type_cmd_vtysh, 
-       "default-information originate always metric <0-16777214> metric-type (1|2)", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n")
+       "Enable the RFC1583Compatibility flag\n")
 
-DEFSH (VTYSH_BGPD, neighbor_strict_capability_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "strict-capability-match", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Strict capability negotiation match\n")
+DEFSH (VTYSH_OSPFD, area_filter_list_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) filter-list prefix WORD (in|out)", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Filter networks between OSPF areas\n"
+       "Filter prefixes between OSPF areas\n"
+       "Name of an IP prefix-list\n"
+       "Filter networks sent to this area\n"
+       "Filter networks sent from this area\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community3_exact_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD, ip_rip_send_version_1_cmd_vtysh, 
+       "ip rip send version 1 2", 
        "IP information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n"
+       "RIP version 1\n"
+       "RIP version 2\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_instance_all_soft_cmd_vtysh, 
-       "clear bgp view WORD * soft", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_in_cmd_vtysh, 
+       "clear ip bgp * vpnv4 unicast in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
        "Clear all peers\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_peer_in_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
        "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_version_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "version", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Neighbor's BGP version\n")
+DEFSH (VTYSH_BGPD, bgp_network_import_check_cmd_vtysh, 
+       "bgp network import-check", 
+       "BGP specific commands\n"
+       "BGP network command\n"
+       "Check BGP network route exists in IGP\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_prefix_cmd_vtysh, 
-       "show ipv6 prefix-list WORD X:X::X:X/M", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_priority_cmd_vtysh, 
+       "ip ospf priority <0-255>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Router priority\n"
+       "Priority\n")
 
-DEFSH (VTYSH_BGPD, ipv6_mbgp_neighbor_advertised_route_cmd_vtysh, 
-       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_lsa_cmd_vtysh, 
+       "debug ospf lsa", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Link State Advertisement\n")
 
-DEFSH (VTYSH_ZEBRA, show_ip_route_addr_cmd_vtysh, 
-       "show ip route A.B.C.D", 
+DEFSH (VTYSH_ZEBRA, show_ip_route_prefix_longer_cmd_vtysh, 
+       "show ip route A.B.C.D/M longer-prefixes", 
        "Show running system information\n"
        "IP information\n"
        "IP routing table\n"
-       "Network in the IP routing table to display\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Show route matching the specified Network/Mask pair only\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_seq_le_cmd_vtysh, 
-       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128>", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+DEFSH (VTYSH_BGPD, bgp_always_compare_med_cmd_vtysh, 
+       "bgp always-compare-med", 
+       "BGP specific commands\n"
+       "Allow comparing MED from different neighbors\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community_list_cmd_vtysh, 
-       "show ipv6 mbgp community-list WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
+DEFSH (VTYSH_OSPFD, ospf_distribute_list_out_cmd_vtysh, 
+       "distribute-list WORD out (kernel|connected|static|rip|bgp)", 
+       "Filter networks in routing updates\n"
+       "Access-list name\n"
+       "Filter outgoing routing updates\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n")
 
 DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community3_cmd_vtysh, 
        "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
@@ -7471,89 +4687,99 @@ DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community3_cmd_vtysh,
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged7_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop med as-path", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "Med attribute\n"
-       "As-path attribute\n")
+DEFSH (VTYSH_RIPD, match_ip_next_hop_cmd_vtysh, 
+       "match ip next-hop WORD", 
+       "Match values from routing table\n"
+       "IP information\n"
+       "Match next-hop address of route\n"
+       "IP access-list name\n")
 
-DEFSH (VTYSH_BGPD, neighbor_default_originate_rmap_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "default-originate route-map WORD", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Originate default route to this neighbor\n"
-       "Route-map to specify criteria to originate default\n"
-       "route-map name\n")
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_prefix_cmd_vtysh, 
+       "show ip prefix-list WORD A.B.C.D/M", 
+       "Show running system information\n"
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_priority_cmd_vtysh, 
-       "ip ospf priority <0-255>", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Router priority\n"
-       "Priority\n")
+DEFSH (VTYSH_BGPD, no_aggregate_address_mask_cmd_vtysh, 
+       "no aggregate-address A.B.C.D A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_metric_routemap_cmd_vtysh, 
-       "no redistribute connected metric <0-16> route-map WORD", 
+DEFSH (VTYSH_RIPD, key_string_cmd_vtysh, 
+       "key-string LINE", 
+       "Set key string\n"
+       "The key\n")
+
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_cmd_vtysh, 
+       "no redistribute ospf6", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_BGPD, neighbor_allowas_in_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "allowas-in", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Accept as-path with my AS present in it\n")
+       "IPv6 Open Shortest Path First (OSPFv3)\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_out_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) out", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_address_prefix_list_cmd_vtysh, 
+       "no match ip address prefix-list", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
+       "Match address of route\n"
+       "Match entries of prefix-lists\n")
 
-DEFSH (VTYSH_BGPD, bgp_distance_source_access_list_cmd_vtysh, 
-       "distance <1-255> A.B.C.D/M WORD", 
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n"
-       "Access list name\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_any_cmd_vtysh, 
+       "access-list WORD (deny|permit) any", 
+       "Add an access list entry\n"
+       "IP zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Prefix to match. e.g. 10.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_regexp_cmd_vtysh, 
-       "show ip bgp regexp .LINE", 
+DEFSH (VTYSH_OSPFD, no_neighbor_poll_interval_cmd_vtysh, 
+       "no neighbor A.B.C.D poll-interval <1-65535>", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor IP address\n"
+       "Dead Neighbor Polling interval\n"
+       "Seconds\n")
+
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_adv_router_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") adv-router A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
+       "Advertising Router link states\n"
+       "Advertising Router (as an IP address)\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_in_cmd_vtysh, 
-       "clear bgp * in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, no_ip_ospf_authentication_addr_cmd_vtysh, 
+       "no ip ospf authentication A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Address of interface")
 
-DEFSH (VTYSH_OSPF6D, show_debug_ospf6_cmd_vtysh, 
-      "show debugging ospf6", 
-      "Show running system information\n"
-      "Debugging functions (see also 'undebug')\n"
-      "Open Shortest Path First (OSPF) for IPv6\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_host_mask_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D A.B.C.D A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "Destination address\n"
+       "Destination Wildcard bits\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community4_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_community4_exact_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
-       "IPv6 information\n"
+       "IP information\n"
        "BGP information\n"
        "Display routes matching the communities\n"
        "community number\n"
@@ -7571,828 +4797,819 @@ DEFSH (VTYSH_BGPD, show_ipv6_bgp_community4_cmd_vtysh,
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_summary_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn summary", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Summary of BGP neighbor status\n")
+DEFSH (VTYSH_BGPD, no_set_aspath_prepend_cmd_vtysh, 
+       "no set as-path prepend", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "Prepend string for a BGP AS-path attribute\n"
+       "Prepend to the as-path\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D in", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, ip_extcommunity_list_name_standard2_cmd_vtysh, 
+       "ip extcommunity-list standard WORD (deny|permit)", 
        "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig inbound update\n")
+       "Add a extended community list entry\n"
+       "Specify standard extcommunity-list\n"
+       "Extended Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n")
+DEFSH (VTYSH_RIPD, rip_route_cmd_vtysh, 
+       "route A.B.C.D/M", 
+       "RIP static route configuration\n"
+       "IP prefix <network>/<length>\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_out_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_BGPD, ip_community_list_standard_cmd_vtysh, 
+       "ip community-list <1-99> (deny|permit) .AA:NN", 
+       "IP information\n"
+       "Add a community list entry\n"
+       "Community list number (standard)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
 
-DEFSH (VTYSH_BGPD, debug_bgp_fsm_cmd_vtysh, 
-       "debug bgp fsm", 
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP Finite State Machine\n")
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_ripng_cmd_vtysh, 
+       "redistribute ripng", 
+       "Redistribute information from another routing protocol\n"
+       "RIPng route\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_cmd_vtysh, 
-       "no redistribute bgp", 
+DEFSH (VTYSH_BGPD, no_neighbor_advertise_interval_val_cmd_vtysh, 
+       "no neighbor A.B.C.D " "advertisement-interval <0-600>", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Minimum interval between sending BGP routing updates\n"
+       "time in seconds\n")
 
-DEFSH (VTYSH_RIPD, rip_timers_cmd_vtysh, 
-       "timers basic <5-2147483647> <5-2147483647> <5-2147483647>", 
-       "Adjust routing timers\n"
-       "Basic routing protocol update timers\n"
-       "Routing table update timer value in second. Default is 30.\n"
-       "Routing information timeout timer. Default is 180.\n"
-       "Garbage collection timer. Default is 120.\n")
+DEFSH (VTYSH_BGPD, no_match_aspath_cmd_vtysh, 
+       "no match as-path", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match BGP AS path list\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_seq_ge_le_cmd_vtysh, 
-       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M ge <0-128> le <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+DEFSH (VTYSH_BGPD, neighbor_capability_route_refresh_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "capability route-refresh", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise route-refresh capability to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, old_ipv6_aggregate_address_cmd_vtysh, 
-       "ipv6 bgp aggregate-address X:X::X:X/M", 
-       "IPv6 information\n"
-       "BGP information\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
+DEFSH (VTYSH_BGPD, bgp_damp_unset2_cmd_vtysh, 
+       "no bgp dampening <1-45> <1-20000> <1-20000> <1-255>", 
+       "Negate a command or set its defaults\n"
+       "BGP Specific commands\n"
+       "Enable route-flap dampening\n"
+       "Half-life time for the penalty\n"
+       "Value to start reusing a route\n"
+       "Value to start suppressing a route\n"
+       "Maximum duration to suppress a stable route\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp view WORD * ipv4 (unicast|multicast) soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_soft_in_cmd_vtysh, 
+       "clear ip bgp <1-65535> vpnv4 unicast soft in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Address Family modifier\n"
        "Soft reconfig\n"
        "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged1_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged (as-path|next-hop|med)", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_metric_cmd_vtysh, 
+       "no redistribute ospf6 metric", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
+       "Redistribute information from another routing protocol\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n"
+       "Metric\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD, no_match_interface_cmd_vtysh, 
-       "no match interface", 
+DEFSH (VTYSH_BGPD, no_neighbor_prefix_list_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "prefix-list WORD (in|out)", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match first hop interface of route\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Filter updates to/from this neighbor\n"
+       "Name of a prefix list\n"
+       "Filter incoming updates\n"
+       "Filter outgoing updates\n")
+
+DEFSH (VTYSH_BGPD, bgp_network_route_map_cmd_vtysh, 
+       "network A.B.C.D/M route-map WORD", 
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Route-map to modify the attributes\n"
+       "Name of the route map\n")
 
-DEFSH (VTYSH_ZEBRA, show_ipv6_route_prefix_longer_cmd_vtysh, 
-       "show ipv6 route X:X::X:X/M longer-prefixes", 
+DEFSH (VTYSH_OSPFD, area_vlink_authtype_authkey_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) "
+       "(authentication-key|) AUTH_KEY", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n"
+       "Authentication password (key)\n" "The OSPF password (key)")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_damp_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) dampened-routes", 
        "Show running system information\n"
        "IP information\n"
-       "IPv6 routing table\n"
-       "IPv6 prefix\n"
-       "Show route matching the specified Network/Mask pair only\n")
+       "BGP information\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display the dampened routes received from neighbor\n")
 
-DEFSH (VTYSH_OSPFD, ospf_priority_cmd_vtysh, 
-       "ospf priority <0-255>", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_transmit_delay_addr_cmd_vtysh, 
+       "no ip ospf transmit-delay A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "IP Information\n"
        "OSPF interface commands\n"
-       "Router priority\n"
-       "Priority\n")
+       "Link state transmit delay\n"
+       "Address of interface")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_description_cmd_vtysh, 
-       "ipv6 prefix-list WORD description .LINE", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n"
-       "Up to 80 characters describing this prefix-list\n")
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged1_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged (as-path|next-hop|med)", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
+
+DEFSH (VTYSH_BGPD, bgp_network_cmd_vtysh, 
+       "network A.B.C.D/M", 
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community_all_cmd_vtysh, 
-       "show bgp ipv6 community", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_scan_cmd_vtysh, 
+       "show ip bgp scan", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Display routes matching the communities\n")
+       "BGP scan status\n")
 
-DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_name_all_cmd_vtysh, 
-       "no ip extcommunity-list (standard|expanded) WORD", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a extended community list entry\n"
-       "Specify standard extcommunity-list\n"
-       "Specify expanded extcommunity-list\n"
-       "Extended Community list name\n")
+DEFSH (VTYSH_RIPD, rip_offset_list_ifname_cmd_vtysh, 
+       "offset-list WORD (in|out) <0-16> IFNAME", 
+       "Modify RIP metric\n"
+       "Access-list name\n"
+       "For incoming updates\n"
+       "For outgoing updates\n"
+       "Metric value\n"
+       "Interface to match\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_advertise_interval_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "advertisement-interval", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_rmap_onmatch_next_cmd_vtysh, 
+       "no on-match next", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Minimum interval between sending BGP routing updates\n")
+       "Exit policy on matches\n"
+       "Next clause\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community3_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+DEFSH (VTYSH_OSPF6D, interface_area_cmd_vtysh, 
+       "interface IFNAME area A.B.C.D", 
+       "Enable routing on an IPv6 interface\n"
+       "Interface name(e.g. ep0)\n"
+       "Set the OSPF6 area ID\n"
+       "OSPF6 area ID in IPv4 address notation\n"
+      )
 
-DEFSH (VTYSH_RIPD, send_lifetime_duration_day_month_cmd_vtysh, 
-       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> duration <1-2147483646>", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Duration of the key\n"
-       "Duration seconds\n")
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_routemap_cmd_vtysh, 
+       "redistribute kernel route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_cmd_vtysh, 
-       "ip prefix-list WORD seq <1-4294967295> (deny|permit) (A.B.C.D/M|any)", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n")
+DEFSH (VTYSH_BGPD, bgp_default_local_preference_cmd_vtysh, 
+       "bgp default local-preference <0-4294967295>", 
+       "BGP specific commands\n"
+       "Configure BGP defaults\n"
+       "local preference (higher=more preferred)\n"
+       "Configure default local preference value\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_prefix_cmd_vtysh, 
-       "no ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Any prefix match.  Same as \"0.0.0.0/0 le 32\"\n")
+DEFSH (VTYSH_BGPD, bgp_network_mask_natural_backdoor_cmd_vtysh, 
+       "network A.B.C.D backdoor", 
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Specify a BGP backdoor route\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_soft_cmd_vtysh, 
-       "clear bgp <1-65535> soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_cmd_vtysh, 
+       "redistribute static", 
+       "Redistribute information from another routing protocol\n"
+       "Static routes\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_cmd_vtysh, 
-       "show bgp ipv6", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, undebug_bgp_fsm_cmd_vtysh, 
+       "undebug bgp fsm", 
+       "Disable debugging functions (see also 'debug')\n"
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Address family\n")
+       "Finite State Machine\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_ebgp_multihop_ttl_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "ebgp-multihop <1-255>", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_prefix_list_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "prefix-list WORD (in|out)", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Allow EBGP neighbors not on directly connected networks\n"
-       "maximum hop count\n")
-
-DEFSH (VTYSH_BGPD, bgp_scan_time_cmd_vtysh, 
-       "bgp scan-time <5-60>", 
-       "BGP specific commands\n"
-       "Configure background scanner interval\n"
-       "Scanner interval (seconds)\n")
-
-DEFSH (VTYSH_OSPFD, no_ip_ospf_message_digest_key_addr_cmd_vtysh, 
-       "no ip ospf message-digest-key <1-255> A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n"
-       "Address of interface")
+       "Neighbor address\nNeighbor tag\n"
+       "Filter updates to/from this neighbor\n"
+       "Name of a prefix list\n"
+       "Filter incoming updates\n"
+       "Filter outgoing updates\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_name_cmd_vtysh, 
-       "show ipv6 prefix-list WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n")
+DEFSH (VTYSH_RIPD, rip_distance_source_access_list_cmd_vtysh, 
+       "distance <1-255> A.B.C.D/M WORD", 
+       "Administrative distance\n"
+       "Distance value\n"
+       "IP source prefix\n"
+       "Access list name\n")
 
-DEFSH (VTYSH_RIPNGD, show_debugging_ripng_cmd_vtysh, 
-       "show debugging ripng", 
+DEFSH (VTYSH_ZEBRA, show_zebra_client_cmd_vtysh, 
+       "show zebra client", 
        "Show running system information\n"
-       "RIPng configuration\n"
-       "Debugging information\n")
+       "Zebra information"
+       "Client information")
 
-DEFSH (VTYSH_BGPD, ip_community_list_standard2_cmd_vtysh, 
-       "ip community-list <1-99> (deny|permit)", 
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n")
+DEFSH (VTYSH_RIPNGD, ripng_passive_interface_cmd_vtysh, 
+       "passive-interface IFNAME", 
+       "Suppress routing updates on an interface\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, show_ip_access_list_cmd_vtysh, 
-       "show ip access-list", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_received_routes_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
        "Show running system information\n"
        "IP information\n"
-       "List IP access lists\n")
-
-DEFSH (VTYSH_BGPD, ipv6_bgp_neighbor_advertised_route_cmd_vtysh, 
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
        "BGP information\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+       "Display the received routes from neighbor\n")
 
-DEFSH (VTYSH_BGPD, no_set_origin_val_cmd_vtysh, 
-       "no set origin (egp|igp|incomplete)", 
+DEFSH (VTYSH_BGPD, dump_bgp_all_cmd_vtysh, 
+       "dump bgp all PATH", 
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump all BGP packets\n"
+       "Output filename\n")
+
+DEFSH (VTYSH_ZEBRA, no_debug_zebra_packet_cmd_vtysh, 
+       "no debug zebra packet", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP origin code\n"
-       "remote EGP\n"
-       "local IGP\n"
-       "unknown heritage\n")
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra packet\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_route_cmd_vtysh, 
-       "show ipv6 ospf6 area A.B.C.D route", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Area information\n"
-       "Area ID (as an IPv4 notation)\n"
-       "Routing Table\n"
-       )
+DEFSH (VTYSH_BGPD, no_bgp_network_route_map_cmd_vtysh, 
+       "no network A.B.C.D/M route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Route-map to modify the attributes\n"
+       "Name of the route map\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_neighbor_routes_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_received_routes_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) received-routes", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "Display the received routes from neighbor\n")
 
-DEFSH (VTYSH_OSPFD, debug_ospf_lsa_cmd_vtysh, 
-       "debug ospf lsa", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Link State Advertisement\n")
+DEFSH (VTYSH_ZEBRA, ip_address_cmd_vtysh, 
+       "ip address A.B.C.D/M", 
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP address (e.g. 10.0.0.1/8)\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_dont_capability_negotiate_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "dont-capability-negotiate", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Do not perform capability negotiation\n")
+DEFSH (VTYSH_BGPD, show_debugging_bgp_cmd_vtysh, 
+       "show debugging bgp", 
+       "Show running system information\n"
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_soft_cmd_vtysh, 
-       "clear ip bgp view WORD * soft", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_in_cmd_vtysh, 
+       "clear ip bgp <1-65535> in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Soft reconfig\n")
+       "Clear peers with the AS number\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_dead_interval_cmd_vtysh, 
-       "ip ospf dead-interval <1-65535>", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Seconds\n")
+DEFSH (VTYSH_OSPF6D, interface_area_plist_cmd_vtysh, 
+       "interface IFNAME area A.B.C.D prefix-list WORD", 
+       "Enable routing on an IPv6 interface\n"
+       "Interface name(e.g. ep0)\n"
+       "Set the OSPF6 area ID\n"
+       "OSPF6 area ID in IPv4 address notation\n"
+       "Advertise I/F Address only match entries of prefix-list\n"
+       "IPv6 prefix-list name\n"
+      )
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_cmd_vtysh, 
-       "distance ospf inter-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n")
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_out_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) out", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_message_digest_key_cmd_vtysh, 
-       "no ip ospf message-digest-key <1-255>", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_transmit_delay_cmd_vtysh, 
+       "no ip ospf transmit-delay", 
        "Negate a command or set its defaults\n"
        "IP Information\n"
        "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n")
+       "Link state transmit delay\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_soft_cmd_vtysh, 
-       "clear ip bgp peer-group WORD soft", 
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_cmd_vtysh, 
+       "default-information originate metric-type (1|2)", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_soft_cmd_vtysh, 
+       "clear ip bgp A.B.C.D soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
+       "BGP neighbor address to clear\n"
        "Soft reconfig\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_route_ospf6_external_prefix_cmd_vtysh, 
-       "show ipv6 ospf6 route redistribute X::X", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Routing Table\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "redistributing External information\n"
-       "match IPv6 prefix\n"
-       )
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged3_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged next-hop (as-path|med)", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n"
+       "Med attribute\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_metric_cmd_vtysh, 
-       "redistribute ospf6 metric <0-16>", 
-       "Redistribute information from another routing protocol\n"
-       "IPv6 Open Shortest Path First (OSPFv3)\n"
-       "Metric\n"
-       "Metric value\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_external_cmd_vtysh, 
+       "distance ospf intra-area <1-255> external <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_soft_cmd_vtysh, 
-       "clear ip bgp <1-65535> soft", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_ZEBRA, config_table_cmd_vtysh, 
-       "table TABLENO", 
-       "Configure target kernel routing table\n"
-       "TABLE integer\n")
-
-DEFSH (VTYSH_OSPFD, no_debug_ospf_zebra_sub_cmd_vtysh, 
-       "no debug ospf zebra (interface|redistribute)", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
+       "BGP neighbor address to clear\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_cmd_vtysh, 
-       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" "|max-age|self-originate)", 
-       "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "Database summary\n"
-       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
-       "LSAs in MaxAge list\n"
-       "Self-originated link states\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_dead_interval_addr_cmd_vtysh, 
+       "ip ospf dead-interval <1-65535> A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interval after which a neighbor is declared dead\n"
+       "Seconds\n"
+       "Address of interface")
 
-DEFSH (VTYSH_BGPD, neighbor_prefix_list_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "prefix-list WORD (in|out)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Filter updates to/from this neighbor\n"
-       "Name of a prefix list\n"
-       "Filter incoming updates\n"
-       "Filter outgoing updates\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_routemap_cmd_vtysh, 
+       "default-information originate metric-type (1|2) route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_cmd_vtysh, 
-       "no ip prefix-list WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_host_any_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_nomask_cmd_vtysh, 
-       "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", 
        "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Address to match\n")
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "Any destination host\n")
 
-DEFSH (VTYSH_BGPD, neighbor_default_originate_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "default-originate", 
+DEFSH (VTYSH_BGPD, neighbor_allowas_in_arg_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "allowas-in <1-10>", 
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Originate default route to this neighbor\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Accept as-path with my AS present in it\n"
+       "Number of occurances of AS number\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_cmd_vtysh, 
-       "default-information originate always metric <0-16777214>", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "OSPF metric type for default routes\n")
+DEFSH (VTYSH_BGPD, neighbor_ebgp_multihop_ttl_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "ebgp-multihop <1-255>", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Allow EBGP neighbors not on directly connected networks\n"
+       "maximum hop count\n")
 
-DEFSH (VTYSH_RIPD, no_rip_route_cmd_vtysh, 
-       "no route A.B.C.D/M", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_keepalive_cmd_vtysh, 
+       "no debug bgp keepalives", 
        "Negate a command or set its defaults\n"
-       "RIP static route configuration\n"
-       "IP prefix <network>/<length>\n")
-
-DEFSH (VTYSH_RIPD, rip_default_metric_cmd_vtysh, 
-       "default-metric <1-16>", 
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "BGP keepalives\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_dead_interval_addr_cmd_vtysh, 
-       "no ip ospf dead-interval A.B.C.D", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_priority_addr_cmd_vtysh, 
+       "no ip ospf priority A.B.C.D", 
        "Negate a command or set its defaults\n"
        "IP Information\n"
        "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
+       "Router priority\n"
        "Address of interface")
 
-DEFSH (VTYSH_RIPNGD, show_ipv6_ripng_cmd_vtysh, 
-       "show ipv6 ripng", 
-       "Show running system information\n"
-       "IP information\n"
-       "Show RIPng routes\n")
-
-DEFSH (VTYSH_OSPFD, ospf_compatible_rfc1583_cmd_vtysh, 
-       "compatible rfc1583", 
-       "OSPF compatibility list\n"
-       "compatible with RFC 1583\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_routemap_cmd_vtysh, 
-       "no redistribute static route-map WORD", 
+DEFSH (VTYSH_RIPD, no_rip_default_metric_cmd_vtysh, 
+       "no default-metric", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged1_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged (as-path|next-hop|med)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
+DEFSH (VTYSH_ZEBRA, no_bandwidth_if_val_cmd_vtysh, 
+       "no bandwidth <1-10000000>", 
+       "Negate a command or set its defaults\n"
+       "Set bandwidth informational parameter\n"
+       "Bandwidth in kilobits\n")
 
-DEFSH (VTYSH_BGPD, dump_bgp_routes_interval_cmd_vtysh, 
-       "dump bgp routes-mrt PATH INTERVAL", 
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump whole BGP routing table\n"
-       "Output filename\n"
-       "Interval of output\n")
+DEFSH (VTYSH_RIPD, send_lifetime_infinite_month_day_cmd_vtysh, 
+       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Never expires")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_routemap_cmd_vtysh, 
-       "redistribute kernel route-map WORD", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_routemap_cmd_vtysh, 
+       "no redistribute bgp route-map WORD", 
+       "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
+       "Border Gateway Protocol (BGP)\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community4_exact_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+DEFSH (VTYSH_BGPD, no_vpnv4_network_cmd_vtysh, 
+       "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", 
+       "Negate a command or set its defaults\n"
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Specify Route Distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "BGP tag\n"
+       "tag value\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_soft_out_cmd_vtysh, 
-       "clear bgp <1-65535> soft out", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_filter_list_cmd_vtysh, 
+       "show ip bgp filter-list WORD", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Display routes conforming to the filter-list\n"
+       "Regular expression access list name\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbors_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_route_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Display VPNv4 NLRI specific information\n"
        "Display information for a route distinguisher\n"
        "VPN Route Distinguisher\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
-
-DEFSH (VTYSH_OSPFD, interface_ip_ospf_authentication_args_cmd_vtysh, 
-       "ip ospf authentication (null|message-digest)", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n"
-       "Use null authentication\n"
-       "Use message-digest authentication\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_timers_cmd_vtysh, 
-       "no timers basic", 
-       "Negate a command or set its defaults\n"
-       "RIPng timers setup\n"
-       "Basic timer\n")
+       "Network in the BGP routing table to display\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_cmd_vtysh, 
-       "show ip prefix-list", 
-       "Show running system information\n"
-       "IP information\n"
-       "Build a prefix list\n")
+DEFSH (VTYSH_BGPD, undebug_bgp_keepalive_cmd_vtysh, 
+       "undebug bgp keepalives", 
+       "Disable debugging functions (see also 'debug')\n"
+       "BGP information\n"
+       "BGP keepalives\n")
 
-DEFSH (VTYSH_BGPD, no_match_community_val_cmd_vtysh, 
-       "no match community (<1-99>|<100-199>|WORD)", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_ism_cmd_vtysh, 
+       "no debug ospf ism", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n")
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Interface State Machine")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_set_ip_nexthop_val_cmd_vtysh, 
-       "no set ip next-hop A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IP information\n"
-       "Next hop address\n"
-       "IP address of next hop\n")
+DEFSH (VTYSH_RIPD, send_lifetime_duration_day_month_cmd_vtysh, 
+       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> duration <1-2147483646>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Duration of the key\n"
+       "Duration seconds\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_sequence_number_cmd_vtysh, 
-       "no ip prefix-list sequence-number", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged5_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged as-path next-hop med", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Include/exclude sequence numbers in NVGEN\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_in_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535> in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "BGP neighbor address to clear\n"
        "Address family\n"
-       "Clear peers with the AS number\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig\n"
        "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_receive_version_cmd_vtysh, 
-       "no ip rip receive version", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement reception\n"
-       "Version control\n")
+DEFSH (VTYSH_RIPD, rip_default_information_originate_cmd_vtysh, 
+       "default-information originate", 
+       "Control distribution of default route\n"
+       "Distribute a default route\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_cmd_vtysh, 
-       "default-information originate always", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n")
+DEFSH (VTYSH_RIPD, rip_default_metric_cmd_vtysh, 
+       "default-metric <1-16>", 
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_in_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast in", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (VTYSH_BGPD, bgp_confederation_identifier_cmd_vtysh, 
+       "bgp confederation identifier <1-65535>", 
+       "BGP specific commands\n"
+       "AS confederation parameters\n"
+       "AS number\n"
+       "Set routing domain confederation AS\n")
+
+DEFSH (VTYSH_RIPD, no_key_string_cmd_vtysh, 
+       "no key-string [LINE]", 
+       "Negate a command or set its defaults\n"
+       "Unset key string\n"
+       "The key\n")
+
+DEFSH (VTYSH_BGPD, debug_bgp_update_direct_cmd_vtysh, 
+       "debug bgp updates (in|out)", 
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound update\n")
+       "BGP updates\n"
+       "Inbound updates\n"
+       "Outbound updates\n")
 
-DEFSH (VTYSH_OSPF6D, no_ipv6_ospf6_advertise_force_prefix_cmd_vtysh, 
-       "no ipv6 ospf6 advertise force-prefix", 
+DEFSH (VTYSH_OSPFD, no_auto_cost_reference_bandwidth_cmd_vtysh, 
+       "no auto-cost reference-bandwidth", 
        "Negate a command or set its defaults\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Advertising options\n"
-       "Force to advertise prefix,  applicable if Loopback or P-to-P\n"
-       )
+       "Calculate OSPF interface cost according to bandwidth\n"
+       "Use reference bandwidth method to assign OSPF cost\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_received_routes_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) received-routes", 
+DEFSH (VTYSH_BGPD, no_ip_community_list_all_cmd_vtysh, 
+       "no ip community-list (WORD|<1-99>|<100-199>)", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Add a community list entry\n"
+       "Community list name\n"
+       "Community list number (standard)\n"
+       "Community list number (expanded)\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_filter_list_cmd_vtysh, 
+       "show ip bgp flap-statistics filter-list WORD", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
+       "Display flap statistics of routes\n"
+       "Display routes conforming to the filter-list\n"
+       "Regular expression access list name\n")
 
-DEFSH (VTYSH_BGPD, no_debug_bgp_normal_cmd_vtysh, 
-       "no debug bgp", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n")
+DEFSH (VTYSH_OSPFD, area_vlink_authtype_args_authkey_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) (message-digest|null) "
+       "(authentication-key|) AUTH_KEY", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n"
+       "Authentication password (key)\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast out", 
+DEFSH (VTYSH_BGPD, bgp_network_mask_natural_route_map_cmd_vtysh, 
+       "network A.B.C.D route-map WORD", 
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Route-map to modify the attributes\n"
+       "Name of the route map\n")
+
+DEFSH (VTYSH_ZEBRA, show_interface_cmd_vtysh, 
+       "show interface [IFNAME]", 
+       "Show running system information\n"
+       "Interface status and configuration\n"
+       "Inteface name\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_soft_out_cmd_vtysh, 
+       "clear ip bgp <1-65535> vpnv4 unicast soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "Address Family Modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig\n"
        "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_routemap_cmd_vtysh, 
-       "default-information originate always metric <0-16777214> route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_cmd_vtysh, 
-       "default-information originate metric <0-16777214>", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n")
+DEFSH (VTYSH_BGPD, match_community_exact_cmd_vtysh, 
+       "match community (<1-99>|<100-199>|WORD) exact-match", 
+       "Match values from routing table\n"
+       "Match BGP community list\n"
+       "Community-list number (standard)\n"
+       "Community-list number (expanded)\n"
+       "Community-list name\n"
+       "Do exact matching of communities\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_summary_cmd_vtysh, 
-       "show ipv6 mbgp summary", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Summary of BGP neighbor status\n")
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_description_cmd_vtysh, 
+       "ip prefix-list WORD description .LINE", 
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Prefix-list specific description\n"
+       "Up to 80 characters describing this prefix-list\n")
 
-DEFSH (VTYSH_OSPFD, no_refresh_timer_val_cmd_vtysh, 
-       "no refresh timer <10-1800>", 
-       "Adjust refresh parameters\n"
-       "Unset refresh timer\n"
-       "Timer value in seconds\n")
+DEFSH (VTYSH_RIPD, rip_neighbor_cmd_vtysh, 
+       "neighbor A.B.C.D", 
+       "Specify a neighbor router\n"
+       "Neighbor address\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_cmd_vtysh, 
-       "no access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_RIPD, no_rip_default_metric_val_cmd_vtysh, 
+       "no default-metric <1-16>", 
        "Negate a command or set its defaults\n"
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
+
+DEFSH (VTYSH_BGPD, neighbor_route_reflector_client_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "route-reflector-client", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Configure a neighbor as Route Reflector client\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_soft_cmd_vtysh, 
+       "clear ip bgp * soft", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all peers\n"
+       "Soft reconfig\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_host_mask_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D A.B.C.D A.B.C.D", 
        "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Address to match\n"
-       "Wildcard bits\n")
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "Destination address\n"
+       "Destination Wildcard bits\n")
 
-DEFSH (VTYSH_ZEBRA, shutdown_if_cmd_vtysh, 
-       "shutdown", 
-       "Shutdown the selected interface\n")
+DEFSH (VTYSH_BGPD, ip_extcommunity_list_standard_cmd_vtysh, 
+       "ip extcommunity-list <1-99> (deny|permit) .AA:NN", 
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Extended Community list number (standard)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv6_metric_rmap_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295> route-map WORD", 
+DEFSH (VTYSH_BGPD, no_bgp_config_type_cmd_vtysh, 
+       "no bgp config-type", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "BGP information\n"
+       "Display configuration type\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_route_reflector_client_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "route-reflector-client", 
+DEFSH (VTYSH_BGPD, no_neighbor_filter_list_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "filter-list WORD (in|out)", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Configure a neighbor as Route Reflector client\n")
-
-DEFSH (VTYSH_RIPD, no_rip_distance_source_cmd_vtysh, 
-       "no distance <1-255> A.B.C.D/M", 
-       "Negate a command or set its defaults\n"
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Establish BGP filters\n"
+       "AS path access-list name\n"
+       "Filter incoming routes\n"
+       "Filter outgoing routes\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_soft_out_cmd_vtysh, 
-       "clear ip bgp view WORD * soft out", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD, ip_rip_receive_version_1_cmd_vtysh, 
+       "ip rip receive version 1 2", 
        "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Routing Information Protocol\n"
+       "Advertisement reception\n"
+       "Version control\n"
+       "RIP version 1\n"
+       "RIP version 2\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_event_cmd_vtysh, 
-       "no debug ospf event", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_events_cmd_vtysh, 
+       "no debug bgp events", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF event information\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_cmd_vtysh, 
-       "clear ip bgp (A.B.C.D|X:X::X:X)", 
-       "Reset functions\n"
-       "IP information\n"
        "BGP information\n"
-       "BGP neighbor IP address to clear\n"
-       "BGP IPv6 neighbor to clear\n")
+       "BGP events\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_dampened_paths_cmd_vtysh, 
-       "show ip bgp dampened-paths", 
+DEFSH (VTYSH_BGPD, no_neighbor_port_val_cmd_vtysh, 
+       "no neighbor A.B.C.D " "port <0-65535>", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Neighbor's BGP port\n"
+       "TCP port number\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_community3_exact_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display paths suppressed due to dampening\n")
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (VTYSH_BGPD, no_debug_bgp_filter_cmd_vtysh, 
-       "no debug bgp filters", 
+DEFSH (VTYSH_RIPD, no_key_cmd_vtysh, 
+       "no key <0-2147483647>", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP filters\n")
+       "Delete a key\n"
+       "Key identifier number\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ip_prefix_list_cmd_vtysh, 
-       "clear ip prefix-list", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, ip_community_list_name_standard2_cmd_vtysh, 
+       "ip community-list standard WORD (deny|permit)", 
        "IP information\n"
-       "Build a prefix list\n")
+       "Add a community list entry\n"
+       "Add a standard community-list entry\n"
+       "Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_summary_as_set_cmd_vtysh, 
-       "no aggregate-address A.B.C.D/M summary-only as-set", 
+DEFSH (VTYSH_OSPFD, no_refresh_timer_val_cmd_vtysh, 
+       "no refresh timer <10-1800>", 
+       "Adjust refresh parameters\n"
+       "Unset refresh timer\n"
+       "Timer value in seconds\n")
+
+DEFSH (VTYSH_BGPD, ip_extcommunity_list_name_expanded_cmd_vtysh, 
+       "ip extcommunity-list expanded WORD (deny|permit) .LINE", 
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Specify expanded extcommunity-list\n"
+       "Extended Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "An ordered list as a regular-expression\n")
+
+DEFSH (VTYSH_OSPF6D, no_redistribute_ospf6_cmd_vtysh, 
+       "no redistribute ospf6", 
        "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
+       "Redistribute control\n"
+       "OSPF6 route\n")
 
-DEFSH (VTYSH_RIPD, debug_rip_events_cmd_vtysh, 
-       "debug rip events", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP events\n")
+DEFSH (VTYSH_BGPD, show_ip_bgp_community_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export)", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_distribute_list_out_cmd_vtysh, 
-       "no distribute-list WORD out (kernel|connected|static|rip|bgp)", 
+DEFSH (VTYSH_OSPFD, no_area_export_list_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) export-list NAME", 
        "Negate a command or set its defaults\n"
-       "Filter networks in routing updates\n"
-       "Access-list name\n"
-       "Filter outgoing routing updates\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n")
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Unset the filter for networks announced to other areas\n"
+       "Name of the access-list\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_prefix_cmd_vtysh, 
-       "no ipv6 prefix-list WORD (deny|permit) (X:X::X:X/M|any)", 
+DEFSH (VTYSH_OSPFD, no_ospf_hello_interval_cmd_vtysh, 
+       "no ospf hello-interval", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Any prefix match.  Same as \"::0/0 le 128\"\n")
+       "OSPF interface commands\n"
+       "Time between HELLO packets\n")
+
+DEFSH (VTYSH_RIPD, debug_rip_packet_direct_cmd_vtysh, 
+       "debug rip packet (recv|send)", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP packet\n"
+       "RIP receive packet\n"
+       "RIP send packet\n")
 
 DEFSH (VTYSH_BGPD, no_set_ecommunity_rt_cmd_vtysh, 
        "no set extcommunity rt", 
@@ -8401,187 +5618,138 @@ DEFSH (VTYSH_BGPD, no_set_ecommunity_rt_cmd_vtysh,
        "BGP extended community attribute\n"
        "Route Target extened communityt\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged10_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med as-path next-hop", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n")
+DEFSH (VTYSH_OSPFD, ospf_router_id_cmd_vtysh, 
+       "ospf router-id A.B.C.D", 
+       "OSPF specific commands\n"
+       "router-id for the OSPF process\n"
+       "OSPF router-id in IP address format\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD, no_match_interface_cmd_vtysh, 
+       "no match interface", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match first hop interface of route\n")
 
-DEFSH (VTYSH_BGPD, undebug_bgp_normal_cmd_vtysh, 
-       "undebug bgp", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n")
+DEFSH (VTYSH_ZEBRA, bandwidth_if_cmd_vtysh, 
+       "bandwidth <1-10000000>", 
+       "Set bandwidth informational parameter\n"
+       "Bandwidth in kilobits\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_retransmit_interval_addr_cmd_vtysh, 
-       "no ip ospf retransmit-interval A.B.C.D", 
+DEFSH (VTYSH_OSPF6D, no_debug_ospf6_damp_cmd_vtysh, 
+       "no debug ospf6 damp", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "Address of interface")
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Flap-dampening information\n"
+      )
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_routemap_cmd_vtysh, 
-       "no redistribute bgp route-map WORD", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_camp_config_cmd_vtysh, 
+       "show ipv6 ospf6 damp config", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Flap-dampening information\n"
+       "shows dampening configuration\n"
+      )
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp * in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+DEFSH (VTYSH_OSPF6D, show_version_ospf6_cmd_vtysh, 
+       "show version ospf6", 
+       "Show running system information\n"
+       "Displays ospf6d version\n")
 
-DEFSH (VTYSH_BGPD, neighbor_transparent_as_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "transparent-as", 
+DEFSH (VTYSH_BGPD, no_neighbor_route_server_client_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "route-server-client", 
+       "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Do not append my AS number even peer is EBGP peer\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Configure a neighbor as Route Server client\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_ipv6_access_list_remark_cmd_vtysh, 
-       "no ipv6 access-list WORD remark", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Access list entry comment\n")
+DEFSH (VTYSH_ZEBRA, debug_zebra_packet_detail_cmd_vtysh, 
+       "debug zebra packet (recv|send) detail", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra packet\n"
+       "Debug option set for receive packet\n"
+       "Debug option set for send packet\n"
+       "Debug option set detaied information\n")
 
-DEFSH (VTYSH_BGPD, no_match_community_exact_cmd_vtysh, 
-       "no match community (<1-99>|<100-199>|WORD) exact-match", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ripng_cmd_vtysh, 
+       "no redistribute ripng", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n"
-       "Do exact matching of communities\n")
+       "Redistribute information from another routing protocol\n"
+       "RIPng route\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_param3_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
+DEFSH (VTYSH_RIPD, no_rip_split_horizon_cmd_vtysh, 
+       "no ip split-horizon", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp <1-65535> ipv4 (unicast|multicast) in prefix-filter", 
-       "Reset functions\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Perform split horizon\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_out_cmd_vtysh, 
-       "clear bgp ipv6 external WORD out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_BGPD, no_bgp_confederation_identifier_cmd_vtysh, 
+       "no bgp confederation identifier", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "AS confederation parameters\n"
+       "AS number\n")
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_intra_cmd_vtysh, 
-       "distance ospf inter-area <1-255> intra-area <1-255>", 
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_external_intra_cmd_vtysh, 
+       "distance ospf inter-area <1-255> external <1-255> intra-area <1-255>", 
        "Define an administrative distance\n"
        "OSPF Administrative distance\n"
        "Inter-area routes\n"
        "Distance for inter-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n"
        "Intra-area routes\n"
        "Distance for intra-area routes\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_out_cmd_vtysh, 
-       "clear ip bgp <1-65535> vpnv4 unicast out", 
-       "Reset functions\n"
+DEFSH (VTYSH_ZEBRA, no_ip_address_label_cmd_vtysh, 
+       "no ip address A.B.C.D/M label LINE", 
+       "Negate a command or set its defaults\n"
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP address (e.g. 10.0.0.1/8)\n"
+       "Label of this address\n"
+       "Label\n")
+
+DEFSH (VTYSH_BGPD, no_set_ecommunity_soo_cmd_vtysh, 
+       "no set extcommunity soo", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Site-of-Origin extended community\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbors_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_summary_cmd_vtysh, 
-       "show bgp summary", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Summary of BGP neighbor status\n")
-
-DEFSH (VTYSH_BGPD, bgp_deterministic_med_cmd_vtysh, 
-       "bgp deterministic-med", 
-       "BGP specific commands\n"
-       "Pick the best-MED path among paths advertised from the neighboring AS\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_le_ge_cmd_vtysh, 
-       "ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "Address Family modifier\n"
+       "Detailed information on TCP and BGP neighbor connections\n")
 
-DEFSH (VTYSH_BGPD, undebug_bgp_filter_cmd_vtysh, 
-       "undebug bgp filters", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP filters\n")
+DEFSH (VTYSH_OSPFD, no_ospf_transmit_delay_cmd_vtysh, 
+       "no ospf transmit-delay", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Link state transmit delay\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_cmd_vtysh, 
-       "show ipv6 ospf6", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n")
+DEFSH (VTYSH_OSPFD|VTYSH_OSPF6D, ospf6_routemap_no_set_metric_type_cmd_vtysh, 
+       "no set metric-type (type-1|type-2)", 
+       "Negate a command or set its defaults\n"
+       "Set value\n"
+       "Type of metric\n"
+       "OSPF6 external type 1 metric\n"
+       "OSPF6 external type 2 metric\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_in_prefix_filter_cmd_vtysh, 
-       "clear bgp ipv6 external in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_out_cmd_vtysh, 
+       "clear ip bgp * out", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_spf_node_cmd_vtysh, 
-       "show ipv6 ospf6 area A.B.C.D spf node", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Area information\n"
-       "Area ID (as an IPv4 notation)\n"
-       "Shortest Path First caculation\n"
-       "vertex infomation\n"
-       )
+       "Clear all peers\n"
+       "Soft reconfig outbound update\n")
 
 DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_cmd_vtysh, 
        "redistribute (connected|kernel|ospf|rip|static)", 
@@ -8592,285 +5760,262 @@ DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_cmd_vtysh,
        "Routing Information Protocol (RIP)\n"
        "Static routes\n")
 
-DEFSH (VTYSH_BGPD, neighbor_filter_list_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "filter-list WORD (in|out)", 
+DEFSH (VTYSH_OSPFD, no_ospf_message_digest_key_cmd_vtysh, 
+       "no ospf message-digest-key <1-255>", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Message digest authentication password (key)\n"
+       "Key ID\n")
+
+DEFSH (VTYSH_OSPFD, ospf_message_digest_key_cmd_vtysh, 
+       "ospf message-digest-key <1-255> md5 KEY", 
+       "OSPF interface commands\n"
+       "Message digest authentication password (key)\n"
+       "Key ID\n"
+       "Use MD5 algorithm\n"
+       "The OSPF password (key)")
+
+DEFSH (VTYSH_OSPFD, neighbor_poll_interval_cmd_vtysh, 
+       "neighbor A.B.C.D poll-interval <1-65535>", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Establish BGP filters\n"
-       "AS path access-list name\n"
-       "Filter incoming routes\n"
-       "Filter outgoing routes\n")
+       "Neighbor IP address\n"
+       "Dead Neighbor Polling interval\n"
+       "Seconds\n")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged10_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med as-path next-hop", 
+DEFSH (VTYSH_BGPD, neighbor_peer_group_cmd_vtysh, 
+       "neighbor WORD peer-group", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n")
+       "Neighbor tag\n"
+       "Configure peer-group\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ip_prefix_list_name_cmd_vtysh, 
-       "clear ip prefix-list WORD", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) in prefix-filter", 
        "Reset functions\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n")
-
-DEFSH (VTYSH_ZEBRA, show_ip_route_cmd_vtysh, 
-       "show ip route", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP routing table\n")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_cmd_vtysh, 
-       "redistribute connected", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_BGPD, ip_community_list_cmd_vtysh, 
-       "ip community-list WORD (deny|permit) .AA:NN", 
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_peer_in_prefix_filter_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) in prefix-filter", 
-       "Reset functions\n"
        "BGP information\n"
        "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Soft reconfig inbound update\n"
        "Push out the existing ORF prefix-list\n")
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_external_cmd_vtysh, 
-       "distance ospf intra-area <1-255> external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n")
-
-DEFSH (VTYSH_BGPD, ipv6_mbgp_neighbor_received_routes_cmd_vtysh, 
-       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_authentication_cmd_vtysh, 
+       "ip ospf authentication", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_type_routemap_cmd_vtysh, 
-       "default-information originate always metric <0-16777214> metric-type (1|2) route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_OSPFD, no_ospf_abr_type_cmd_vtysh, 
+       "no ospf abr-type (cisco|ibm|shortcut)", 
+       "Negate a command or set its defaults\n"
+       "OSPF specific commands\n"
+       "Set OSPF ABR type\n"
+       "Alternative ABR,  cisco implementation\n"
+       "Alternative ABR,  IBM implementation\n"
+       "Shortcut ABR\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_cmd_vtysh, 
-       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) (A.B.C.D/M|any)", 
+DEFSH (VTYSH_BGPD, no_bgp_router_id_cmd_vtysh, 
+       "no bgp router-id", 
        "Negate a command or set its defaults\n"
+       "BGP information\n"
+       "Override configured router identifier\n")
+
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" "|max-age|self-originate)", 
+       "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Any prefix match.  Same as \"0.0.0.0/0 le 32\"\n")
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
+       "LSAs in MaxAge list\n"
+       "Self-originated link states\n")
 
-DEFSH (VTYSH_OSPF6D, interface_area_plist_passive_cmd_vtysh, 
-       "interface IFNAME area A.B.C.D prefix-list WORD passive", 
-       "Enable routing on an IPv6 interface\n"
-       "Interface name(e.g. ep0)\n"
-       "Set the OSPF6 area ID\n"
-       "OSPF6 area ID in IPv4 address notation\n"
-       "Advertise I/F Address only match entries of prefix-list\n"
-       "IPv6 prefix-list name\n"
-       "IPv6 prefix-list name\n"
-       "Suppress routing updates on an interface\n"
-      )
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_self_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") (self-originate|)", 
+       "Show running system information\n"
+       "IP information\n"
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
+       "Self-originated link states\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_seq_le_ge_cmd_vtysh, 
-       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_in_prefix_filter_cmd_vtysh, 
-       "clear bgp ipv6 * in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_soft_in_cmd_vtysh, 
+       "clear ip bgp external soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Clear all external peers\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbors_cmd_vtysh, 
-       "show ip bgp vpnv4 all neighbors", 
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_transmitdelay_cmd_vtysh, 
+       "ipv6 ospf6 transmit-delay TRANSMITDELAY", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Link state transmit delay\n"
+       "<1-65535> Seconds\n"
+       )
+
+DEFSH (VTYSH_OSPFD, area_vlink_authkey_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication-key|) AUTH_KEY", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Authentication password (key)\n" "The OSPF password (key)")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbors_peer_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Display VPNv4 NLRI specific information\n"
        "Display information about all VPNv4 NLRIs\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_neighbors_cmd_vtysh, 
-       "show bgp ipv6 neighbors", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, no_neighbor_ebgp_multihop_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "ebgp-multihop", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Allow EBGP neighbors not on directly connected networks\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp view WORD * ipv4 (unicast|multicast) soft out", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
        "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_metric_routemap_cmd_vtysh, 
-       "no redistribute kernel metric <0-16> route-map WORD", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_cmd_vtysh, 
+       "no redistribute bgp", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Metric\n"
-       "Metric value\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Border Gateway Protocol (BGP)\n")
 
-DEFSH (VTYSH_BGPD, old_no_ipv6_aggregate_address_summary_only_cmd_vtysh, 
-       "no ipv6 bgp aggregate-address X:X::X:X/M summary-only", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_retransmitinterval_cmd_vtysh, 
+       "ipv6 ospf6 retransmit-interval RXMTINTERVAL", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Time between retransmitting lost link state advertisements\n"
+       "<1-65535> Seconds\n"
+       )
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_summary_cmd_vtysh, 
-       "show ipv6 bgp summary", 
-       "Show running system information\n"
-       "IPv6 information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_soft_cmd_vtysh, 
+       "clear ip bgp <1-65535> soft", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Summary of BGP neighbor status\n")
+       "Clear peers with the AS number\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp view WORD * in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_soft_cmd_vtysh, 
+       "clear ip bgp external soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Clear all external peers\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_standard_cmd_vtysh, 
-       "no ip extcommunity-list <1-99> (deny|permit) .AA:NN", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD, show_debugging_rip_cmd_vtysh, 
+       "show debugging rip", 
+       "Show running system information\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_soft_out_cmd_vtysh, 
+       "clear ip bgp <1-65535> soft out", 
+       "Reset functions\n"
        "IP information\n"
-       "Add a extended community list entry\n"
-       "Extended Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
+       "BGP information\n"
+       "Clear peers with the AS number\n"
+       "Soft reconfig\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_OSPFD, ospf_distribute_list_out_cmd_vtysh, 
-       "distribute-list WORD out (kernel|connected|static|rip|bgp)", 
-       "Filter networks in routing updates\n"
-       "Access-list name\n"
-       "Filter outgoing routing updates\n"
-       "Kernel routes\n"
-       "Connected\n"
-       "Static routes\n"
-       "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, rmap_onmatch_next_cmd_vtysh, 
+       "on-match next", 
+       "Exit policy on matches\n"
+       "Next clause\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_ipv6_access_list_remark_arg_cmd_vtysh, 
-       "no ipv6 access-list WORD remark .LINE", 
+DEFSH (VTYSH_RIPD, no_ip_rip_receive_version_num_cmd_vtysh, 
+       "no ip rip receive version (1|2)", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Access list entry comment\n"
-       "Comment up to 100 characters\n")
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Advertisement reception\n"
+       "Version control\n"
+       "Version 1\n"
+       "Version 2\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_statistics_cmd_vtysh, 
-       "show ip bgp flap-statistics", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_view_cmd_vtysh, 
+       "show ip bgp view WORD", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display flap statistics of routes\n")
+       "BGP view\n"
+       "BGP view name\n")
 
-DEFSH (VTYSH_ZEBRA, show_ip_route_supernets_cmd_vtysh, 
-       "show ip route supernets-only", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbors_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors", 
        "Show running system information\n"
        "IP information\n"
-       "IP routing table\n"
-       "Show supernet entries only\n")
-
-DEFSH (VTYSH_BGPD, set_ipv6_nexthop_local_cmd_vtysh, 
-       "set ipv6 next-hop local X:X::X:X", 
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 local address\n"
-       "IPv6 address of next hop\n")
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Detailed information on TCP and BGP neighbor connections\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_rfc1583_flag_cmd_vtysh, 
-       "no ospf rfc1583compatibility", 
-       "Negate a command or set its defaults\n"
-       "OSPF specific commands\n"
-       "Disable the RFC1583Compatibility flag\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_cost_addr_cmd_vtysh, 
+       "ip ospf cost <1-65535> A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interface cost\n"
+       "Cost\n"
+       "Address of interface")
 
-DEFSH (VTYSH_BGPD, neighbor_route_map_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "route-map WORD (in|out)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Apply route map to neighbor\n"
-       "Name of route map\n"
-       "Apply map to incoming routes\n"
-       "Apply map to outbound routes\n")
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp * ipv4 (unicast|multicast) in prefix-filter", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_debug_bgp_keepalive_cmd_vtysh, 
-       "no debug bgp keepalives", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_routes_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) routes", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "BGP keepalives\n")
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display routes learned from neighbor\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community3_exact_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community4_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -8884,212 +6029,190 @@ DEFSH (VTYSH_BGPD, show_bgp_ipv6_community3_exact_cmd_vtysh,
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_topology_router_lsid_cmd_vtysh, 
-       "show ipv6 ospf6 topology (A.B.C.D|<0-4294967295>) (A.B.C.D|<0-4294967295>)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_prefix_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M", 
        "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Inter Area topology information\n"
-       "Specify Router-ID\n"
-       "Specify Router-ID\n"
-       "Specify Link State ID\n"
-       "Specify Link State ID\n"
-       )
-
-DEFSH (VTYSH_BGPD, no_bgp_network_mask_natural_route_map_cmd_vtysh, 
-       "no network A.B.C.D route-map WORD", 
-       "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+       "IP information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community_all_cmd_vtysh, 
-       "show ipv6 mbgp community", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_any_cmd_vtysh, 
+       "access-list (<1-99>|<1300-1999>) (deny|permit) any", 
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any source host\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_route_map_cmd_vtysh, 
-       "no route-map WORD (deny|permit) <1-65535>", 
-       "Negate a command or set its defaults\n"
-       "Create route-map or enter route-map command mode\n"
-       "Route map tag\n"
-       "Route map denies set operations\n"
-       "Route map permits set operations\n"
-       "Sequence to insert to/delete from existing route-map entry\n")
+DEFSH (VTYSH_BGPD, neighbor_override_capability_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "override-capability", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Override capability negotiation result\n")
 
-DEFSH (VTYSH_ZEBRA, ip_address_cmd_vtysh, 
-       "ip address A.B.C.D/M", 
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IP address (e.g. 10.0.0.1/8)\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_intra_cmd_vtysh, 
+       "distance ospf intra-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_ge_cmd_vtysh, 
-       "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M ge <0-128>", 
+DEFSH (VTYSH_BGPD, no_ip_as_path_cmd_vtysh, 
+       "no ip as-path access-list WORD (deny|permit) .LINE", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
+       "IP information\n"
+       "BGP autonomous system path filter\n"
+       "Specify an access list name\n"
+       "Regular expression access list name\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_sequence_number_cmd_vtysh, 
-       "no ipv6 prefix-list sequence-number", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Include/exclude sequence numbers in NVGEN\n")
+       "A regular-expression to match the BGP AS paths\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_prefix_list_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) prefix-list WORD", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Address Family modifier\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_host_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", 
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Any source host\n"
-       "A single destination host\n"
-       "Destination address\n")
-
-DEFSH (VTYSH_BGPD, ipv6_mbgp_neighbor_routes_cmd_vtysh, 
-       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "Address Family modifier\n"
+       "Display routes conforming to the prefix-list\n"
+       "IP prefix-list name\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_param4_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+DEFSH (VTYSH_BGPD, neighbor_default_originate_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "default-originate", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Originate default route to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_expanded_cmd_vtysh, 
-       "no ip extcommunity-list <100-199> (deny|permit) .LINE", 
+DEFSH (VTYSH_RIPD, no_rip_redistribute_type_cmd_vtysh, 
+       "no redistribute (kernel|connected|static|ospf|bgp)", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a extended community list entry\n"
-       "Extended Community list number (expanded)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Open Shortest Path First (OSPF)\n"
+       "Border Gateway Protocol (BGP)\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_authentication_key_chain_cmd_vtysh, 
-       "no ip rip authentication key-chain", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_metric_val_cmd_vtysh, 
+       "no redistribute connected metric <0-16>", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication key-chain\n")
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_ZEBRA, ip_route_mask_pref_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) <1-255>", 
+DEFSH (VTYSH_ZEBRA, no_ip_route_mask_distance_cmd_vtysh, 
+       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) <1-255>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
        "Establish static routes\n"
        "IP destination prefix\n"
        "IP destination prefix mask\n"
        "IP gateway address\n"
        "IP gateway interface name\n"
+       "Null interface\n"
        "Distance value for this route\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_default_information_originate_cmd_vtysh, 
-       "no default-information originate", 
-       "Negate a command or set its defaults\n"
-       "Control distribution of default information\n"
-       "Distribute a default route\n")
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community2_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (VTYSH_BGPD, no_bgp_bestpath_med_cmd_vtysh, 
-       "no bgp bestpath med (confed|missing-as-worst)", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Compare MED among confederation paths\n"
-       "Treat missing MED as the least preferred one\n")
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_cmd_vtysh, 
+       "redistribute kernel", 
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n")
 
-DEFSH (VTYSH_BGPD, neighbor_unsuppress_map_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "unsuppress-map WORD", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Route-map to selectively unsuppress suppressed routes\n"
-       "Name of route map\n")
+DEFSH (VTYSH_OSPFD, no_debug_ospf_lsa_sub_cmd_vtysh, 
+       "no debug ospf lsa (generate|flooding|install|refresh)", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Link State Advertisement\n"
+       "LSA Generation\n"
+       "LSA Flooding\n"
+       "LSA Install/Delete\n"
+       "LSA Refres\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_route_cmd_vtysh, 
-       "route IPV6ADDR", 
-       "Static route setup\n"
-       "Set static RIPng route announcement\n")
+DEFSH (VTYSH_BGPD, bgp_fast_external_failover_cmd_vtysh, 
+       "bgp fast-external-failover", 
+       "BGP information\n"
+       "Immediately reset session if a link to a directly connected external peer goes down\n")
 
-DEFSH (VTYSH_ZEBRA, ip_route_cmd_vtysh, 
-       "ip route A.B.C.D/M (A.B.C.D|INTERFACE)", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_message_digest_key_cmd_vtysh, 
+       "ip ospf message-digest-key <1-255> md5 KEY", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Message digest authentication password (key)\n"
+       "Key ID\n"
+       "Use MD5 algorithm\n"
+       "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_damp_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) dampened-routes", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_out_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) out", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the dampened routes received from neighbor\n")
-
-DEFSH (VTYSH_RIPD, send_lifetime_month_day_day_month_cmd_vtysh, 
-       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Day of th month to expire\n"
-       "Month of the year to expire\n"
-       "Year to expire\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_route_map_all_cmd_vtysh, 
-       "no route-map WORD", 
+DEFSH (VTYSH_RIPD, no_rip_route_cmd_vtysh, 
+       "no route A.B.C.D/M", 
        "Negate a command or set its defaults\n"
-       "Create route-map or enter route-map command mode\n"
-       "Route map tag\n")
+       "RIP static route configuration\n"
+       "IP prefix <network>/<length>\n")
 
-DEFSH (VTYSH_RIPD, no_rip_network_cmd_vtysh, 
-       "no network (A.B.C.D/M|WORD)", 
+DEFSH (VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD, no_set_metric_val_cmd_vtysh, 
+       "no set metric <0-4294967295>", 
        "Negate a command or set its defaults\n"
-       "Enable routing on an IP network\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Interface name\n")
+       "Set values in destination routing protocol\n"
+       "Metric value for destination routing protocol\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_BGPD, bgp_network_mask_route_map_cmd_vtysh, 
-       "network A.B.C.D mask A.B.C.D route-map WORD", 
+DEFSH (VTYSH_BGPD, neighbor_activate_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "activate", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Enable the Address Family for this Neighbor\n")
+
+DEFSH (VTYSH_OSPFD, ospf_compatible_rfc1583_cmd_vtysh, 
+       "compatible rfc1583", 
+       "OSPF compatibility list\n"
+       "compatible with RFC 1583\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_network_mask_route_map_cmd_vtysh, 
+       "no network A.B.C.D mask A.B.C.D route-map WORD", 
+       "Negate a command or set its defaults\n"
        "Specify a network to announce via BGP\n"
        "Network number\n"
        "Network mask\n"
@@ -9097,118 +6220,243 @@ DEFSH (VTYSH_BGPD, bgp_network_mask_route_map_cmd_vtysh,
        "Route-map to modify the attributes\n"
        "Name of the route map\n")
 
-DEFSH (VTYSH_BGPD, set_vpnv4_nexthop_cmd_vtysh, 
-       "set vpnv4 next-hop A.B.C.D", 
-       "Set values in destination routing protocol\n"
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n"
-       "IP address of next hop\n")
+DEFSH (VTYSH_RIPD, ip_rip_send_version_2_cmd_vtysh, 
+       "ip rip send version 2 1", 
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n"
+       "RIP version 2\n"
+       "RIP version 1\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_packet_send_recv_detail_cmd_vtysh, 
-       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
+DEFSH (VTYSH_BGPD, neighbor_description_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "description .LINE", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Neighbor specific description\n"
+       "Up to 80 characters describing this neighbor\n")
 
-DEFSH (VTYSH_RIPD, no_rip_default_metric_cmd_vtysh, 
-       "no default-metric", 
+DEFSH (VTYSH_BGPD, no_neighbor_enforce_multihop_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "enforce-multihop", 
        "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Enforce EBGP neighbors perform multihop\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_soft_out_cmd_vtysh, 
-       "clear ip bgp peer-group WORD soft out", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ip_prefix_list_cmd_vtysh, 
+       "clear ip prefix-list", 
        "Reset functions\n"
        "IP information\n"
+       "Build a prefix list\n")
+
+DEFSH (VTYSH_OSPFD, ip_ospf_authentication_key_addr_cmd_vtysh, 
+       "ip ospf authentication-key AUTH_KEY A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Authentication password (key)\n"
+       "The OSPF password (key)\n"
+       "Address of interface")
+
+DEFSH (VTYSH_OSPFD, ip_ospf_dead_interval_cmd_vtysh, 
+       "ip ospf dead-interval <1-65535>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interval after which a neighbor is declared dead\n"
+       "Seconds\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_route_reflector_client_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "route-reflector-client", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Configure a neighbor as Route Reflector client\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_port_cmd_vtysh, 
+       "no neighbor A.B.C.D " "port", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Neighbor's BGP port\n")
+
+DEFSH (VTYSH_BGPD, no_set_community_delete_cmd_vtysh, 
+       "no set comm-list", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "set BGP community list (for deletion)\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_fast_external_failover_cmd_vtysh, 
+       "no bgp fast-external-failover", 
+       "Negate a command or set its defaults\n"
        "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Immediately reset session if a link to a directly connected external peer goes down\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_route_cmd_vtysh, 
-       "show ipv6 mbgp X:X::X:X", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD, no_ip_rip_authentication_mode_cmd_vtysh, 
+       "no ip rip authentication mode", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "MBGP information\n"
-       "Network in the MBGP routing table to display\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication mode\n")
 
-DEFSH (VTYSH_OSPFD, neighbor_cmd_vtysh, 
-       "neighbor A.B.C.D", 
+DEFSH (VTYSH_OSPFD, area_vlink_authtype_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|)", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n")
+
+DEFSH (VTYSH_OSPFD, area_vlink_param3_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+
+DEFSH (VTYSH_BGPD, neighbor_route_server_client_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "route-server-client", 
        "Specify neighbor router\n"
-       "Neighbor IP address\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Configure a neighbor as Route Server client\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_in_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp <1-65535> ipv4 (unicast|multicast) soft in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Soft reconfig\n"
        "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD, area_range_advertise_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "OSPF area range for route advertise (default)\n"
-       "area range prefix\n"
-       "advertise this range\n")
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_advertised_route_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (VTYSH_OSPFD, timers_spf_cmd_vtysh, 
-       "timers spf <0-4294967295> <0-4294967295>", 
-       "Adjust routing timers\n"
-       "OSPF SPF timers\n"
-       "Delay between receiving a change to SPF calculation\n"
-       "Hold time between consecutive SPF calculations\n")
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_cmd_vtysh, 
+       "show ipv6 ospf6", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n")
+
+DEFSH (VTYSH_ZEBRA, no_debug_zebra_kernel_cmd_vtysh, 
+       "no debug zebra kernel", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra between kernel interface\n")
+
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_intra_cmd_vtysh, 
+       "distance ospf external <1-255> intra-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "External routes\n"
+       "Distance for external routes\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n")
+
+DEFSH (VTYSH_BGPD, no_set_vpnv4_nexthop_cmd_vtysh, 
+       "no set vpnv4 next-hop", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "VPNv4 information\n"
+       "VPNv4 next-hop address\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_route_pref_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255>", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_lsa_cmd_vtysh, 
+       "no debug ospf lsa", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Link State Advertisement\n")
+
+DEFSH (VTYSH_BGPD, no_match_community_exact_cmd_vtysh, 
+       "no match community (<1-99>|<100-199>|WORD) exact-match", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match BGP community list\n"
+       "Community-list number (standard)\n"
+       "Community-list number (expanded)\n"
+       "Community-list name\n"
+       "Do exact matching of communities\n")
+
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_metric_routemap_cmd_vtysh, 
+       "no redistribute kernel metric <0-16> route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_topology_router_cmd_vtysh, 
+       "show ipv6 ospf6 topology (A.B.C.D|<0-4294967295>|detail)", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Inter Area topology information\n"
+       "Specify Router-ID\n"
+       "Specify Router-ID\n"
+       "Detailed information\n"
+       )
+
+DEFSH (VTYSH_BGPD, ip_community_list_standard2_cmd_vtysh, 
+       "ip community-list <1-99> (deny|permit)", 
        "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n")
+       "Add a community list entry\n"
+       "Community list number (standard)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_default_local_preference_val_cmd_vtysh, 
-       "no bgp default local-preference <0-4294967295>", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_instance_ipv4_summary_cmd_vtysh, 
+       "show ip bgp view WORD ipv4 (unicast|multicast) summary", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP view\n"
+       "View name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Summary of BGP neighbor status\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_network_mask_natural_route_map_cmd_vtysh, 
+       "no network A.B.C.D route-map WORD", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "local preference (higher=more preferred)\n"
-       "Configure default local preference value\n")
+       "Specify a network to announce via BGP\n"
+       "Network number\n"
+       "Route-map to modify the attributes\n"
+       "Name of the route map\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_timers_cmd_vtysh, 
-       "timers basic <0-65535> <0-65535> <0-65535>", 
-       "RIPng timers setup\n"
-       "Basic timer\n"
-       "Routing table update timer value in second. Default is 30.\n"
-       "Routing information timeout timer. Default is 180.\n"
-       "Garbage collection timer. Default is 120.\n")
+DEFSH (VTYSH_OSPFD, no_area_range_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged8_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop as-path med", 
+DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_metric_cmd_vtysh, 
+       "no redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295>", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n"
-       "Med attribute\n")
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n")
 
 DEFSH (VTYSH_BGPD, show_ip_bgp_community2_cmd_vtysh, 
        "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
@@ -9225,17 +6473,22 @@ DEFSH (VTYSH_BGPD, show_ip_bgp_community2_cmd_vtysh,
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_OSPFD, no_set_metric_type_cmd_vtysh, 
-       "no set metric-type", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_dead_interval_addr_cmd_vtysh, 
+       "no ip ospf dead-interval A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Type of metric for destination routing protocol\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interval after which a neighbor is declared dead\n"
+       "Address of interface")
 
-DEFSH (VTYSH_BGPD, neighbor_peer_group_cmd_vtysh, 
-       "neighbor WORD peer-group", 
-       "Specify neighbor router\n"
-       "Neighbor tag\n"
-       "Configure peer-group\n")
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n")
 
 DEFSH (VTYSH_BGPD, show_ip_bgp_community_exact_cmd_vtysh, 
        "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
@@ -9249,266 +6502,396 @@ DEFSH (VTYSH_BGPD, show_ip_bgp_community_exact_cmd_vtysh,
        "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (VTYSH_OSPFD, no_area_range_subst_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_hello_interval_cmd_vtysh, 
+       "no ip ospf hello-interval", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Deconfigure OSPF area range for route summarization\n"
-       "area range prefix\n"
-       "Do not advertise this range\n"
-       "Announce area range as another prefix\n"
-       "Network prefix to be announced instead of range\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between HELLO packets\n")
 
-DEFSH (VTYSH_BGPD, bgp_enforce_first_as_cmd_vtysh, 
-       "bgp enforce-first-as", 
+DEFSH (VTYSH_BGPD, no_match_origin_cmd_vtysh, 
+       "no match origin", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "BGP origin code\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_soft_out_cmd_vtysh, 
+       "clear ip bgp * soft out", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Enforce the first AS for EBGP routes\n")
+       "Clear all peers\n"
+       "Soft reconfig\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community3_exact_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, aggregate_address_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n")
+
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_bgp_metric_routemap_cmd_vtysh, 
+       "redistribute bgp metric <0-16> route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_topology_router_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D topology (A.B.C.D|<0-4294967295>|detail)", 
        "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Shortest Path First tree information\n"
+       "Displays SPF topology table\n"
+       "Specify Router-ID\n"
+       "Specify Router-ID\n"
+       )
 
-DEFSH (VTYSH_OSPFD, ospf_dead_interval_cmd_vtysh, 
-       "ospf dead-interval <1-65535>", 
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Seconds\n")
+DEFSH (VTYSH_OSPF6D, ospf6_routemap_no_match_address_prefixlist_cmd_vtysh, 
+       "no match ipv6 address prefix-list WORD", 
+       "Negate a command or set its defaults\n"
+       "Match values\n"
+       "IPv6 information\n"
+       "Match address of route\n"
+       "Match entries of prefix-lists\n"
+       "IPv6 prefix-list name\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_soft_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_mask_any_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "Source address\n"
+       "Source wildcard bits\n"
+       "Any destination host\n")
 
-DEFSH (VTYSH_OSPFD, area_vlink_authtype_args_md5_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(message-digest-key|) <1-255> md5 KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
+DEFSH (VTYSH_OSPFD, passive_interface_cmd_vtysh, 
+       "passive-interface IFNAME", 
+       "Suppress routing updates on an interface\n"
+       "Interface's name\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_external_cmd_vtysh, 
-       "clear bgp external", 
+DEFSH (VTYSH_BGPD, no_bgp_network_cmd_vtysh, 
+       "no network A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+
+DEFSH (VTYSH_OSPFD, no_timers_spf_cmd_vtysh, 
+       "no timers spf", 
+       "Negate a command or set its defaults\n"
+       "Adjust routing timers\n"
+       "OSPF SPF timers\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_out_cmd_vtysh, 
+       "clear ip bgp external out", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n")
+       "Clear all external peers\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_ip_community_list_name_standard_cmd_vtysh, 
-       "no ip community-list standard WORD (deny|permit) .AA:NN", 
+DEFSH (VTYSH_BGPD, bgp_multiple_instance_cmd_vtysh, 
+       "bgp multiple-instance", 
+       "BGP information\n"
+       "Enable bgp multiple instance\n")
+
+DEFSH (VTYSH_RIPD, no_rip_neighbor_cmd_vtysh, 
+       "no neighbor A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a community list entry\n"
-       "Specify a standard community-list\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+       "Specify a neighbor router\n"
+       "Neighbor address\n")
 
-DEFSH (VTYSH_BGPD, neighbor_update_source_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "update-source WORD", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Source of routing updates\n"
-       "Interface name\n")
+DEFSH (VTYSH_RIPNGD, no_ripng_network_cmd_vtysh, 
+       "no network IF_OR_ADDR", 
+       "Negate a command or set its defaults\n"
+       "RIPng enable on specified interface or network.\n"
+       "Interface or address")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_in_cmd_vtysh, 
-       "clear ip bgp peer-group WORD in", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_cmd_vtysh, 
+       "show ip bgp vpnv4 all", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig inbound update\n")
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n")
 
-DEFSH (VTYSH_OSPFD, neighbor_priority_cmd_vtysh, 
-       "neighbor A.B.C.D priority <0-255>", 
-       "Specify neighbor router\n"
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Seconds\n")
+DEFSH (VTYSH_ZEBRA, debug_zebra_events_cmd_vtysh, 
+       "debug zebra events", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra events\n")
 
-DEFSH (VTYSH_BGPD, ip_extcommunity_list_name_standard_cmd_vtysh, 
-       "ip extcommunity-list standard WORD (deny|permit) .AA:NN", 
+DEFSH (VTYSH_ZEBRA, ip_route_mask_distance_cmd_vtysh, 
+       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) <1-255>", 
        "IP information\n"
-       "Add a extended community list entry\n"
-       "Specify standard extcommunity-list\n"
-       "Extended Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n"
+       "Distance value for this route\n")
 
-DEFSH (VTYSH_BGPD, neighbor_capability_route_refresh_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "capability route-refresh", 
+DEFSH (VTYSH_BGPD, bgp_client_to_client_reflection_cmd_vtysh, 
+       "bgp client-to-client reflection", 
+       "BGP specific commands\n"
+       "Configure client to client route reflection\n"
+       "reflection of routes allowed\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_exact_cmd_vtysh, 
+       "access-list WORD (deny|permit) A.B.C.D/M exact-match", 
+       "Add an access list entry\n"
+       "IP zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Prefix to match. e.g. 10.0.0.0/8\n"
+       "Exact match of the prefixes\n")
+
+DEFSH (VTYSH_BGPD, set_atomic_aggregate_cmd_vtysh, 
+       "set atomic-aggregate", 
+       "Set values in destination routing protocol\n"
+       "BGP atomic aggregate attribute\n" )
+
+DEFSH (VTYSH_BGPD, no_neighbor_soft_reconfiguration_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "soft-reconfiguration inbound", 
+       "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise route-refresh capability to this neighbor\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Per neighbor soft reconfiguration\n"
+       "Allow inbound soft reconfiguration for this neighbor\n")
 
-DEFSH (VTYSH_BGPD, no_ipv6_bgp_network_cmd_vtysh, 
-       "no network X:X::X:X/M", 
+DEFSH (VTYSH_BGPD, no_bgp_distance_cmd_vtysh, 
+       "no distance bgp <1-255> <1-255> <1-255>", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>\n")
+       "Define an administrative distance\n"
+       "BGP distance\n"
+       "Distance for routes external to the AS\n"
+       "Distance for routes internal to the AS\n"
+       "Distance for local routes\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_metric_val_cmd_vtysh, 
-       "no redistribute connected metric <0-16>", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_route_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D route", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Routing Table\n"
+       )
+
+DEFSH (VTYSH_BGPD, no_bgp_bestpath_compare_router_id_cmd_vtysh, 
+       "no bgp bestpath compare-routerid", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Metric\n"
-       "Metric value\n")
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "Compare router-id for identical EBGP paths\n")
 
-DEFSH (VTYSH_RIPD, ip_rip_receive_version_1_cmd_vtysh, 
-       "ip rip receive version 1 2", 
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement reception\n"
-       "Version control\n"
-       "RIP version 1\n"
-       "RIP version 2\n")
+DEFSH (VTYSH_BGPD, match_community_cmd_vtysh, 
+       "match community (<1-99>|<100-199>|WORD)", 
+       "Match values from routing table\n"
+       "Match BGP community list\n"
+       "Community-list number (standard)\n"
+       "Community-list number (expanded)\n"
+       "Community-list name\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_network_mask_cmd_vtysh, 
-       "no network A.B.C.D mask A.B.C.D", 
+DEFSH (VTYSH_ZEBRA, no_bandwidth_if_cmd_vtysh, 
+       "no bandwidth", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n")
+       "Set bandwidth informational parameter\n")
 
-DEFSH (VTYSH_ZEBRA, show_interface_cmd_vtysh, 
-       "show interface [IFNAME]", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_prefix_cmd_vtysh, 
+       "show ip bgp vpnv4 all A.B.C.D/M", 
        "Show running system information\n"
-       "Interface status and configuration\n"
-       "Inteface name\n")
+       "IP information\n"
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_OSPFD, no_router_ospf_cmd_vtysh, 
-       "no router ospf", 
+DEFSH (VTYSH_BGPD, no_set_originator_id_cmd_vtysh, 
+       "no set originator-id", 
        "Negate a command or set its defaults\n"
-       "Enable a routing process\n"
-       "Start OSPF configuration\n")
+       "Set values in destination routing protocol\n"
+       "BGP originator ID attribute\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_confederation_identifier_cmd_vtysh, 
-       "no bgp confederation identifier", 
+DEFSH (VTYSH_OSPFD, no_ospf_distribute_list_out_cmd_vtysh, 
+       "no distribute-list WORD out (kernel|connected|static|rip|bgp)", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "AS number\n")
-
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_metric_type_routemap_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> metric-type (1|2) route-map WORD", 
-       "Redistribute information from another routing protocol\n"
+       "Filter networks in routing updates\n"
+       "Access-list name\n"
+       "Filter outgoing routing updates\n"
        "Kernel routes\n"
        "Connected\n"
        "Static routes\n"
        "Routing Information Protocol (RIP)\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric for redistributed routes\n"
-       "OSPF default metric\n"
-       "OSPF exterior metric type for redistributed routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Border Gateway Protocol (BGP)\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_local_as_val2_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "local-as <1-65535> no-prepend", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_retransmit_interval_cmd_vtysh, 
+       "no ip ospf retransmit-interval", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a local-as number\n"
-       "AS number used as local AS\n"
-       "Do not prepend local-as to updates from ebgp peers\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community_info_cmd_vtysh, 
-       "show ip bgp community-info", 
-       "Show running system information\n"
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_host_host_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", 
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "A single destination host\n"
+       "Destination address\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_cmd_vtysh, 
+       "clear ip bgp (A.B.C.D|X:X::X:X)", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "List all bgp community information\n")
+       "BGP neighbor IP address to clear\n"
+       "BGP IPv6 neighbor to clear\n")
 
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_metric_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295>", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
+DEFSH (VTYSH_RIPD, accept_lifetime_month_day_day_month_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Day of th month to expire\n"
+       "Month of the year to expire\n"
+       "Year to expire\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_cidr_only_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) cidr-only", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, no_bgp_distance2_cmd_vtysh, 
+       "no distance bgp", 
+       "Negate a command or set its defaults\n"
+       "Define an administrative distance\n"
+       "BGP distance\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp view WORD * in prefix-filter", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display only routes with non-natural netmasks\n")
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, ipv6_access_list_any_cmd_vtysh, 
-       "ipv6 access-list WORD (deny|permit) any", 
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any prefixi to match\n")
+DEFSH (VTYSH_OSPFD, area_authentication_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) authentication", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Enable authentication\n")
 
-DEFSH (VTYSH_BGPD, undebug_bgp_fsm_cmd_vtysh, 
-       "undebug bgp fsm", 
-       "Disable debugging functions (see also 'debug')\n"
+DEFSH (VTYSH_OSPFD, area_vlink_authtype_md5_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) "
+       "(message-digest-key|) <1-255> md5 KEY", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n"
+       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
+
+DEFSH (VTYSH_OSPFD, debug_ospf_packet_all_cmd_vtysh, 
+       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", 
        "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "Finite State Machine\n")
+       "OSPF information\n"
+       "OSPF packets\n"
+       "OSPF Hello\n"
+       "OSPF Database Description\n"
+       "OSPF Link State Request\n"
+       "OSPF Link State Update\n"
+       "OSPF Link State Acknowledgment\n"
+       "OSPF all packets\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_connected_cmd_vtysh, 
+       "no redistribute connected", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Connected\n")
+
+DEFSH (VTYSH_BGPD, aggregate_address_as_set_summary_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M as-set summary-only", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Generate AS set path information\n"
+       "Filter more specific routes from updates\n")
+
+DEFSH (VTYSH_ZEBRA, show_ip_route_supernets_cmd_vtysh, 
+       "show ip route supernets-only", 
+       "Show running system information\n"
+       "IP information\n"
+       "IP routing table\n"
+       "Show supernet entries only\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_ge_le_cmd_vtysh, 
+       "no ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n")
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_network_import_check_cmd_vtysh, 
-       "no bgp network import-check", 
+DEFSH (VTYSH_RIPD, no_ip_rip_authentication_string2_cmd_vtysh, 
+       "no ip rip authentication string LINE", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "BGP network command\n"
-       "Check BGP network route exists in IGP\n")
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication string\n"
+       "Authentication string\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_soft_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D soft out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp * ipv4 (unicast|multicast) soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n")
+
+DEFSH (VTYSH_BGPD, no_router_bgp_view_cmd_vtysh, 
+       "no router bgp <1-65535> view WORD", 
+       "Negate a command or set its defaults\n"
+       "Enable a routing process\n"
+       "BGP information\n"
+       "AS number\n"
+       "BGP view\n"
+       "view name\n")
+
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_metric_routemap_cmd_vtysh, 
+       "default-information originate metric-type (1|2) metric <0-16777214> route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
 DEFSH (VTYSH_BGPD, no_ip_community_list_name_expanded_cmd_vtysh, 
        "no ip community-list expanded WORD (deny|permit) .LINE", 
@@ -9521,437 +6904,195 @@ DEFSH (VTYSH_BGPD, no_ip_community_list_name_expanded_cmd_vtysh,
        "Specify community to accept\n"
        "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_BGPD, ip_extcommunity_list_name_expanded_cmd_vtysh, 
-       "ip extcommunity-list expanded WORD (deny|permit) .LINE", 
-       "IP information\n"
-       "Add a extended community list entry\n"
-       "Specify expanded extcommunity-list\n"
-       "Extended Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
+DEFSH (VTYSH_OSPFD, ospf_dead_interval_cmd_vtysh, 
+       "ospf dead-interval <1-65535>", 
+       "OSPF interface commands\n"
+       "Interval after which a neighbor is declared dead\n"
+       "Seconds\n")
 
-DEFSH (VTYSH_RIPD, no_rip_distance_cmd_vtysh, 
-       "no distance <1-255>", 
+DEFSH (VTYSH_OSPFD, no_area_shortcut_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) shortcut (enable|disable)", 
        "Negate a command or set its defaults\n"
-       "Administrative distance\n"
-       "Distance value\n")
-
-DEFSH (VTYSH_ZEBRA, show_debugging_zebra_cmd_vtysh, 
-       "show debugging zebra", 
-       "Show running system information\n"
-       "Zebra configuration\n"
-       "Debugging information\n")
-
-DEFSH (VTYSH_OSPFD, area_authentication_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) authentication", 
        "OSPF area parameters\n"
        "OSPF area ID in IP address format\n"
        "OSPF area ID as a decimal value\n"
-       "Enable authentication\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_list_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
-
-DEFSH (VTYSH_RIPD, no_rip_offset_list_ifname_cmd_vtysh, 
-       "no offset-list WORD (in|out) <0-16> IFNAME", 
-       "Negate a command or set its defaults\n"
-       "Modify RIP metric\n"
-       "Access-list name\n"
-       "For incoming updates\n"
-       "For outgoing updates\n"
-       "Metric value\n"
-       "Interface to match\n")
-
-DEFSH (VTYSH_ZEBRA, show_ip_route_prefix_cmd_vtysh, 
-       "show ip route A.B.C.D/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP routing table\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (VTYSH_OSPF6D, interface_area_plist_cmd_vtysh, 
-       "interface IFNAME area A.B.C.D prefix-list WORD", 
-       "Enable routing on an IPv6 interface\n"
-       "Interface name(e.g. ep0)\n"
-       "Set the OSPF6 area ID\n"
-       "OSPF6 area ID in IPv4 address notation\n"
-       "Advertise I/F Address only match entries of prefix-list\n"
-       "IPv6 prefix-list name\n"
-      )
-
-DEFSH (VTYSH_OSPFD, neighbor_priority_pollinterval_cmd_vtysh, 
-       "neighbor A.B.C.D priority <0-255> poll-interval <1-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, rmap_onmatch_goto_cmd_vtysh, 
-       "on-match goto <1-65535>", 
-       "Exit policy on matches\n"
-       "Goto Clause number\n"
-       "Number\n")
+       "Deconfigure the area's shortcutting mode\n"
+       "Deconfigure enabled shortcutting through the area\n"
+       "Deconfigure disabled shortcutting through the area\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_peer_group_remote_as_cmd_vtysh, 
-       "no neighbor WORD remote-as <1-65535>", 
+DEFSH (VTYSH_OSPF6D, no_ipv6_ospf6_advertise_prefix_list_cmd_vtysh, 
+       "no ipv6 ospf6 advertise prefix-list", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor tag\n"
-       "Specify a BGP neighbor\n"
-       "AS number\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_mask_as_set_cmd_vtysh, 
-       "aggregate-address A.B.C.D A.B.C.D as-set", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Generate AS set path information\n")
-
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_id_adv_router_cmd_vtysh, 
-       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") A.B.C.D adv-router A.B.C.D", 
-       "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "Database summary\n"
-       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
-       "Link State ID (as an IP address)\n"
-       "Advertising Router link states\n"
-       "Advertising Router (as an IP address)\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Advertising options\n"
+       "Filter prefix using prefix-list\n"
+       )
 
-DEFSH (VTYSH_BGPD, no_dump_bgp_all_cmd_vtysh, 
-       "no dump bgp all [PATH] [INTERVAL]", 
-       "Negate a command or set its defaults\n"
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump all BGP packets\n")
+DEFSH (VTYSH_ZEBRA, multicast_cmd_vtysh, 
+       "multicast", 
+       "Set multicast flag to interface\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community4_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft in", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged8_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop as-path med", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n"
-       "Med attribute\n")
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_config_type_cmd_vtysh, 
-       "no bgp config-type", 
-       "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Display configuration type\n")
+DEFSH (VTYSH_BGPD, bgp_default_ipv4_unicast_cmd_vtysh, 
+       "bgp default ipv4-unicast", 
+       "BGP specific commands\n"
+       "Configure BGP defaults\n"
+       "Activate ipv4-unicast for a peer by default\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_view_prefix_cmd_vtysh, 
-       "show ip bgp view WORD A.B.C.D/M", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_prefix_cmd_vtysh, 
+       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D/M", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "BGP view name\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, aggregate_address_as_set_summary_cmd_vtysh, 
-       "aggregate-address A.B.C.D/M as-set summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_cmd_vtysh, 
-       "show ipv6 bgp", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_out_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_ZEBRA, no_ip_address_secondary_cmd_vtysh, 
-       "no ip address A.B.C.D/M secondary", 
-       "Negate a command or set its defaults\n"
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IP address (e.g. 10.0.0.1/8)\n"
-       "Secondary IP address\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) soft out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_soft_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
+       "BGP neighbor address to clear\n"
        "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
+       "Address Family Modifier\n"
        "Soft reconfig\n"
        "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_instance_all_cmd_vtysh, 
-       "clear bgp view WORD *", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_port_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "port", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged6_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged as-path med next-hop", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Neighbor's BGP port\n")
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Med attribute\n"
+       "Nexthop attribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_address_prefix_list_cmd_vtysh, 
-       "no match ip address prefix-list", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_next_hop_cmd_vtysh, 
+       "no match ip next-hop", 
        "Negate a command or set its defaults\n"
        "Match values from routing table\n"
        "IP information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n")
-
-DEFSH (VTYSH_BGPD, neighbor_passive_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "passive", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Don't send open messages to this neighbor\n")
+       "Match next-hop address of route\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_out_cmd_vtysh, 
-       "clear bgp * out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_in_cmd_vtysh, 
+       "clear ip bgp external in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig outbound update\n")
+       "Clear all external peers\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_BGPD, bgp_damp_set2_cmd_vtysh, 
-       "bgp dampening <1-45>", 
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n"
-       "Half-life time for the penalty\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_cmd_vtysh, 
+       "default-information originate", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_detail_cmd_vtysh, 
-       "show ip prefix-list detail", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_cmd_vtysh, 
+       "show ip prefix-list", 
        "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Detail of prefix lists\n")
+       "Build a prefix list\n")
 
-DEFSH (VTYSH_BGPD, neighbor_capability_dynamic_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "capability dynamic", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise dynamic capability to this neighbor\n")
+DEFSH (VTYSH_BGPD, no_dump_bgp_updates_cmd_vtysh, 
+       "no dump bgp updates [PATH] [INTERVAL]", 
+       "Negate a command or set its defaults\n"
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump BGP updates only\n")
 
-DEFSH (VTYSH_BGPD, neighbor_timers_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "timers <0-65535> <0-65535>", 
+DEFSH (VTYSH_BGPD, no_neighbor_local_as_val2_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "local-as <1-65535> no-prepend", 
+       "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP per neighbor timers\n"
-       "Keepalive interval\n"
-       "Holdtime\n")
-
-DEFSH (VTYSH_BGPD, undebug_bgp_all_cmd_vtysh, 
-       "undebug all bgp", 
-       "Disable debugging functions (see also 'debug')\n"
-       "Enable all debugging\n"
-       "BGP information\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_prefix_list_cmd_vtysh, 
-       "show bgp prefix-list WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes conforming to the prefix-list\n"
-       "IPv6 prefix-list name\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Specify a local-as number\n"
+       "AS number used as local AS\n"
+       "Do not prepend local-as to updates from ebgp peers\n")
 
-DEFSH (VTYSH_BGPD, no_set_vpnv4_nexthop_val_cmd_vtysh, 
-       "no set vpnv4 next-hop A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_next_hop_prefix_list_cmd_vtysh, 
+       "no match ip next-hop prefix-list", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n"
-       "IP address of next hop\n")
-
-DEFSH (VTYSH_OSPFD, area_filter_list_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) filter-list prefix WORD (in|out)", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Filter networks between OSPF areas\n"
-       "Filter prefixes between OSPF areas\n"
-       "Name of an IP prefix-list\n"
-       "Filter networks sent to this area\n"
-       "Filter networks sent from this area\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_external_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 external soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_OSPFD, show_ip_ospf_interface_cmd_vtysh, 
-       "show ip ospf interface [INTERFACE]", 
-       "Show running system information\n"
+       "Match values from routing table\n"
        "IP information\n"
-       "OSPF information\n"
-       "Interface information\n"
-       "Interface name\n")
+       "Match next-hop address of route\n"
+       "Match entries of prefix-lists\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbors_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) neighbors", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_advertised_route_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
-
-DEFSH (VTYSH_BGPD, no_bgp_always_compare_med_cmd_vtysh, 
-       "no bgp always-compare-med", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Allow comparing MED from different neighbors\n")
-
-DEFSH (VTYSH_BGPD, old_no_ipv6_aggregate_address_cmd_vtysh, 
-       "no ipv6 bgp aggregate-address X:X::X:X/M", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_metric_cmd_vtysh, 
-       "default-information originate metric-type (1|2) metric <0-16777214>", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "OSPF default metric\n"
-       "OSPF metric\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged2_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path (next-hop|med)", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
-
-DEFSH (VTYSH_RIPD, debug_rip_packet_cmd_vtysh, 
-       "debug rip packet", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_neighbor_advertised_route_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
        "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_default_metric_cmd_vtysh, 
-       "default-metric <1-16>", 
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_mask_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip any A.B.C.D A.B.C.D", 
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "Any source host\n"
+       "Destination address\n"
+       "Destination Wildcard bits\n")
 
-DEFSH (VTYSH_RIPD, no_rip_redistribute_type_cmd_vtysh, 
-       "no redistribute (kernel|connected|static|ospf|bgp)", 
+DEFSH (VTYSH_BGPD, no_set_local_pref_val_cmd_vtysh, 
+       "no set local-preference <0-4294967295>", 
        "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP local preference path attribute\n"
+       "Preference value\n")
+
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_routemap_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) route-map WORD", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Connected\n"
        "Static routes\n"
-       "Open Shortest Path First (OSPF)\n"
-       "Border Gateway Protocol (BGP)\n")
-
-DEFSH (VTYSH_BGPD, undebug_bgp_keepalive_cmd_vtysh, 
-       "undebug bgp keepalives", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP keepalives\n")
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, bgp_network_import_check_cmd_vtysh, 
-       "bgp network import-check", 
-       "BGP specific commands\n"
-       "BGP network command\n"
-       "Check BGP network route exists in IGP\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_standard_cmd_vtysh, 
+       "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D A.B.C.D", 
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Address to match\n"
+       "Wildcard bits\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_soft_out_cmd_vtysh, 
-       "clear ip bgp <1-65535> soft out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_RIPNGD, ripng_network_cmd_vtysh, 
+       "network IF_OR_ADDR", 
+       "RIPng enable on specified interface or network.\n"
+       "Interface or address")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_mask_host_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D host A.B.C.D", 
        "Add an access list entry\n"
        "IP extended access list\n"
        "IP extended access list (expanded range)\n"
@@ -9960,169 +7101,78 @@ DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_cmd_vtysh,
        "Any Internet Protocol\n"
        "Source address\n"
        "Source wildcard bits\n"
-       "Destination address\n"
-       "Destination Wildcard bits\n")
+       "A single destination host\n"
+       "Destination address\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community4_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, show_ip_access_list_name_cmd_vtysh, 
+       "show ip access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD)", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_BGPD, ip_as_path_cmd_vtysh, 
-       "ip as-path access-list WORD (deny|permit) .LINE", 
        "IP information\n"
-       "BGP autonomous system path filter\n"
-       "Specify an access list name\n"
-       "Regular expression access list name\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "A regular-expression to match the BGP AS paths\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_out_cmd_vtysh, 
-       "clear ip bgp * out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_RIPD, send_lifetime_day_month_month_day_cmd_vtysh, 
-       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Month of the year to expire\n"
-       "Day of th month to expire\n"
-       "Year to expire\n")
+       "List IP access lists\n"
+       "IP standard access list\n"
+       "IP extended access list\n"
+       "IP standard access list (expanded range)\n"
+       "IP extended access list (expanded range)\n"
+       "IP zebra access-list\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPF6D, no_router_zebra_cmd_vtysh, 
-       "no router zebra", 
-       "Negate a command or set its defaults\n"
-       "Configure routing process\n"
-       "Disable connection to zebra daemon\n")
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged1_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged (as-path|next-hop|med)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
 
-DEFSH (VTYSH_RIPD, no_ip_rip_authentication_string_cmd_vtysh, 
-       "no ip rip authentication string", 
+DEFSH (VTYSH_RIPD, no_ip_rip_receive_version_cmd_vtysh, 
+       "no ip rip receive version", 
        "Negate a command or set its defaults\n"
        "IP information\n"
        "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication string\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_group_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_route_map_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "route-map WORD (in|out)", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Apply route map to neighbor\n"
-       "Name of route map\n"
-       "Apply map to incoming routes\n"
-       "Apply map to outbound routes\n")
-
-DEFSH (VTYSH_BGPD, ipv6_aggregate_address_summary_only_cmd_vtysh, 
-       "aggregate-address X:X::X:X/M summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
-
-DEFSH (VTYSH_OSPFD, no_ip_ospf_transmit_delay_cmd_vtysh, 
-       "no ip ospf transmit-delay", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n")
+       "Advertisement reception\n"
+       "Version control\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_le_ge_cmd_vtysh, 
-       "no ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
+DEFSH (VTYSH_BGPD, vpnv4_network_cmd_vtysh, 
+       "network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", 
+       "Specify a network to announce via BGP\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_prefix_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
+       "Specify Route Distinguisher\n"
        "VPN Route Distinguisher\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "BGP tag\n"
+       "tag value\n")
 
-DEFSH (VTYSH_BGPD, bgp_network_route_map_cmd_vtysh, 
-       "network A.B.C.D/M route-map WORD", 
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+DEFSH (VTYSH_OSPF6D, ospf6_routemap_match_address_prefixlist_cmd_vtysh, 
+       "match ipv6 address prefix-list WORD", 
+       "Match values\n"
+       "IPv6 information\n"
+       "Match address of route\n"
+       "Match entries of prefix-lists\n"
+       "IPv6 prefix-list name\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community_list_cmd_vtysh, 
-       "show ip bgp community-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
+DEFSH (VTYSH_BGPD, dump_bgp_all_interval_cmd_vtysh, 
+       "dump bgp all PATH INTERVAL", 
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump all BGP packets\n"
+       "Output filename\n"
+       "Interval of output\n")
 
-DEFSH (VTYSH_ZEBRA, no_ip_route_mask_cmd_vtysh, 
-       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE)", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_host_host_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n")
-
-DEFSH (VTYSH_RIPD, accept_lifetime_infinite_month_day_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Never expires")
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "A single destination host\n"
+       "Destination address\n")
 
-DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_metric_cmd_vtysh, 
-       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) metric <0-16777214>", 
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_metric_routemap_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) metric <0-16777214> route-map WORD", 
        "Redistribute information from another routing protocol\n"
        "Kernel routes\n"
        "Connected\n"
@@ -10133,201 +7183,178 @@ DEFSH (VTYSH_OSPFD, ospf_redistribute_source_type_metric_cmd_vtysh,
        "Set OSPF External Type 1 metrics\n"
        "Set OSPF External Type 2 metrics\n"
        "Metric for redistributed routes\n"
-       "OSPF default metric\n")
+       "OSPF default metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) out", 
+DEFSH (VTYSH_OSPFD, ip_ospf_authentication_args_addr_cmd_vtysh, 
+       "ip ospf authentication (null|message-digest) A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Use null authentication\n"
+       "Use message-digest authentication\n"
+       "Address of interface")
+
+DEFSH (VTYSH_BGPD, bgp_enforce_first_as_cmd_vtysh, 
+       "bgp enforce-first-as", 
+       "BGP information\n"
+       "Enforce the first AS for EBGP routes\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in prefix-filter", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_in_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig inbound update\n")
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_out_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) out", 
-       "Reset functions\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_route_map_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) route-map WORD", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, neighbor_override_capability_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "override-capability", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Override capability negotiation result\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the route-map\n"
+       "A route-map to match on\n")
 
-DEFSH (VTYSH_BGPD, no_dump_bgp_updates_cmd_vtysh, 
-       "no dump bgp updates [PATH] [INTERVAL]", 
+DEFSH (VTYSH_BGPD, no_neighbor_peer_group_cmd_vtysh, 
+       "no neighbor WORD peer-group", 
        "Negate a command or set its defaults\n"
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump BGP updates only\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_lsa_sub_cmd_vtysh, 
-       "debug ospf lsa (generate|flooding|install|refresh)", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Link State Advertisement\n"
-       "LSA Generation\n"
-       "LSA Flooding\n"
-       "LSA Install/Delete\n"
-       "LSA Refresh\n")
-
-DEFSH (VTYSH_OSPFD, ip_ospf_hello_interval_cmd_vtysh, 
-       "ip ospf hello-interval <1-65535>", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Seconds\n")
-
-DEFSH (VTYSH_OSPF6D, passive_interface_cmd_vtysh, 
-       "passive-interface IFNAME", 
-       "Suppress routing updates on an interface\n"
-       "Interface name(e.g. ep0)\n")
-
-DEFSH (VTYSH_BGPD, neighbor_nexthop_self_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "next-hop-self", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Disable the next hop calculation for this neighbor\n")
+       "Neighbor tag\n"
+       "Configure peer-group\n")
 
-DEFSH (VTYSH_RIPD, accept_lifetime_month_day_day_month_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Month of the year to start\n"
-       "Day of th month to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Day of th month to expire\n"
-       "Month of the year to expire\n"
-       "Year to expire\n")
+DEFSH (VTYSH_RIPD, rip_timers_cmd_vtysh, 
+       "timers basic <5-2147483647> <5-2147483647> <5-2147483647>", 
+       "Adjust routing timers\n"
+       "Basic routing protocol update timers\n"
+       "Routing table update timer value in second. Default is 30.\n"
+       "Routing information timeout timer. Default is 180.\n"
+       "Garbage collection timer. Default is 120.\n")
 
-DEFSH (VTYSH_ZEBRA, no_ip_route_mask_pref_cmd_vtysh, 
-       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) <1-255>", 
+DEFSH (VTYSH_BGPD, no_bgp_timers_arg_cmd_vtysh, 
+       "no timers bgp <0-65535> <0-65535>", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Distance value for this route\n")
-
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_prefix_longer_cmd_vtysh, 
-       "show ipv6 bgp X:X::X:X/M longer-prefixes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Display route and more specific routes\n")
+       "Adjust routing timers\n"
+       "BGP timers\n"
+       "Keepalive interval\n"
+       "Holdtime\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_metric_val_cmd_vtysh, 
-       "no redistribute static metric <0-16>", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n"
-       "Metric\n"
-       "Metric value\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_routemap_cmd_vtysh, 
+       "default-information originate always metric <0-16777214> route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, no_match_aspath_val_cmd_vtysh, 
-       "no match as-path WORD", 
+DEFSH (VTYSH_BGPD, no_bgp_network_import_check_cmd_vtysh, 
+       "no bgp network import-check", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match BGP AS path list\n"
-       "AS path access-list name\n")
+       "BGP specific commands\n"
+       "BGP network command\n"
+       "Check BGP network route exists in IGP\n")
 
-DEFSH (VTYSH_RIPD, no_key_chain_cmd_vtysh, 
-       "no key chain WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_rmap_onmatch_goto_cmd_vtysh, 
+       "no on-match goto", 
        "Negate a command or set its defaults\n"
-       "Authentication key management\n"
-       "Key-chain management\n"
-       "Key-chain name\n")
+       "Exit policy on matches\n"
+       "Next clause\n")
 
-DEFSH (VTYSH_OSPF6D, show_version_ospf6_cmd_vtysh, 
-       "show version ospf6", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_id_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") A.B.C.D", 
        "Show running system information\n"
-       "Displays ospf6d version\n")
+       "IP information\n"
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
+       "Link State ID (as an IP address)\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X)", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n")
+DEFSH (VTYSH_OSPFD, passive_interface_addr_cmd_vtysh, 
+       "passive-interface IFNAME A.B.C.D", 
+       "Suppress routing updates on an interface\n"
+       "Interface's name\n")
 
-DEFSH (VTYSH_BGPD, bgp_damp_unset_cmd_vtysh, 
-       "no bgp dampening", 
-       "Negate a command or set its defaults\n"
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n")
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_spf_tree_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D spf tree", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Shortest Path First caculation\n"
+       "Displays spf tree\n")
 
-DEFSH (VTYSH_OSPFD, area_import_list_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) import-list NAME", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Set the filter for networks from other areas announced to the specified one\n"
-       "Name of the access-list\n")
+DEFSH (VTYSH_OSPFD, no_area_vlink_param3_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_routemap_cmd_vtysh, 
-       "default-information originate metric <0-16777214> route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "OSPF default metric\n"
-       "OSPF metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_BGPD, show_ip_bgp_community4_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged2_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path (next-hop|med)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
+DEFSH (VTYSH_RIPD, debug_rip_packet_detail_cmd_vtysh, 
+       "debug rip packet (recv|send) detail", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP packet\n"
+       "RIP receive packet\n"
+       "RIP send packet\n"
+       "Detailed information display\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_in_cmd_vtysh, 
-       "clear bgp peer-group WORD in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_priority_cmd_vtysh, 
+       "ipv6 ospf6 priority PRIORITY", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Router priority\n"
+       "<0-255> Priority\n"
+       )
 
-DEFSH (VTYSH_OSPFD, no_ospf_dead_interval_cmd_vtysh, 
-       "no ospf dead-interval", 
+DEFSH (VTYSH_RIPNGD, no_ripng_aggregate_address_cmd_vtysh, 
+       "no aggregate-address X:X::X:X/M", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n")
+       "Delete aggregate RIPng route announcement\n"
+       "Aggregate network")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_all_cmd_vtysh, 
-       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD)", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_le_ge_cmd_vtysh, 
+       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP extended access list\n"
-       "IP standard access list (expanded range)\n"
-       "IP extended access list (expanded range)\n"
-       "IP zebra access-list name\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_ge_cmd_vtysh, 
-       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32>", 
        "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
@@ -10336,246 +7363,170 @@ DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_ge_cmd_vtysh,
        "Specify packets to reject\n"
        "Specify packets to forward\n"
        "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n"
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 
-DEFSH (VTYSH_BGPD, no_set_ecommunity_rt_val_cmd_vtysh, 
-       "no set extcommunity rt .ASN:nn_or_IP-address:nn", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP extended community attribute\n"
-       "Route Target extened communityt\n"
-       "VPN extended community\n")
+DEFSH (VTYSH_OSPFD, area_vlink_param1_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (VTYSH_BGPD, set_atomic_aggregate_cmd_vtysh, 
-       "set atomic-aggregate", 
-       "Set values in destination routing protocol\n"
-       "BGP atomic aggregate attribute\n" )
+DEFSH (VTYSH_RIPD, no_ip_rip_send_version_cmd_vtysh, 
+       "no ip rip send version", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_any_cmd_vtysh, 
-       "access-list WORD (deny|permit) any", 
-       "Add an access list entry\n"
-       "IP zebra access-list name\n"
+DEFSH (VTYSH_BGPD, ip_as_path_cmd_vtysh, 
+       "ip as-path access-list WORD (deny|permit) .LINE", 
+       "IP information\n"
+       "BGP autonomous system path filter\n"
+       "Specify an access list name\n"
+       "Regular expression access list name\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n")
-
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_soft_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535> soft", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, debug_bgp_update_cmd_vtysh, 
-       "debug bgp updates", 
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP updates\n")
-
-DEFSH (VTYSH_BGPD, no_ip_community_list_cmd_vtysh, 
-       "no ip community-list WORD (deny|permit) .AA:NN", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+       "A regular-expression to match the BGP AS paths\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_advertise_interval_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "advertisement-interval <0-600>", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_timers_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "timers <0-65535> <0-65535>", 
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Minimum interval between sending BGP routing updates\n"
-       "time in seconds\n")
-
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv6_metric_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295>", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
+       "Neighbor address\nNeighbor tag\n"
+       "BGP per neighbor timers\n"
+       "Keepalive interval\n"
+       "Holdtime\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_prefix_cmd_vtysh, 
-       "show bgp X:X::X:X/M", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IPv6 prefix <network>/<length>\n")
+DEFSH (VTYSH_BGPD, no_bgp_bestpath_med_cmd_vtysh, 
+       "no bgp bestpath med (confed|missing-as-worst)", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "MED attribute\n"
+       "Compare MED among confederation paths\n"
+       "Treat missing MED as the least preferred one\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_prefix_cmd_vtysh, 
-       "show ipv6 bgp X:X::X:X/M", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_summary_name_cmd_vtysh, 
+       "show ip prefix-list summary WORD", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+       "Build a prefix list\n"
+       "Summary of prefix lists\n"
+       "Name of a prefix list\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_out_cmd_vtysh, 
-       "clear ip bgp <1-65535> ipv4 (unicast|multicast) out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_BGPD, debug_bgp_normal_cmd_vtysh, 
+       "debug bgp", 
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n")
 
-DEFSH (VTYSH_OSPF6D, ipv6_ospf6_advertise_force_prefix_cmd_vtysh, 
-       "ipv6 ospf6 advertise force-prefix", 
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Advertising options\n"
-       "Force advertising prefix,  applicable if Loopback or P-to-P\n"
-       )
+DEFSH (VTYSH_OSPFD, no_area_vlink_authkey_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication-key|)", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Authentication password (key)\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, show_bgp_filter_list_cmd_vtysh, 
-       "show bgp filter-list WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
+DEFSH (VTYSH_ZEBRA, no_multicast_cmd_vtysh, 
+       "no multicast", 
+       "Negate a command or set its defaults\n"
+       "Unset multicast flag to interface\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_in_cmd_vtysh, 
-       "clear ip bgp <1-65535> ipv4 (unicast|multicast) in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_RIPNGD, no_debug_ripng_packet_cmd_vtysh, 
+       "no debug ripng packet", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng packet\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_soft_out_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_RIPD, ip_rip_send_version_cmd_vtysh, 
+       "ip rip send version (1|2)", 
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n"
+       "RIP version 1\n"
+       "RIP version 2\n")
 
-DEFSH (VTYSH_RIPD, rip_distance_cmd_vtysh, 
-       "distance <1-255>", 
+DEFSH (VTYSH_RIPD, no_rip_distance_source_cmd_vtysh, 
+       "no distance <1-255> A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
        "Administrative distance\n"
-       "Distance value\n")
-
-DEFSH (VTYSH_BGPD, set_origin_cmd_vtysh, 
-       "set origin (egp|igp|incomplete)", 
-       "Set values in destination routing protocol\n"
-       "BGP origin code\n"
-       "remote EGP\n"
-       "local IGP\n"
-       "unknown heritage\n")
+       "Distance value\n"
+       "IP source prefix\n")
 
-DEFSH (VTYSH_OSPFD, ospf_transmit_delay_cmd_vtysh, 
-       "ospf transmit-delay <1-65535>", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_retransmit_interval_addr_cmd_vtysh, 
+       "no ip ospf retransmit-interval A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "IP Information\n"
        "OSPF interface commands\n"
-       "Link state transmit delay\n"
-       "Seconds\n")
+       "Time between retransmitting lost link state advertisements\n"
+       "Address of interface")
 
-DEFSH (VTYSH_BGPD, no_neighbor_port_val_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "port <0-65535>", 
+DEFSH (VTYSH_BGPD, no_neighbor_weight_val_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "weight <0-65535>", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Neighbor's BGP port\n"
-       "TCP port number\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Set default weight for routes from this neighbor\n"
+       "default weight\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_ipv6_access_list_cmd_vtysh, 
-       "no ipv6 access-list WORD (deny|permit) X:X::X:X/M", 
+DEFSH (VTYSH_BGPD, no_bgp_distance_source_cmd_vtysh, 
+       "no distance <1-255> A.B.C.D/M", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_database_type_id_adv_router_cmd_vtysh, 
-       "show ipv6 ospf6 database (router|network|as-external|intra-prefix|inter-prefix|inter-router|link|*) (A.B.C.D|*) (A.B.C.D|*|dump|summary)", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "LSA Database\n"
-       "Router-LSA\n"
-       "Network-LSA\n"
-       "AS-External-LSA\n"
-       "Intra-Area-Prefix-LSA\n"
-       "Inter-Area-Router-LSA\n"
-       "Inter-Area-Prefix-LSA\n"
-       "Link-LSA\n"
-       "All LS Type\n"
-       "Link State ID\n"
-       "All Link State ID\n"
-       "Advertising Router\n"
-       "All Advertising Router\n"
-       "Dump raw LSA data in Hex\n"
-       "show summary of LSA\n"
-       )
-
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv6_metric_rmap_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295> route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Define an administrative distance\n"
+       "Administrative distance\n"
+       "IP source prefix\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community_exact_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_paths_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) paths", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (VTYSH_BGPD, no_set_weight_val_cmd_vtysh, 
-       "no set weight <0-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "BGP weight for routing table\n"
-       "Weight value\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Path information\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_ebgp_multihop_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "ebgp-multihop", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_set_peer_group_cmd_vtysh, 
+       "neighbor A.B.C.D " "peer-group WORD", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Allow EBGP neighbors not on directly connected networks\n")
+       "Neighbor address\n"
+       "Member of the peer-group\n"
+       "peer-group name\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_nd_prefix_advertisement_no_val_cmd_vtysh, 
-       "ipv6 nd prefix-advertisement IPV6PREFIX", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_type_cmd_vtysh, 
+       "default-information originate metric <0-16777214> metric-type (1|2)", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n")
 
-DEFSH (VTYSH_BGPD, dump_bgp_all_cmd_vtysh, 
-       "dump bgp all PATH", 
-       "Dump packet\n"
-       "BGP packet dump\n"
-       "Dump all BGP packets\n"
-       "Output filename\n")
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_cost_cmd_vtysh, 
+       "ipv6 ospf6 cost COST", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Interface cost\n"
+       "<1-65535> Cost\n"
+       )
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) soft out", 
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_metric_cmd_vtysh, 
+       "default-information originate metric-type (1|2) metric <0-16777214>", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "OSPF default metric\n"
+       "OSPF metric\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
@@ -10583,7 +7534,6 @@ DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_out_cmd_vtysh,
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Soft reconfig\n"
        "Soft reconfig outbound update\n")
 
 DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_route_prefix_cmd_vtysh, 
@@ -10598,18 +7548,58 @@ DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_route_prefix_cmd_vtysh,
        "Detailed information\n"
        )
 
-DEFSH (VTYSH_RIPNGD, ripng_passive_interface_cmd_vtysh, 
-       "passive-interface IFNAME", 
-       "Suppress routing updates on an interface\n"
-       "Interface name\n")
+DEFSH (VTYSH_OSPFD, no_area_stub_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) stub", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure OSPF area as stub\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_neighbors_peer_cmd_vtysh, 
-       "show bgp neighbors (A.B.C.D|X:X::X:X)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_regexp_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) regexp .LINE", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the AS path regular expression\n"
+       "A regular-expression to match the BGP AS paths\n")
+
+DEFSH (VTYSH_BGPD, match_ecommunity_cmd_vtysh, 
+       "match extcommunity (<1-99>|<100-199>|WORD)", 
+       "Match values from routing table\n"
+       "Match BGP/VPN extended community list\n"
+       "Extended community-list number (standard)\n"
+       "Extended community-list number (expanded)\n"
+       "Extended community-list name\n")
+
+DEFSH (VTYSH_BGPD, no_ip_community_list_name_standard_cmd_vtysh, 
+       "no ip community-list standard WORD (deny|permit) .AA:NN", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Add a community list entry\n"
+       "Specify a standard community-list\n"
+       "Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+
+DEFSH (VTYSH_OSPFD, ospf_authentication_key_cmd_vtysh, 
+       "ospf authentication-key AUTH_KEY", 
+       "OSPF interface commands\n"
+       "Authentication password (key)\n"
+       "The OSPF password (key)")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_instance_summary_cmd_vtysh, 
+       "show ip bgp view WORD summary", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP view\n"
+       "View name\n"
+       "Summary of BGP neighbor status\n")
 
 DEFSH (VTYSH_OSPFD, no_debug_ospf_packet_all_cmd_vtysh, 
        "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", 
@@ -10624,373 +7614,421 @@ DEFSH (VTYSH_OSPFD, no_debug_ospf_packet_all_cmd_vtysh,
        "OSPF Link State Acknowledgment\n"
        "OSPF all packets\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ipv6_prefix_list_seq_cmd_vtysh, 
-       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) (X:X::X:X/M|any)", 
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Any prefix match.  Same as \"::0/0 le 128\"\n")
-
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_cmd_vtysh, 
-       "no redistribute kernel", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_route_map_cmd_vtysh, 
+       "no route-map WORD (deny|permit) <1-65535>", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n")
+       "Create route-map or enter route-map command mode\n"
+       "Route map tag\n"
+       "Route map denies set operations\n"
+       "Route map permits set operations\n"
+       "Sequence to insert to/delete from existing route-map entry\n")
 
-DEFSH (VTYSH_BGPD, set_weight_cmd_vtysh, 
-       "set weight <0-4294967295>", 
-       "Set values in destination routing protocol\n"
-       "BGP weight for routing table\n"
-       "Weight value\n")
+DEFSH (VTYSH_BGPD, neighbor_interface_cmd_vtysh, 
+       "neighbor A.B.C.D " "interface WORD", 
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Interface\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_routemap_cmd_vtysh, 
-       "default-information originate metric-type (1|2) route-map WORD", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+DEFSH (VTYSH_BGPD, neighbor_send_community_type_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "send-community (both|extended|standard)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Send Community attribute to this neighbor\n"
+       "Send Standard and Extended Community attributes\n"
+       "Send Extended Community attributes\n"
+       "Send Standard Community attributes\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_metric_cmd_vtysh, 
-       "no redistribute bgp metric", 
+DEFSH (VTYSH_ZEBRA, no_ip_address_cmd_vtysh, 
+       "no ip address A.B.C.D/M", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Metric\n")
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP Address (e.g. 10.0.0.1/8)")
 
-DEFSH (VTYSH_RIPNGD, ripng_network_cmd_vtysh, 
-       "network IF_OR_ADDR", 
-       "RIPng enable on specified interface or network.\n"
-       "Interface or address")
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_flap_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) flap-statistics", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display flap statistics of the routes learned from neighbor\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_le_ge_cmd_vtysh, 
-       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
+DEFSH (VTYSH_OSPFD, ip_ospf_network_cmd_vtysh, 
+       "ip ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Network type\n"
+       "Specify OSPF broadcast multi-access network\n"
+       "Specify OSPF NBMA network\n"
+       "Specify OSPF point-to-multipoint network\n"
+       "Specify OSPF point-to-point network\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_send_community_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "send-community", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Send Community attribute to this neighbor\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_default_metric_val_cmd_vtysh, 
-       "no default-metric <0-16777214>", 
+DEFSH (VTYSH_BGPD, no_neighbor_strict_capability_cmd_vtysh, 
+       "no neighbor A.B.C.D " "strict-capability-match", 
        "Negate a command or set its defaults\n"
-       "Set metric of redistributed routes\n"
-       "Default metric\n")
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "Strict capability negotiation match\n")
 
-DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_cmd_vtysh, 
-       "distance ospf external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "External routes\n"
-       "Distance for external routes\n")
+DEFSH (VTYSH_BGPD, no_neighbor_update_source_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "update-source", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Source of routing updates\n"
+       "Interface name\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_scan_time_val_cmd_vtysh, 
-       "no bgp scan-time <5-60>", 
+DEFSH (VTYSH_ZEBRA, show_debugging_zebra_cmd_vtysh, 
+       "show debugging zebra", 
+       "Show running system information\n"
+       "Zebra configuration\n"
+       "Debugging information\n")
+
+DEFSH (VTYSH_OSPFD, no_area_filter_list_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) filter-list prefix WORD (in|out)", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Configure background scanner interval\n"
-       "Scanner interval (seconds)\n")
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Filter networks between OSPF areas\n"
+       "Filter prefixes between OSPF areas\n"
+       "Name of an IP prefix-list\n"
+       "Filter networks sent to this area\n"
+       "Filter networks sent from this area\n")
 
-DEFSH (VTYSH_BGPD, old_ipv6_aggregate_address_summary_only_cmd_vtysh, 
-       "ipv6 bgp aggregate-address X:X::X:X/M summary-only", 
-       "IPv6 information\n"
-       "BGP information\n"
+DEFSH (VTYSH_BGPD, ip_community_list_name_standard_cmd_vtysh, 
+       "ip community-list standard WORD (deny|permit) .AA:NN", 
+       "IP information\n"
+       "Add a community list entry\n"
+       "Add a standard community-list entry\n"
+       "Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+
+DEFSH (VTYSH_OSPF6D, show_zebra_cmd_vtysh, 
+       "show zebra", 
+       "Show running system information\n"
+       "Zebra information\n")
+
+DEFSH (VTYSH_BGPD, no_aggregate_address_as_set_summary_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M as-set summary-only", 
+       "Negate a command or set its defaults\n"
        "Configure BGP aggregate entries\n"
        "Aggregate prefix\n"
+       "Generate AS set path information\n"
        "Filter more specific routes from updates\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_route_cmd_vtysh, 
-       "show bgp X:X::X:X", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Network in the BGP routing table to display\n")
+DEFSH (VTYSH_OSPF6D, no_ospf6_redistribute_cmd_vtysh, 
+       "no redistribute (static|kernel|connected|ripng|bgp)", 
+       "Negate a command or set its defaults\n"
+       "Redistribute\n"
+       "Static route\n"
+       "Kernel route\n"
+       "Connected route\n"
+       "RIPng route\n"
+       "BGP route\n"
+      )
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_adv_router_cmd_vtysh, 
-       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") adv-router A.B.C.D", 
+DEFSH (VTYSH_RIPD, show_ip_protocols_rip_cmd_vtysh, 
+       "show ip protocols", 
        "Show running system information\n"
        "IP information\n"
-       "OSPF information\n"
-       "Database summary\n"
-       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
-       "Advertising Router link states\n"
-       "Advertising Router (as an IP address)\n")
+       "IP routing protocol process parameters and statistics\n")
 
-DEFSH (VTYSH_BGPD, no_ip_community_list_name_all_cmd_vtysh, 
-       "no ip community-list (standard|expanded) WORD", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_cmd_vtysh, 
+       "redistribute ospf6", 
+       "Redistribute information from another routing protocol\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n")
+
+DEFSH (VTYSH_OSPFD, area_vlink_authtype_args_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) (message-digest|null)", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n")
+
+DEFSH (VTYSH_OSPFD, no_area_range_substitute_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a community list entry\n"
-       "Add a standard community-list entry\n"
-       "Add an expanded community-list entry\n"
-       "Community list name\n")
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Announce area range as another prefix\n"
+       "Network prefix to be announced instead of range\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_rd_neighbors_peer_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) routes", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n")
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display routes learned from neighbor\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_in_cmd_vtysh, 
-       "clear ip bgp <1-65535> in", 
+DEFSH (VTYSH_BGPD, ip_community_list_cmd_vtysh, 
+       "ip community-list WORD (deny|permit) .AA:NN", 
+       "IP information\n"
+       "Add a community list entry\n"
+       "Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+
+DEFSH (VTYSH_OSPFD, no_router_id_cmd_vtysh, 
+       "no router-id", 
+       "Negate a command or set its defaults\n"
+       "router-id for the OSPF process\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_out_cmd_vtysh, 
+       "clear ip bgp <1-65535> vpnv4 unicast out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
        "Clear peers with the AS number\n"
-       "Soft reconfig inbound update\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_RIPD, ip_rip_send_version_cmd_vtysh, 
-       "ip rip send version (1|2)", 
+DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged10_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "attribute-unchanged med as-path next-hop", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n")
+
+DEFSH (VTYSH_RIPD, no_match_ip_address_val_cmd_vtysh, 
+       "no match ip address WORD", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n"
-       "RIP version 1\n"
-       "RIP version 2\n")
+       "Match address of route\n"
+       "IP access-list name\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_authentication_key_cmd_vtysh, 
-       "no ospf authentication-key", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_update_cmd_vtysh, 
+       "no debug bgp updates", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n")
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "BGP updates\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_host_host_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", 
+DEFSH (VTYSH_OSPFD|VTYSH_OSPF6D, ospf6_routemap_set_metric_type_cmd_vtysh, 
+       "set metric-type (type-1|type-2)", 
+       "Set value\n"
+       "Type of metric\n"
+       "OSPF6 external type 1 metric\n"
+       "OSPF6 external type 2 metric\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_confederation_identifier_arg_cmd_vtysh, 
+       "no bgp confederation identifier <1-65535>", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "A single destination host\n"
-       "Destination address\n")
+       "BGP specific commands\n"
+       "AS confederation parameters\n"
+       "AS number\n"
+       "Set routing domain confederation AS\n")
 
-DEFSH (VTYSH_BGPD, neighbor_dont_capability_negotiate_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "dont-capability-negotiate", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_cmd_vtysh, 
+       "clear ip bgp <1-65535>", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear peers with the AS number\n")
+
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Do not perform capability negotiation\n")
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n")
 
-DEFSH (VTYSH_OSPFD, no_area_vlink_param4_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_deadinterval_cmd_vtysh, 
+       "ipv6 ospf6 dead-interval ROUTER_DEAD_INTERVAL", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Interval after which a neighbor is declared dead\n"
+       "<1-65535> Seconds\n"
+       )
+
+DEFSH (VTYSH_OSPFD, area_vlink_param4_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
        "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
        "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
        "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
        "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
        "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp A.B.C.D in prefix-filter", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig inbound update\n"
-       "Push out the existing ORF prefix-list\n")
+DEFSH (VTYSH_RIPD, send_lifetime_infinite_day_month_cmd_vtysh, 
+       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Day of th month to start\n"
+       "Month of the year to start\n"
+       "Year to start\n"
+       "Never expires")
 
-DEFSH (VTYSH_OSPFD, area_vlink_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D A.B.C.D A.B.C.D", 
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "Source address\n"
+       "Source wildcard bits\n"
+       "Destination address\n"
+       "Destination Wildcard bits\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_weight_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "weight", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Set default weight for routes from this neighbor\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_retransmit_interval_addr_cmd_vtysh, 
+       "ip ospf retransmit-interval <3-65535> A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n"
+       "Seconds\n"
+       "Address of interface")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ipv6_prefix_list_name_prefix_cmd_vtysh, 
-       "clear ipv6 prefix-list WORD X:X::X:X/M", 
-       "Reset functions\n"
-       "IPv6 information\n"
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_name_seq_cmd_vtysh, 
+       "show ip prefix-list WORD seq <1-4294967295>", 
+       "Show running system information\n"
+       "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+       "sequence number of an entry\n"
+       "Sequence number\n")
 
-DEFSH (VTYSH_ZEBRA, ip_irdp_address_preference_cmd_vtysh, 
-       "ip irdp address A.B.C.D <0-2147483647>", 
+DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_detail_cmd_vtysh, 
+       "show ip ospf neighbor detail", 
+       "Show running system information\n"
        "IP information\n"
-       "ICMP Router discovery on this interface\n"
-       "Specify IRDP address and preference to proxy-advertise\n"
-       "Set IRDP address for proxy-advertise\n"
-       "Preference level\n")
+       "OSPF information\n"
+       "Neighbor list\n"
+       "detail of all neighbors\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_external_soft_in_cmd_vtysh, 
-       "clear ip bgp external soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp <1-65535> in prefix-filter", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Clear peers with the AS number\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_set_vpnv4_nexthop_cmd_vtysh, 
-       "no set vpnv4 next-hop", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_description_arg_cmd_vtysh, 
+       "no ip prefix-list WORD description .LINE", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n")
-
-DEFSH (VTYSH_BGPD, bgp_multiple_instance_cmd_vtysh, 
-       "bgp multiple-instance", 
-       "BGP information\n"
-       "Enable bgp multiple instance\n")
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Prefix-list specific description\n"
+       "Up to 80 characters describing this prefix-list\n")
 
-DEFSH (VTYSH_BGPD, no_set_ipv6_nexthop_global_cmd_vtysh, 
-       "no set ipv6 next-hop global", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 global address\n")
+DEFSH (VTYSH_RIPD, rip_redistribute_rip_cmd_vtysh, 
+       "redistribute rip", 
+       "Redistribute information from another routing protocol\n"
+       "Routing Information Protocol (RIP)\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_neighbors_cmd_vtysh, 
-       "show bgp neighbors", 
+DEFSH (VTYSH_BGPD, show_ip_extcommunity_list_cmd_vtysh, 
+       "show ip extcommunity-list", 
        "Show running system information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
-
-DEFSH (VTYSH_RIPD, no_match_ip_next_hop_val_cmd_vtysh, 
-       "no match ip next-hop WORD", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
        "IP information\n"
-       "Match next-hop address of route\n"
-       "IP access-list name\n")
+       "List extended-community list\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_community2_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+DEFSH (VTYSH_OSPFD, no_ospf_cost_cmd_vtysh, 
+       "no ospf cost", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Interface cost\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_prefix_list_cmd_vtysh, 
-       "show bgp ipv6 prefix-list WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_filter_list_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) filter-list WORD", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
-       "Display routes conforming to the prefix-list\n"
-       "IPv6 prefix-list name\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes conforming to the filter-list\n"
+       "Regular expression access list name\n")
 
-DEFSH (VTYSH_OSPFD, no_area_stub_nosum_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) stub no-summary", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area as stub\n"
-       "Do not inject inter-area routes into area\n")
+DEFSH (VTYSH_OSPFD, area_vlink_md5_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(message-digest-key|) <1-255> md5 KEY", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X)", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n")
+DEFSH (VTYSH_BGPD, neighbor_passive_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "passive", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Don't send open messages to this neighbor\n")
 
-DEFSH (VTYSH_OSPFD, area_shortcut_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) shortcut (default|enable|disable)", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure the area's shortcutting mode\n"
-       "Set default shortcutting behavior\n"
-       "Enable shortcutting through the area\n"
-       "Disable shortcutting through the area\n")
+DEFSH (VTYSH_RIPD, no_ip_rip_authentication_key_chain_cmd_vtysh, 
+       "no ip rip authentication key-chain", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication key-chain\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_kernel_cmd_vtysh, 
-       "redistribute kernel", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_event_cmd_vtysh, 
+       "debug ospf event", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF event information\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_ge_le_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+DEFSH (VTYSH_BGPD, neighbor_timers_connect_cmd_vtysh, 
+       "neighbor A.B.C.D " "timers connect <0-65535>", 
+       "Specify neighbor router\n"
+       "Neighbor address\n"
+       "BGP per neighbor timers\n"
+       "BGP connect timer\n"
+       "Connect timer\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_default_local_preference_cmd_vtysh, 
-       "no bgp default local-preference", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "local preference (higher=more preferred)\n")
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_soft_out_cmd_vtysh, 
+       "clear ip bgp peer-group WORD soft out", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig\n"
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) soft out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
+       "Clear all external peers\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_BGPD, bgp_redistribute_ipv6_rmap_cmd_vtysh, 
-       "redistribute (connected|kernel|ospf6|ripng|static) route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Connected\n"
-       "Kernel routes\n"
-       "Open Shurtest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_route_cmd_vtysh, 
-       "show ipv6 ospf6 route", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Routing table\n"
-       )
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_mask_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip any A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_host_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", 
        "Add an access list entry\n"
        "IP extended access list\n"
        "IP extended access list (expanded range)\n"
@@ -10998,243 +8036,233 @@ DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_any_mask_cmd_vtys
        "Specify packets to forward\n"
        "Any Internet Protocol\n"
        "Any source host\n"
-       "Destination address\n"
-       "Destination Wildcard bits\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPF6D, router_zebra_cmd_vtysh, 
-       "router zebra", 
-       "Enable a routing process\n"
-       "Make connection to zebra daemon\n")
+       "A single destination host\n"
+       "Destination address\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_cmd_vtysh, 
-       "clear ip bgp view WORD *", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_soft_cmd_vtysh, 
+       "clear ip bgp peer-group WORD soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_default_originate_rmap_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "default-originate route-map WORD", 
+DEFSH (VTYSH_OSPFD, no_ip_ospf_hello_interval_addr_cmd_vtysh, 
+       "no ip ospf hello-interval A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Originate default route to this neighbor\n"
-       "Route-map to specify criteria to originate default\n"
-       "route-map name\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between HELLO packets\n"
+       "Address of interface")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_cmd_vtysh, 
-       "no ipv6 prefix-list WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_description_cmd_vtysh, 
+       "no ip prefix-list WORD description", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
+       "IP information\n"
        "Build a prefix list\n"
-       "Name of a prefix list\n")
-
-DEFSH (VTYSH_OSPFD, area_vlink_authtype_args_authkey_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(authentication-key|) AUTH_KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n"
-       "Authentication password (key)\n" "The OSPF password (key)")
-
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_routemap_cmd_vtysh, 
-       "redistribute static route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Static routes\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
+       "Name of a prefix list\n"
+       "Prefix-list specific description\n")
 
-DEFSH (VTYSH_RIPD, accept_lifetime_day_month_month_day_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Month of the year to expire\n"
-       "Day of th month to expire\n"
-       "Year to expire\n")
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) soft", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP neighbor address to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n")
 
-DEFSH (VTYSH_OSPF6D, no_debug_ospf6_all_cmd_vtysh, 
-       "no debug ospf6 all", 
+DEFSH (VTYSH_OSPFD, no_network_area_cmd_vtysh, 
+       "no network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Turn off ALL OSPFv3 debugging\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_metric_cmd_vtysh, 
-       "default-information originate always metric-type (1|2) metric <0-16777214>", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
-       "OSPF default metric\n"
-       "OSPF metric\n")
-
-DEFSH (VTYSH_BGPD, neighbor_route_server_client_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "route-server-client", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Configure a neighbor as Route Server client\n")
+       "Enable routing on an IP network\n"
+       "OSPF network prefix\n"
+       "Set the OSPF area ID\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community2_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_metric_cmd_vtysh, 
+       "no redistribute kernel metric", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Metric\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_prefix_longer_cmd_vtysh, 
-       "show bgp X:X::X:X/M longer-prefixes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Display route and more specific routes\n")
+DEFSH (VTYSH_OSPFD, area_range_advertise_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "OSPF area range for route advertise (default)\n"
+       "Area range prefix\n"
+       "Advertise this range (default)\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_type_cmd_vtysh, 
-       "default-information originate metric-type (1|2)", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n")
+DEFSH (VTYSH_OSPFD, area_range_substitute_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Announce area range as another prefix\n"
+       "Network prefix to be announced instead of range\n")
 
-DEFSH (VTYSH_OSPFD, no_neighbor_priority_cmd_vtysh, 
-       "no neighbor A.B.C.D priority <0-255>", 
+DEFSH (VTYSH_RIPD, no_rip_version_cmd_vtysh, 
+       "no version", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n")
+       "Set routing protocol version\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_distance_source_access_list_cmd_vtysh, 
-       "no distance <1-255> A.B.C.D/M WORD", 
-       "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n"
-       "Access list name\n")
+DEFSH (VTYSH_BGPD, bgp_confederation_peers_cmd_vtysh, 
+       "bgp confederation peers .<1-65535>", 
+       "BGP specific commands\n"
+       "AS confederation parameters\n"
+       "Peer ASs in BGP confederation\n"
+       "AS number\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_seq_le_ge_cmd_vtysh, 
-       "ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ip_prefix_list_name_prefix_cmd_vtysh, 
+       "clear ip prefix-list WORD A.B.C.D/M", 
+       "Reset functions\n"
        "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
-       "sequence number of an entry\n"
-       "Sequence number\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (VTYSH_BGPD, neighbor_remote_as_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "remote-as <1-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a BGP neighbor\n"
-       "AS number\n")
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbors_peer_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X)", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_lsa_sub_cmd_vtysh, 
-       "no debug ospf lsa (generate|flooding|install|refresh)", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_packet_send_recv_detail_cmd_vtysh, 
+       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
+       "Debugging functions\n"
        "OSPF information\n"
-       "OSPF Link State Advertisement\n"
-       "LSA Generation\n"
-       "LSA Flooding\n"
-       "LSA Install/Delete\n"
-       "LSA Refres\n")
+       "OSPF packets\n"
+       "OSPF Hello\n"
+       "OSPF Database Description\n"
+       "OSPF Link State Request\n"
+       "OSPF Link State Update\n"
+       "OSPF Link State Acknowledgment\n"
+       "OSPF all packets\n"
+       "Packet sent\n"
+       "Packet received\n"
+       "Detail Information\n")
 
-DEFSH (VTYSH_BGPD, no_match_origin_cmd_vtysh, 
-       "no match origin", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_authtype_md5_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) "
+       "(message-digest-key|)", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "BGP origin code\n")
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n"
+       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, neighbor_remove_private_as_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "remove-private-AS", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Remove private AS number from outbound updates\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_ism_sub_cmd_vtysh, 
+       "debug ospf ism (status|events|timers)", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Interface State Machine\n"
+       "ISM Status Information\n"
+       "ISM Event Information\n"
+       "ISM TImer Information\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ipv6_prefix_list_detail_name_cmd_vtysh, 
-       "show ipv6 prefix-list detail WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Detail of prefix lists\n"
-       "Name of a prefix list\n")
+DEFSH (VTYSH_BGPD, bgp_distance_cmd_vtysh, 
+       "distance bgp <1-255> <1-255> <1-255>", 
+       "Define an administrative distance\n"
+       "BGP distance\n"
+       "Distance for routes external to the AS\n"
+       "Distance for routes internal to the AS\n"
+       "Distance for local routes\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_address_cmd_vtysh, 
-       "show ip bgp flap-statistics A.B.C.D", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Network in the BGP routing table to display\n")
+DEFSH (VTYSH_BGPD, neighbor_shutdown_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "shutdown", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Administratively shut down this neighbor\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_rmap_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf|rip|static) route-map WORD", 
+DEFSH (VTYSH_OSPFD, ip_ospf_retransmit_interval_cmd_vtysh, 
+       "ip ospf retransmit-interval <3-65535>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n"
+       "Seconds\n")
+
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_routemap_cmd_vtysh, 
+       "no redistribute kernel route-map WORD", 
        "Negate a command or set its defaults\n"
        "Redistribute information from another routing protocol\n"
-       "Connected\n"
        "Kernel routes\n"
-       "Open Shurtest Path First (OSPF)\n"
-       "Routing Information Protocol (RIP)\n"
-       "Static routes\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_peer_group_cmd_vtysh, 
-       "clear bgp peer-group WORD", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n")
+DEFSH (VTYSH_OSPFD, no_passive_interface_addr_cmd_vtysh, 
+       "no passive-interface IFNAME A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Allow routing updates on an interface\n"
+       "Interface's name\n")
 
-DEFSH (VTYSH_BGPD, neighbor_interface_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "interface WORD", 
+DEFSH (VTYSH_BGPD, no_debug_bgp_normal_cmd_vtysh, 
+       "no debug bgp", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_override_capability_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "override-capability", 
+       "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Interface\n"
-       "Interface name\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Override capability negotiation result\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_peer_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_authentication_key_cmd_vtysh, 
+       "ip ospf authentication-key AUTH_KEY", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Authentication password (key)\n"
+       "The OSPF password (key)")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_soft_cmd_vtysh, 
-       "clear bgp * soft", 
-       "Reset functions\n"
+DEFSH (VTYSH_RIPD, rip_offset_list_cmd_vtysh, 
+       "offset-list WORD (in|out) <0-16>", 
+       "Modify RIP metric\n"
+       "Access-list name\n"
+       "For incoming updates\n"
+       "For outgoing updates\n"
+       "Metric value\n")
+
+DEFSH (VTYSH_BGPD, debug_bgp_filter_cmd_vtysh, 
+       "debug bgp filters", 
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig\n")
+       "BGP filters\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community3_exact_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_OSPFD, no_ospf_dead_interval_cmd_vtysh, 
+       "no ospf dead-interval", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Interval after which a neighbor is declared dead\n")
+
+DEFSH (VTYSH_BGPD, neighbor_enforce_multihop_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "enforce-multihop", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Enforce EBGP neighbors perform multihop\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_dont_capability_negotiate_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "dont-capability-negotiate", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Do not perform capability negotiation\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
@@ -11246,411 +8274,318 @@ DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community3_exact_cmd_vtysh,
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_received_routes_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_mask_summary_as_set_cmd_vtysh, 
-       "aggregate-address A.B.C.D A.B.C.D summary-only as-set", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
-
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_neighbor_routerid_cmd_vtysh, 
-       "show ipv6 ospf6 neighbor A.B.C.D", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Neighbor list\n"
-       "OSPF6 neighbor Router ID in IP address format\n"
-       )
-
-DEFSH (VTYSH_BGPD, bgp_cluster_id32_cmd_vtysh, 
-       "bgp cluster-id <1-4294967295>", 
+DEFSH (VTYSH_BGPD, no_bgp_router_id_val_cmd_vtysh, 
+       "no bgp router-id A.B.C.D", 
+       "Negate a command or set its defaults\n"
        "BGP information\n"
-       "Configure Route-Reflector Cluster-id\n"
-       "Route-Reflector Cluster-id as 32 bit quantity\n")
+       "Override configured router identifier\n"
+       "Manually configured router identifier\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535>", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_soft_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n")
+       "BGP neighbor address to clear\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPFD|VTYSH_OSPFD, show_ip_ospf_neighbor_id_cmd_vtysh, 
-       "show ip ospf neighbor A.B.C.D", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_prefix_list_cmd_vtysh, 
+       "show ip bgp flap-statistics prefix-list WORD", 
        "Show running system information\n"
        "IP information\n"
-       "OSPF information\n"
-       "Neighbor list\n"
-       "Neighbor ID\n")
+       "BGP information\n"
+       "Display flap statistics of routes\n"
+       "Display routes conforming to the prefix-list\n"
+       "IP prefix-list name\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_hello_interval_addr_cmd_vtysh, 
-       "no ip ospf hello-interval A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Address of interface")
+DEFSH (VTYSH_ZEBRA, shutdown_if_cmd_vtysh, 
+       "shutdown", 
+       "Shutdown the selected interface\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_kernel_metric_val_cmd_vtysh, 
-       "no redistribute kernel metric <0-16>", 
+DEFSH (VTYSH_BGPD, no_set_atomic_aggregate_cmd_vtysh, 
+       "no set atomic-aggregate", 
        "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes\n"
-       "Metric\n"
-       "Metric value\n")
+       "Set values in destination routing protocol\n"
+       "BGP atomic aggregate attribute\n" )
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_rmap_onmatch_goto_cmd_vtysh, 
-       "no on-match goto", 
+DEFSH (VTYSH_BGPD, no_neighbor_default_originate_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "default-originate", 
        "Negate a command or set its defaults\n"
-       "Exit policy on matches\n"
-       "Next clause\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Originate default route to this neighbor\n")
 
-DEFSH (VTYSH_OSPF6D, ospf6_redistribute_routemap_cmd_vtysh, 
-       "redistribute (static|kernel|connected|ripng|bgp) route-map WORD", 
-       "Redistribute\n"
-       "Static routes\n"
-       "Kernel route\n"
-       "Connected route\n"
-       "RIPng route\n"
-       "BGP route\n"
-       "Route map reference\n"
-       "Route map name\n"
-      )
+DEFSH (VTYSH_RIPD, show_ip_rip_cmd_vtysh, 
+       "show ip rip", 
+       "Show running system information\n"
+       "IP information\n"
+       "Show RIP routes\n")
 
-DEFSH (VTYSH_BGPD, neighbor_local_as_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "local-as <1-65535>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a local-as number\n"
-       "AS number used as local AS\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_type_routemap_cmd_vtysh, 
+       "default-information originate always metric <0-16777214> metric-type (1|2) route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp view WORD * ipv4 (unicast|multicast) in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_address_cmd_vtysh, 
+       "clear ip bgp dampening A.B.C.D", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Clear route flap dampening information\n"
+       "Network to clear damping information\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_address_prefix_list_val_cmd_vtysh, 
-       "no match ip address prefix-list WORD", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_set_ip_nexthop_cmd_vtysh, 
+       "no set ip next-hop", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
+       "Set values in destination routing protocol\n"
        "IP information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged9_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med next-hop as-path", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n")
+       "Next hop address\n")
 
-DEFSH (VTYSH_ZEBRA, ipv6_nd_ra_interval_cmd_vtysh, 
-       "ipv6 nd ra-interval SECONDS", 
-       "IP information\n"
-       "Neighbor discovery\n"
-       "Router Advertisement interval\n"
-       "Router Advertisement interval in seconds\n")
+DEFSH (VTYSH_RIPD, rip_distance_source_cmd_vtysh, 
+       "distance <1-255> A.B.C.D/M", 
+       "Administrative distance\n"
+       "Distance value\n"
+       "IP source prefix\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_ospf6_metric_cmd_vtysh, 
-       "no redistribute ospf6 metric", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_metric_routemap_cmd_vtysh, 
+       "redistribute ospf6 metric <0-16> route-map WORD", 
        "Redistribute information from another routing protocol\n"
        "IPv6 Open Shortest Path First (OSPFv3)\n"
-       "Metric\n")
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community3_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
+DEFSH (VTYSH_ZEBRA, ip_route_cmd_vtysh, 
+       "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0)", 
        "IP information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (VTYSH_BGPD, no_neighbor_timers_connect_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "timers connect", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "BGP per neighbor timers\n"
-       "BGP connect timer\n")
-
-DEFSH (VTYSH_BGPD, set_community_cmd_vtysh, 
-       "set community .AA:NN", 
-       "Set values in destination routing protocol\n"
-       "BGP community attribute\n"
-       "Community number in aa:nn format or local-AS|no-advertise|no-export|internet or additive\n")
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community_list_exact_cmd_vtysh, 
-       "show ip bgp community-list WORD exact-match", 
-       "Show running system information\n"
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_cmd_vtysh, 
+       "clear ip bgp external", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
+       "Clear all external peers\n")
 
-DEFSH (VTYSH_BGPD, bgp_network_cmd_vtysh, 
-       "network A.B.C.D/M", 
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_any_any_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any any", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "Any source host\n"
+       "Any destination host\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_summary_cmd_vtysh, 
-       "show ip bgp summary", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_route_map_cmd_vtysh, 
+       "show ip bgp route-map WORD", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Summary of BGP neighbor status\n")
-
-DEFSH (VTYSH_BGPD, no_vpnv4_network_cmd_vtysh, 
-       "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD", 
-       "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Specify Route Distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "BGP tag\n"
-       "tag value\n")
-
-DEFSH (VTYSH_BGPD, bgp_network_backdoor_cmd_vtysh, 
-       "network A.B.C.D/M backdoor", 
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Specify a BGP backdoor route\n")
+       "Display routes matching the route-map\n"
+       "A route-map to match on\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_send_community_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "send-community", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_ism_sub_cmd_vtysh, 
+       "no debug ospf ism (status|events|timers)", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Send Community attribute to this neighbor\n")
-
-DEFSH (VTYSH_ZEBRA, debug_zebra_packet_detail_cmd_vtysh, 
-       "debug zebra packet (recv|send) detail", 
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug option set for zebra packet\n"
-       "Debug option set for receive packet\n"
-       "Debug option set for send packet\n"
-       "Debug option set detaied information\n")
-
-DEFSH (VTYSH_OSPFD, show_ip_ospf_cmd_vtysh, 
-       "show ip ospf", 
-       "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n")
-
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_filter_list_cmd_vtysh, 
-       "show bgp ipv6 filter-list WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
+       "Debugging functions\n"
+       "OSPF information\n"
+       "OSPF Interface State Machine\n"
+       "ISM Status Information\n"
+       "ISM Event Information\n"
+       "ISM Timer Information\n")
 
-DEFSH (VTYSH_RIPD, ip_rip_receive_version_2_cmd_vtysh, 
-       "ip rip receive version 2 1", 
+DEFSH (VTYSH_RIPD, ip_rip_authentication_mode_cmd_vtysh, 
+       "ip rip authentication mode (md5|text)", 
        "IP information\n"
        "Routing Information Protocol\n"
-       "Advertisement reception\n"
-       "Version control\n"
-       "RIP version 2\n"
-       "RIP version 1\n")
-
-DEFSH (VTYSH_ZEBRA, ip_irdp_maxadvertinterval_cmd_vtysh, 
-       "ip irdp maxadvertinterval (0|<4-1800>)", 
-       "IP information\n"
-       "ICMP Router discovery on this interface\n"
-       "Set maximum time between advertisement\n"
-       "Maximum advertisement interval in seconds\n")
+       "Authentication control\n"
+       "Authentication mode\n"
+       "Keyed message digest\n"
+       "Clear text authentication\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_prefix_longer_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M longer-prefixes", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Display route and more specific routes\n")
+DEFSH (VTYSH_OSPFD, debug_ospf_nsm_cmd_vtysh, 
+       "debug ospf nsm", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Neighbor State Machine\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_all_soft_in_cmd_vtysh, 
-       "clear bgp * soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_dampening_cmd_vtysh, 
+       "clear ip bgp dampening", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Clear route flap dampening information\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_default_ipv4_unicast_cmd_vtysh, 
-       "no bgp default ipv4-unicast", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "Activate ipv4-unicast for a peer by default\n")
+DEFSH (VTYSH_OSPFD, area_range_not_advertise_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M not-advertise", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "DoNotAdvertise this range\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_topology_router_lsid_cmd_vtysh, 
-       "show ipv6 ospf6 area A.B.C.D topology (A.B.C.D|<0-4294967295>) (A.B.C.D|<0-4294967295>)", 
+DEFSH (VTYSH_OSPFD|VTYSH_OSPFD, show_ip_ospf_neighbor_id_cmd_vtysh, 
+       "show ip ospf neighbor A.B.C.D", 
        "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Area information\n"
-       "Area ID (as an IPv4 notation)\n"
-       "Shortest Path First tree information\n"
-       "Displays SPF topology table\n"
-       "Specify Router-ID\n"
-       "Specify Router-ID\n"
-       "Specify Link State ID\n"
-       "Specify Link State ID\n"
-       )
-
-DEFSH (VTYSH_ZEBRA, no_ipv6_nd_managed_config_flag_cmd_vtysh, 
-       "no ipv6 nd managed-config-flag", 
-       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Neighbor discovery\n"
-       "Managed address configuration flag\n")
+       "OSPF information\n"
+       "Neighbor list\n"
+       "Neighbor ID\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_message_digest_key_cmd_vtysh, 
-       "no ospf message-digest-key <1-255>", 
+DEFSH (VTYSH_BGPD, no_match_community_val_cmd_vtysh, 
+       "no match community (<1-99>|<100-199>|WORD)", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n")
+       "Match values from routing table\n"
+       "Match BGP community list\n"
+       "Community-list number (standard)\n"
+       "Community-list number (expanded)\n"
+       "Community-list name\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_le_cmd_vtysh, 
-       "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128>", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_ge_le_cmd_vtysh, 
+       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) A.B.C.D/M ge <0-32> le <0-32>", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
+       "IP information\n"
        "Build a prefix list\n"
        "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n"
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_prefix_first_match_cmd_vtysh, 
-       "show ip prefix-list WORD A.B.C.D/M first-match", 
-       "Show running system information\n"
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "First matched prefix\n")
+DEFSH (VTYSH_OSPFD, no_area_stub_no_summary_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) stub no-summary", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure OSPF area as stub\n"
+       "Do not inject inter-area routes into area\n")
 
-DEFSH (VTYSH_OSPFD, debug_ospf_zebra_cmd_vtysh, 
-       "debug ospf zebra", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Zebra information\n")
+DEFSH (VTYSH_OSPF6D, area_range_cmd_vtysh, 
+       "area A.B.C.D range X:X::X:X/M", 
+       "OSPFv3 area parameters\n"
+       "OSPFv3 area ID in IPv4 address format\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "IPv6 address range\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_type_id_self_cmd_vtysh, 
-       "show ip ospf database (" "asbr-summary|external|network|router|summary" "" "" ") A.B.C.D (self-originate|)", 
-       "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "Database summary\n"
-       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "" "" "" ""
-       "Link State ID (as an IP address)\n"
-       "Self-originated link states\n"
-       "\n")
+DEFSH (VTYSH_BGPD, no_neighbor_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) ", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_flap_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) flap-statistics", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display flap statistics of the routes learned from neighbor\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_external_inter_cmd_vtysh, 
+       "distance ospf external <1-255> inter-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "External routes\n"
+       "Distance for external routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n")
 
-DEFSH (VTYSH_BGPD, no_ip_as_path_all_cmd_vtysh, 
-       "no ip as-path access-list WORD", 
+DEFSH (VTYSH_OSPFD, area_export_list_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) export-list NAME", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Set the filter for networks announced to other areas\n"
+       "Name of the access-list\n")
+
+DEFSH (VTYSH_OSPFD, no_ospf_compatible_rfc1583_cmd_vtysh, 
+       "no compatible rfc1583", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "BGP autonomous system path filter\n"
-       "Specify an access list name\n"
-       "Regular expression access list name\n")
+       "OSPF compatibility list\n"
+       "compatible with RFC 1583\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_in_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) in", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (VTYSH_BGPD, no_match_ecommunity_cmd_vtysh, 
+       "no match extcommunity", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match BGP/VPN extended community list\n")
+
+DEFSH (VTYSH_OSPFD, area_import_list_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) import-list NAME", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Set the filter for networks from other areas announced to the specified one\n"
+       "Name of the access-list\n")
+
+DEFSH (VTYSH_BGPD, debug_bgp_keepalive_cmd_vtysh, 
+       "debug bgp keepalives", 
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n")
+       "BGP keepalives\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D out", 
+DEFSH (VTYSH_BGPD, dump_bgp_routes_cmd_vtysh, 
+       "dump bgp routes-mrt PATH", 
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump whole BGP routing table\n"
+       "Output filename\n")
+
+DEFSH (VTYSH_BGPD, no_match_aspath_val_cmd_vtysh, 
+       "no match as-path WORD", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "Match BGP AS path list\n"
+       "AS path access-list name\n")
+
+DEFSH (VTYSH_BGPD, no_synchronization_cmd_vtysh, 
+       "no synchronization", 
+       "Negate a command or set its defaults\n"
+       "Perform IGP synchronization\n")
+
+DEFSH (VTYSH_BGPD, neighbor_capability_dynamic_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "capability dynamic", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise dynamic capability to this neighbor\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_soft_in_cmd_vtysh, 
+       "clear ip bgp peer-group WORD soft in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_OSPFD, show_ip_ospf_database_cmd_vtysh, 
-       "show ip ospf database", 
-       "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "Database summary\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_interface_ifname_cmd_vtysh, 
-       "show ipv6 ospf6 interface IFNAME", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Interface infomation\n"
-       "Interface name(e.g. ep0)\n"
-       )
+DEFSH (VTYSH_BGPD, no_aggregate_address_mask_summary_as_set_cmd_vtysh, 
+       "no aggregate-address A.B.C.D A.B.C.D summary-only as-set", 
+       "Negate a command or set its defaults\n"
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Filter more specific routes from updates\n"
+       "Generate AS set path information\n")
 
 DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_cmd_vtysh, 
        "clear ip bgp peer-group WORD", 
@@ -11660,199 +8595,351 @@ DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_group_cmd_vtysh,
        "Clear all members of peer-group\n"
        "BGP peer-group name\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_maximum_prefix_val2_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "maximum-prefix <1-4294967295> warning-only", 
+DEFSH (VTYSH_RIPD, no_rip_redistribute_type_routemap_cmd_vtysh, 
+       "no redistribute (kernel|connected|static|ospf|bgp) route-map WORD", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n"
-       "Only give warning message when limit is exceeded\n")
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Open Shortest Path First (OSPF)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_flap_regexp_cmd_vtysh, 
-       "show ip bgp flap-statistics regexp .LINE", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
+DEFSH (VTYSH_BGPD, no_set_originator_id_val_cmd_vtysh, 
+       "no set originator-id A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP originator ID attribute\n"
+       "IP address of originator\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_soft_in_cmd_vtysh, 
-       "clear bgp <1-65535> soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_metric_cmd_vtysh, 
+       "default-information originate always metric <0-16777214>", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "OSPF metric type for default routes\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
+DEFSH (VTYSH_OSPFD, no_area_vlink_param4_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+
+DEFSH (VTYSH_RIPD, no_debug_rip_zebra_cmd_vtysh, 
+       "no debug rip zebra", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP and ZEBRA communication\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, ip_prefix_list_ge_cmd_vtysh, 
+       "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", 
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_cidr_only_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) cidr-only", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n")
+       "Display only routes with non-natural netmasks\n")
 
-DEFSH (VTYSH_RIPD, rip_version_cmd_vtysh, 
-       "version <1-2>", 
-       "Set routing protocol version\n"
-       "version\n")
+DEFSH (VTYSH_BGPD, set_local_pref_cmd_vtysh, 
+       "set local-preference <0-4294967295>", 
+       "Set values in destination routing protocol\n"
+       "BGP local preference path attribute\n"
+       "Preference value\n")
 
-DEFSH (VTYSH_RIPD, ip_rip_send_version_1_cmd_vtysh, 
-       "ip rip send version 1 2", 
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n"
-       "RIP version 1\n"
-       "RIP version 2\n")
+DEFSH (VTYSH_BGPD, bgp_bestpath_med_cmd_vtysh, 
+       "bgp bestpath med (confed|missing-as-worst)", 
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "MED attribute\n"
+       "Compare MED among confederation paths\n"
+       "Treat missing MED as the least preferred one\n")
 
-DEFSH (VTYSH_RIPD, no_debug_rip_zebra_cmd_vtysh, 
-       "no debug rip zebra", 
+DEFSH (VTYSH_OSPFD, ip_ospf_authentication_addr_cmd_vtysh, 
+       "ip ospf authentication A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Address of interface")
+
+DEFSH (VTYSH_BGPD, no_neighbor_local_as_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "local-as", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Specify a local-as number\n")
+
+DEFSH (VTYSH_RIPNGD, no_debug_ripng_packet_direct_cmd_vtysh, 
+       "no debug ripng packet (recv|send)", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng packet\n"
+       "Debug option set for receive packet\n"
+       "Debug option set for send packet\n")
+
+DEFSH (VTYSH_OSPFD, neighbor_priority_cmd_vtysh, 
+       "neighbor A.B.C.D priority <0-255>", 
+       "Specify neighbor router\n"
+       "Neighbor IP address\n"
+       "Neighbor Priority\n"
+       "Seconds\n")
+
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged7_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged next-hop med as-path", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Nexthop attribute\n"
+       "Med attribute\n"
+       "As-path attribute\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_mask_host_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D host A.B.C.D", 
        "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "Source address\n"
+       "Source wildcard bits\n"
+       "A single destination host\n"
+       "Destination address\n")
+
+DEFSH (VTYSH_RIPD, debug_rip_packet_cmd_vtysh, 
+       "debug rip packet", 
        "Debugging functions (see also 'undebug')\n"
        "RIP information\n"
-       "RIP and ZEBRA communication\n")
+       "RIP packet\n")
 
-DEFSH (VTYSH_BGPD, set_aspath_prepend_cmd_vtysh, 
-       "set as-path prepend .<1-65535>", 
-       "Set values in destination routing protocol\n"
-       "Prepend string for a BGP AS-path attribute\n"
-       "Prepend to the as-path\n"
-       "AS number\n")
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_metric_routemap_cmd_vtysh, 
+       "redistribute connected metric <0-16> route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_neighbor_received_routes_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) received-routes", 
-       "Show running system information\n"
+DEFSH (VTYSH_OSPFD, ip_ospf_authentication_args_cmd_vtysh, 
+       "ip ospf authentication (null|message-digest)", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Use null authentication\n"
+       "Use message-digest authentication\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_in_cmd_vtysh, 
+       "clear ip bgp <1-65535> vpnv4 unicast in", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (VTYSH_RIPNGD, debug_ripng_packet_detail_cmd_vtysh, 
-       "debug ripng packet (recv|send) detail", 
+DEFSH (VTYSH_OSPFD, no_area_range_advertise_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M (advertise|not-advertise)", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Advertise this range (default)\n"
+       "DoNotAdvertise this range\n")
+
+DEFSH (VTYSH_RIPNGD, debug_ripng_packet_direct_cmd_vtysh, 
+       "debug ripng packet (recv|send)", 
        "Debugging functions (see also 'undebug')\n"
        "RIPng configuration\n"
        "Debug option set for ripng packet\n"
        "Debug option set for receive packet\n"
-       "Debug option set for send packet\n"
-       "Debug option set detaied information\n")
+       "Debug option set for send packet\n")
 
-DEFSH (VTYSH_ZEBRA, ip_irdp_minadvertinterval_cmd_vtysh, 
-       "ip irdp minadvertinterval <3-1800>", 
-       "IP information\n"
-       "ICMP Router discovery on this interface\n"
-       "Set minimum time between advertisement\n"
-       "Minimum advertisement interval in seconds\n")
+DEFSH (VTYSH_BGPD, neighbor_allowas_in_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "allowas-in", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Accept as-path with my AS present in it\n")
 
-DEFSH (VTYSH_OSPF6D, no_passive_interface_cmd_vtysh, 
-       "no passive-interface IFNAME", 
+DEFSH (VTYSH_BGPD, no_auto_summary_cmd_vtysh, 
+       "no auto-summary", 
        "Negate a command or set its defaults\n"
-       "Suppress routing updates on an interface\n"
-       "Interface name(e.g. ep0)\n")
+       "Enable automatic network number summarization\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD, no_match_interface_val_cmd_vtysh, 
-       "no match interface WORD", 
+DEFSH (VTYSH_BGPD, no_neighbor_capability_dynamic_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "capability dynamic", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match first hop interface of route\n"
-       "Interface name\n")
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise dynamic capability to this neighbor\n")
 
-DEFSH (VTYSH_BGPD, bgp_network_mask_natural_route_map_cmd_vtysh, 
-       "network A.B.C.D route-map WORD", 
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+DEFSH (VTYSH_OSPFD, no_ip_ospf_network_cmd_vtysh, 
+       "no ip ospf network", 
+       "Negate a command or set its defaults\n"
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Network type\n")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged9_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med next-hop as-path", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n")
+DEFSH (VTYSH_BGPD, show_ip_extcommunity_list_arg_cmd_vtysh, 
+       "show ip extcommunity-list (<1-199>|WORD)", 
+       "Show running system information\n"
+       "IP information\n"
+       "List extended-community list\n"
+       "Extcommunity-list number\n"
+       "Extcommunity-list name\n")
 
-DEFSH (VTYSH_BGPD, ip_extcommunity_list_name_standard2_cmd_vtysh, 
-       "ip extcommunity-list standard WORD (deny|permit)", 
+DEFSH (VTYSH_BGPD, bgp_bestpath_aspath_ignore_cmd_vtysh, 
+       "bgp bestpath as-path ignore", 
+       "BGP specific commands\n"
+       "Change the default bestpath selection\n"
+       "AS-path attribute\n"
+       "Ignore as-path length in selecting a route\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh, 
+       "show ip bgp vpnv4 all neighbors A.B.C.D", 
+       "Show running system information\n"
        "IP information\n"
-       "Add a extended community list entry\n"
-       "Specify standard extcommunity-list\n"
-       "Extended Community list name\n"
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n")
+
+DEFSH (VTYSH_BGPD, ip_community_list_name_expanded_cmd_vtysh, 
+       "ip community-list expanded WORD (deny|permit) .LINE", 
+       "IP information\n"
+       "Add a community list entry\n"
+       "Add an expanded community-list entry\n"
+       "Community list name\n"
        "Specify community to reject\n"
-       "Specify community to accept\n")
+       "Specify community to accept\n"
+       "An ordered list as a regular-expression\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_as_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 <1-65535> soft out", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_ospf6_routemap_cmd_vtysh, 
+       "redistribute ospf6 route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "IPv6 Open Shortest Path First (OSPFv3)\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_out_cmd_vtysh, 
+       "clear ip bgp * vpnv4 unicast out", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear all peers\n"
        "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig outbound update\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_out_cmd_vtysh, 
+       "clear ip bgp <1-65535> ipv4 (unicast|multicast) out", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
        "Clear peers with the AS number\n"
-       "Soft reconfig\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, no_ip_community_list_standard_cmd_vtysh, 
-       "no ip community-list <1-99> (deny|permit) .AA:NN", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_RIPD, ip_rip_receive_version_2_cmd_vtysh, 
+       "ip rip receive version 2 1", 
        "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+       "Routing Information Protocol\n"
+       "Advertisement reception\n"
+       "Version control\n"
+       "RIP version 2\n"
+       "RIP version 1\n")
 
-DEFSH (VTYSH_BGPD, debug_bgp_update_direct_cmd_vtysh, 
-       "debug bgp updates (in|out)", 
-       "Debugging functions (see also 'undebug')\n"
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)", 
+       "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "BGP updates\n"
-       "Inbound updates\n"
-       "Outbound updates\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_OSPFD, show_debugging_ospf_cmd_vtysh, 
-       "show debugging ospf", 
-       "Show running system information\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n")
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_remark_arg_cmd_vtysh, 
+       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP extended access list\n"
+       "IP standard access list (expanded range)\n"
+       "IP extended access list (expanded range)\n"
+       "IP zebra access-list\n"
+       "Access list entry comment\n"
+       "Comment up to 100 characters\n")
 
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_cmd_vtysh, 
-       "default-information originate", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n")
+DEFSH (VTYSH_RIPD, no_debug_rip_packet_direct_cmd_vtysh, 
+       "no debug rip packet (recv|send)", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP packet\n"
+       "RIP option set for receive packet\n"
+       "RIP option set for send packet\n")
 
-DEFSH (VTYSH_OSPF6D, ospf6_redistribute_cmd_vtysh, 
-       "redistribute (static|kernel|connected|ripng|bgp)", 
-       "Redistribute\n"
-       "Static route\n"
-       "Kernel route\n"
-       "Connected route\n"
-       "RIPng route\n"
-       "BGP route\n"
-      )
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_le_ge_cmd_vtysh, 
+       "no ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32> ge <0-32>", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_transmit_delay_addr_cmd_vtysh, 
-       "ip ospf transmit-delay <1-65535> A.B.C.D", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n"
-       "Seconds\n"
-       "Address of interface")
+DEFSH (VTYSH_OSPFD, no_ospf_default_metric_cmd_vtysh, 
+       "no default-metric", 
+       "Negate a command or set its defaults\n"
+       "Set metric of redistributed routes\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community2_exact_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_community2_exact_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
+       "IP information\n"
+       "BGP information\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -11864,61 +8951,29 @@ DEFSH (VTYSH_BGPD, show_ipv6_mbgp_community2_exact_cmd_vtysh,
        "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (VTYSH_OSPFD, area_export_list_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) export-list NAME", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Set the filter for networks announced to other areas\n"
-       "Name of the access-list\n")
+DEFSH (VTYSH_BGPD, no_set_community_none_cmd_vtysh, 
+       "no set community none", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP community attribute\n"
+       "No community attribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, show_ip_prefix_list_detail_name_cmd_vtysh, 
-       "show ip prefix-list detail WORD", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_flap_regexp_cmd_vtysh, 
+       "show ip bgp flap-statistics regexp .LINE", 
        "Show running system information\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Detail of prefix lists\n"
-       "Name of a prefix list\n")
-
-DEFSH (VTYSH_BGPD, bgp_damp_set3_cmd_vtysh, 
-       "bgp dampening", 
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n")
-
-DEFSH (VTYSH_OSPFD, debug_ospf_packet_send_recv_detail_cmd_vtysh, 
-       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)", 
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
-
-DEFSH (VTYSH_BGPD, bgp_default_ipv4_unicast_cmd_vtysh, 
-       "bgp default ipv4-unicast", 
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "Activate ipv4-unicast for a peer by default\n")
+       "BGP information\n"
+       "Display flap statistics of routes\n"
+       "Display routes matching the AS path regular expression\n"
+       "A regular-expression to match the BGP AS paths\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_prefix_list_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "prefix-list WORD (in|out)", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Filter updates to/from this neighbor\n"
-       "Name of a prefix list\n"
-       "Filter incoming updates\n"
-       "Filter outgoing updates\n")
+DEFSH (VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPF6D, router_zebra_cmd_vtysh, 
+       "router zebra", 
+       "Enable a routing process\n"
+       "Make connection to zebra daemon\n")
 
-DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_rmap_metric_cmd_vtysh, 
-       "no redistribute (connected|kernel|ospf|rip|static) route-map WORD metric <0-4294967295>", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_rmap_metric_cmd_vtysh, 
+       "redistribute (connected|kernel|ospf|rip|static) route-map WORD metric <0-4294967295>", 
        "Redistribute information from another routing protocol\n"
        "Connected\n"
        "Kernel routes\n"
@@ -11930,28 +8985,83 @@ DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_rmap_metric_cmd_vtysh,
        "Metric for redistributed routes\n"
        "Default metric\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_instance_all_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp view WORD * ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n")
+DEFSH (VTYSH_BGPD, no_set_aggregator_as_val_cmd_vtysh, 
+       "no set aggregator as <1-65535> A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP aggregator attribute\n"
+       "AS number of aggregator\n"
+       "AS number\n"
+       "IP address of aggregator\n")
 
-DEFSH (VTYSH_OSPFD, area_range_cost_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area range for route summarization\n"
-       "area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_external_cmd_vtysh, 
+       "distance ospf inter-area <1-255> external <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n")
+
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_static_metric_routemap_cmd_vtysh, 
+       "no redistribute static metric <0-16> route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Static routes\n"
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_OSPFD, no_debug_ospf_nsm_sub_cmd_vtysh, 
+       "no debug ospf nsm (status|events|timers)", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions\n"
+       "OSPF information\n"
+       "OSPF Interface State Machine\n"
+       "NSM Status Information\n"
+       "NSM Event Information\n"
+       "NSM Timer Information\n")
+
+DEFSH (VTYSH_BGPD, set_origin_cmd_vtysh, 
+       "set origin (egp|igp|incomplete)", 
+       "Set values in destination routing protocol\n"
+       "BGP origin code\n"
+       "remote EGP\n"
+       "local IGP\n"
+       "unknown heritage\n")
+
+DEFSH (VTYSH_OSPFD, no_ospf_priority_cmd_vtysh, 
+       "no ospf priority", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Router priority\n")
+
+DEFSH (VTYSH_RIPD, debug_rip_events_cmd_vtysh, 
+       "debug rip events", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP events\n")
+
+DEFSH (VTYSH_OSPFD, ospf_redistribute_source_cmd_vtysh, 
+       "redistribute (kernel|connected|static|rip|bgp)", 
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Routing Information Protocol (RIP)\n"
+       "Border Gateway Protocol (BGP)\n")
+
+DEFSH (VTYSH_ZEBRA, no_ip_route_mask_cmd_vtysh, 
+       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0)", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n")
 
 DEFSH (VTYSH_BGPD, clear_ip_bgp_all_cmd_vtysh, 
        "clear ip bgp *", 
@@ -11960,304 +9070,252 @@ DEFSH (VTYSH_BGPD, clear_ip_bgp_all_cmd_vtysh,
        "BGP information\n"
        "Clear all peers\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_cmd_vtysh, 
-       "clear ip bgp <1-65535>", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n")
-
-DEFSH (VTYSH_BGPD, no_ip_community_list_expanded_cmd_vtysh, 
-       "no ip community-list <100-199> (deny|permit) .LINE", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (expanded)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
+DEFSH (VTYSH_OSPFD, ip_ospf_priority_addr_cmd_vtysh, 
+       "ip ospf priority <0-255> A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Router priority\n"
+       "Priority\n"
+       "Address of interface")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_tags_cmd_vtysh, 
-       "show ip bgp vpnv4 all tags", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Display BGP tags for prefixes\n")
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_metric_cmd_vtysh, 
+       "default-information originate always metric-type (1|2) metric <0-16777214>", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "Always advertise default route\n"
+       "OSPF metric type for default routes\n"
+       "Set OSPF External Type 1 metrics\n"
+       "Set OSPF External Type 2 metrics\n"
+       "OSPF default metric\n"
+       "OSPF metric\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_attr_unchanged3_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop (as-path|med)", 
-       "Negate a command or set its defaults\n"
+DEFSH (VTYSH_BGPD, neighbor_route_map_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "route-map WORD (in|out)", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n"
-       "Med attribute\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Apply route map to neighbor\n"
+       "Name of route map\n"
+       "Apply map to incoming routes\n"
+       "Apply map to outbound routes\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_prefix_cmd_vtysh, 
-       "show ip bgp vpnv4 all A.B.C.D/M", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+DEFSH (VTYSH_RIPNGD, debug_ripng_events_cmd_vtysh, 
+       "debug ripng events", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng events\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_in_prefix_filter_cmd_vtysh, 
-       "clear bgp <1-65535> in prefix-filter", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, clear_ip_prefix_list_name_cmd_vtysh, 
+       "clear ip prefix-list WORD", 
        "Reset functions\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig inbound update\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-DEFSH (VTYSH_BGPD, match_origin_cmd_vtysh, 
-       "match origin (egp|igp|incomplete)", 
-       "Match values from routing table\n"
-       "BGP origin code\n"
-       "remote EGP\n"
-       "local IGP\n"
-       "unknown heritage\n")
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n")
 
-DEFSH (VTYSH_OSPFD, no_debug_ospf_ism_cmd_vtysh, 
-       "no debug ospf ism", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_zebra_cmd_vtysh, 
+       "no debug ospf zebra", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
        "OSPF information\n"
-       "OSPF Interface State Machine")
+       "OSPF Zebra information\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound update\n")
+DEFSH (VTYSH_OSPFD, ospf_distance_ospf_inter_intra_cmd_vtysh, 
+       "distance ospf inter-area <1-255> intra-area <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) in prefix-filter", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_external_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) in prefix-filter", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
+       "Clear all external peers\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Soft reconfig inbound update\n"
        "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_network_cmd_vtysh, 
-       "no ospf network", 
+DEFSH (VTYSH_OSPF6D, no_passive_interface_cmd_vtysh, 
+       "no passive-interface IFNAME", 
        "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Network type\n")
+       "Suppress routing updates on an interface\n"
+       "Interface name(e.g. ep0)\n")
+
+DEFSH (VTYSH_ZEBRA, ip_address_label_cmd_vtysh, 
+       "ip address A.B.C.D/M label LINE", 
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP address (e.g. 10.0.0.1/8)\n"
+       "Label of this address\n"
+       "Label\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ipv6_prefix_list_le_ge_cmd_vtysh, 
-       "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", 
+DEFSH (VTYSH_BGPD, bgp_damp_unset_cmd_vtysh, 
+       "no bgp dampening", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
+       "BGP Specific commands\n"
+       "Enable route-flap dampening\n")
+
+DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_cmd_vtysh, 
+       "no access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+       "Address to match\n"
+       "Wildcard bits\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_remote_as_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "remote-as <1-65535>", 
+DEFSH (VTYSH_OSPF6D, no_debug_ospf6_all_cmd_vtysh, 
+       "no debug ospf6 all", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Specify a BGP neighbor\n"
-       "AS number\n")
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Turn off ALL OSPFv3 debugging\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_cmd_vtysh, 
-       "show ip ospf neighbor", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
        "Show running system information\n"
        "IP information\n"
-       "OSPF information\n"
-       "Neighbor list\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_soft_in_cmd_vtysh, 
-       "clear ip bgp <1-65535> soft in", 
-       "Reset functions\n"
-       "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-
-DEFSH (VTYSH_BGPD, neighbor_capability_orf_prefix_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "capability orf prefix-list (both|send|receive)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise ORF capability to the peer\n"
-       "Advertise prefixlist ORF capability to this neighbor\n"
-       "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
-       "Capability to RECEIVE the ORF from this neighbor\n"
-       "Capability to SEND the ORF to this neighbor\n")
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display information received from a BGP neighbor\n"
+       "Display the prefixlist filter\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_as_out_cmd_vtysh, 
-       "clear bgp <1-65535> out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig outbound update\n")
+DEFSH (VTYSH_OSPFD, area_default_cost_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) default-cost <0-16777215>", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Set the summary-default cost of a NSSA or stub area\n"
+       "Stub's advertised default summary cost\n")
 
-DEFSH (VTYSH_OSPFD, show_ip_ospf_neighbor_detail_cmd_vtysh, 
-       "show ip ospf neighbor detail", 
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_topology_router_lsid_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D topology (A.B.C.D|<0-4294967295>) (A.B.C.D|<0-4294967295>)", 
        "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "Neighbor list\n"
-       "detail of all neighbors\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Shortest Path First tree information\n"
+       "Displays SPF topology table\n"
+       "Specify Router-ID\n"
+       "Specify Router-ID\n"
+       "Specify Link State ID\n"
+       "Specify Link State ID\n"
+       )
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, match_ip_next_hop_prefix_list_cmd_vtysh, 
-       "match ip next-hop prefix-list WORD", 
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
+DEFSH (VTYSH_BGPD, bgp_damp_set_cmd_vtysh, 
+       "bgp dampening <1-45> <1-20000> <1-20000> <1-255>", 
+       "BGP Specific commands\n"
+       "Enable route-flap dampening\n"
+       "Half-life time for the penalty\n"
+       "Value to start reusing a route\n"
+       "Value to start suppressing a route\n"
+       "Maximum duration to suppress a stable route\n")
 
-DEFSH (VTYSH_OSPFD, no_ospf_distance_cmd_vtysh, 
-       "no distance <1-255>", 
-       "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n")
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_instance_cmd_vtysh, 
+       "ipv6 ospf6 instance-id INSTANCE", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Instance ID\n"
+       "<0-255> Instance ID\n"
+       )
 
-DEFSH (VTYSH_BGPD, no_neighbor_interface_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "interface WORD", 
+DEFSH (VTYSH_RIPNGD, no_ripng_route_cmd_vtysh, 
+       "no route IPV6ADDR", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Interface\n"
-       "Interface name\n")
-
-DEFSH (VTYSH_OSPFD, ospf_default_information_originate_always_type_cmd_vtysh, 
-       "default-information originate always metric-type (1|2)", 
-       "Control distribution of default information\n"
-       "Distribute a default route\n"
-       "Always advertise default route\n"
-       "OSPF metric type for default routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n")
+       "Static route setup\n"
+       "Delete static RIPng route announcement\n")
 
-DEFSH (VTYSH_RIPNGD, no_ripng_default_metric_val_cmd_vtysh, 
-       "no default-metric <1-16>", 
+DEFSH (VTYSH_BGPD, no_dump_bgp_routes_cmd_vtysh, 
+       "no dump bgp routes-mrt [PATH] [INTERVAL]", 
        "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
-
-DEFSH (VTYSH_BGPD, show_ip_bgp_route_map_cmd_vtysh, 
-       "show ip bgp route-map WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
-
-DEFSH (VTYSH_BGPD, set_originator_id_cmd_vtysh, 
-       "set originator-id A.B.C.D", 
-       "Set values in destination routing protocol\n"
-       "BGP originator ID attribute\n"
-       "IP address of originator\n")
-
-DEFSH (VTYSH_RIPD, debug_rip_packet_direct_cmd_vtysh, 
-       "debug rip packet (recv|send)", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n"
-       "RIP receive packet\n"
-       "RIP send packet\n")
+       "Dump packet\n"
+       "BGP packet dump\n"
+       "Dump whole BGP routing table\n")
 
-DEFSH (VTYSH_BGPD, no_aggregate_address_summary_only_cmd_vtysh, 
-       "no aggregate-address A.B.C.D/M summary-only", 
+DEFSH (VTYSH_BGPD, no_aggregate_address_mask_as_set_cmd_vtysh, 
+       "no aggregate-address A.B.C.D A.B.C.D as-set", 
        "Negate a command or set its defaults\n"
        "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Generate AS set path information\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_view_route_cmd_vtysh, 
-       "show ip bgp view WORD A.B.C.D", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community4_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "BGP view name\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (VTYSH_RIPD, no_ip_rip_receive_version_num_cmd_vtysh, 
-       "no ip rip receive version (1|2)", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement reception\n"
-       "Version control\n"
-       "Version 1\n"
-       "Version 2\n")
-
-DEFSH (VTYSH_BGPD, clear_ip_bgp_all_vpnv4_soft_in_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast soft in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
        "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_RIPD, accept_lifetime_duration_day_month_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> duration <1-2147483646>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Duration of the key\n"
-       "Duration seconds\n")
+DEFSH (VTYSH_BGPD, no_bgp_confederation_peers_cmd_vtysh, 
+       "no bgp confederation peers .<1-65535>", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "AS confederation parameters\n"
+       "Peer ASs in BGP confederation\n"
+       "AS number\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_match_ip_address_cmd_vtysh, 
-       "no match ip address", 
+DEFSH (VTYSH_BGPD, no_set_weight_val_cmd_vtysh, 
+       "no set weight <0-4294967295>", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match address of route\n")
+       "Set values in destination routing protocol\n"
+       "BGP weight for routing table\n"
+       "Weight value\n")
 
-DEFSH (VTYSH_ZEBRA, show_ipv6_route_protocol_cmd_vtysh, 
-       "show ipv6 route (bgp|connected|kernel|ospf6|ripng|static)", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community_list_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community-list WORD exact-match", 
        "Show running system information\n"
        "IP information\n"
-       "IP routing table\n"
-       "Border Gateway Protocol (BGP)\n"
-       "Connected\n"
-       "Kernel\n"
-       "Open Shortest Path First (OSPFv3)\n"
-       "Routing Information Protocol (RIPng)\n"
-       "Static routes\n")
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the community-list\n"
+       "community-list name\n"
+       "Exact match of the communities\n")
 
-DEFSH (VTYSH_ZEBRA, ip_address_label_cmd_vtysh, 
-       "ip address A.B.C.D/M label LINE", 
-       "Interface Internet Protocol config commands\n"
-       "Set the IP address of an interface\n"
-       "IP address (e.g. 10.0.0.1/8)\n"
-       "Label of this address\n"
-       "Label\n")
+DEFSH (VTYSH_BGPD, bgp_scan_time_cmd_vtysh, 
+       "bgp scan-time <5-60>", 
+       "BGP specific commands\n"
+       "Configure background scanner interval\n"
+       "Scanner interval (seconds)\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_community4_exact_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community3_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -12271,92 +9329,150 @@ DEFSH (VTYSH_BGPD, show_ip_bgp_community4_exact_cmd_vtysh,
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_priority_addr_cmd_vtysh, 
-       "no ip ospf priority A.B.C.D", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_peer_vpnv4_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast in", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP neighbor address to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig inbound update\n")
+
+DEFSH (VTYSH_OSPFD, no_ip_ospf_authentication_key_addr_cmd_vtysh, 
+       "no ip ospf authentication-key A.B.C.D", 
        "Negate a command or set its defaults\n"
        "IP Information\n"
        "OSPF interface commands\n"
-       "Router priority\n"
+       "Authentication password (key)\n"
        "Address of interface")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_neighbors_peer_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
+DEFSH (VTYSH_RIPD, accept_lifetime_infinite_month_day_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Never expires")
 
-DEFSH (VTYSH_OSPFD, auto_cost_reference_bandwidth_cmd_vtysh, 
-       "auto-cost reference-bandwidth <1-4294967>", 
-       "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n"
-       "The reference bandwidth in terms of Mbits per second\n")
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged5_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged as-path next-hop med", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_ipv6_all_out_cmd_vtysh, 
-       "clear bgp ipv6 * out", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_as_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp <1-65535> ipv4 (unicast|multicast) in prefix-filter", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "Clear all peers\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (VTYSH_BGPD, aggregate_address_cmd_vtysh, 
-       "aggregate-address A.B.C.D/M", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_instance_neighbors_cmd_vtysh, 
+       "show ip bgp view WORD neighbors", 
        "Show running system information\n"
-       "IPv6 information\n"
+       "IP information\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "BGP view\n"
+       "View name\n"
+       "Detailed information on TCP and BGP neighbor connections\n")
+
+DEFSH (VTYSH_OSPF6D, ipv6_ospf6_passive_cmd_vtysh, 
+       "ipv6 ospf6 passive", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "passive interface: No Adjacency will be formed on this I/F\n"
+       )
 
-DEFSH (VTYSH_BGPD, no_set_ipv6_nexthop_local_cmd_vtysh, 
-       "no set ipv6 next-hop local", 
+DEFSH (VTYSH_OSPF6D, no_ipv6_ospf6_passive_cmd_vtysh, 
+       "no ipv6 ospf6 passive", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 local address\n")
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "passive interface: No Adjacency will be formed on this I/F\n"
+       )
+
+DEFSH (VTYSH_OSPFD, no_ip_ospf_authentication_key_cmd_vtysh, 
+       "no ip ospf authentication-key", 
+       "Negate a command or set its defaults\n"
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Authentication password (key)\n")
+
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_metric_cmd_vtysh, 
+       "redistribute connected metric <0-16>", 
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Metric\n"
+       "Metric value\n")
+
+DEFSH (VTYSH_OSPF6D, show_ipv6_ospf6_area_spf_node_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D spf node", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Shortest Path First caculation\n"
+       "vertex infomation\n"
+       )
+
+DEFSH (VTYSH_OSPF6D, ospf6_redistribute_cmd_vtysh, 
+       "redistribute (static|kernel|connected|ripng|bgp)", 
+       "Redistribute\n"
+       "Static route\n"
+       "Kernel route\n"
+       "Connected route\n"
+       "RIPng route\n"
+       "BGP route\n"
+      )
+
+DEFSH (VTYSH_BGPD, bgp_cluster_id_cmd_vtysh, 
+       "bgp cluster-id A.B.C.D", 
+       "BGP information\n"
+       "Configure Route-Reflector Cluster-id\n"
+       "Route-Reflector Cluster-id in IP address format\n")
 
-DEFSH (VTYSH_BGPD, clear_bgp_instance_all_soft_in_cmd_vtysh, 
-       "clear bgp view WORD * soft in", 
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp * ipv4 (unicast|multicast) soft out", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
        "Clear all peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Soft reconfig outbound update\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_prefix_list_cmd_vtysh, 
-       "show ip bgp prefix-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes conforming to the prefix-list\n"
-       "IP prefix-list name\n")
+DEFSH (VTYSH_BGPD, set_ecommunity_soo_cmd_vtysh, 
+       "set extcommunity soo .ASN:nn_or_IP-address:nn", 
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Site-of-Origin extended community\n"
+       "VPN extended community\n")
 
-DEFSH (VTYSH_BGPD, neighbor_set_peer_group_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X) " "peer-group WORD", 
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Member of the peer-group\n"
-       "peer-group name\n")
+DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_metric_cmd_vtysh, 
+       "redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295>", 
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n")
 
 DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_any_cmd_vtysh, 
        "no access-list (<1-99>|<1300-1999>) (deny|permit) any", 
@@ -12368,2343 +9484,2092 @@ DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_any_cmd_vtysh,
        "Specify packets to forward\n"
        "Any source host\n")
 
-DEFSH (VTYSH_BGPD, no_auto_summary_cmd_vtysh, 
-       "no auto-summary", 
+DEFSH (VTYSH_OSPFD, no_ospf_retransmit_interval_cmd_vtysh, 
+       "no ospf retransmit-interval", 
        "Negate a command or set its defaults\n"
-       "Enable automatic network number summarization\n")
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n")
 
-DEFSH (VTYSH_OSPFD, no_ip_ospf_network_cmd_vtysh, 
-       "no ip ospf network", 
+DEFSH (VTYSH_BGPD, bgp_cluster_id32_cmd_vtysh, 
+       "bgp cluster-id <1-4294967295>", 
+       "BGP information\n"
+       "Configure Route-Reflector Cluster-id\n"
+       "Route-Reflector Cluster-id as 32 bit quantity\n")
+
+DEFSH (VTYSH_BGPD, no_neighbor_timers_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "timers", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "BGP per neighbor timers\n")
+
+DEFSH (VTYSH_ZEBRA, ip_address_secondary_cmd_vtysh, 
+       "ip address A.B.C.D/M secondary", 
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP address (e.g. 10.0.0.1/8)\n"
+       "Secondary IP address\n")
+
+DEFSH (VTYSH_OSPFD, no_ip_ospf_message_digest_key_addr_cmd_vtysh, 
+       "no ip ospf message-digest-key <1-255> A.B.C.D", 
        "Negate a command or set its defaults\n"
        "IP Information\n"
        "OSPF interface commands\n"
-       "Network type\n")
+       "Message digest authentication password (key)\n"
+       "Key ID\n"
+       "Address of interface")
 
-DEFSH (VTYSH_BGPD, neighbor_attr_unchanged3_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop (as-path|med)", 
+DEFSH (VTYSH_BGPD, aggregate_address_mask_summary_as_set_cmd_vtysh, 
+       "aggregate-address A.B.C.D A.B.C.D summary-only as-set", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Filter more specific routes from updates\n"
+       "Generate AS set path information\n")
+
+DEFSH (VTYSH_ZEBRA, no_ip_route_cmd_vtysh, 
+       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0)", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n")
+
+DEFSH (VTYSH_BGPD, neighbor_attr_unchanged2_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "attribute-unchanged as-path (next-hop|med)", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "Neighbor address\nNeighbor tag\n"
        "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
        "As-path attribute\n"
+       "Nexthop attribute\n"
        "Med attribute\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_extended_mask_any_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", 
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Source address\n"
-       "Source wildcard bits\n"
-       "Any destination host\n")
-
-DEFSH (VTYSH_BGPD, no_ipv6_aggregate_address_summary_only_cmd_vtysh, 
-       "no aggregate-address X:X::X:X/M summary-only", 
-       "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
-
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_standard_nomask_cmd_vtysh, 
-       "no access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", 
+DEFSH (VTYSH_BGPD, no_bgp_deterministic_med_cmd_vtysh, 
+       "no bgp deterministic-med", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Address to match\n")
+       "BGP specific commands\n"
+       "Pick the best-MED path among paths advertised from the neighboring AS\n")
 
-DEFSH (VTYSH_BGPD, show_bgp_ipv6_community_list_exact_cmd_vtysh, 
-       "show bgp ipv6 community-list WORD exact-match", 
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_prefix_longer_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M longer-prefixes", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Display route and more specific routes\n")
 
-DEFSH (VTYSH_BGPD, clear_ip_bgp_as_vpnv4_in_cmd_vtysh, 
-       "clear ip bgp <1-65535> vpnv4 unicast in", 
-       "Reset functions\n"
+DEFSH (VTYSH_OSPFD, area_vlink_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n")
+
+DEFSH (VTYSH_BGPD, show_ip_bgp_ipv4_community2_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Soft reconfig inbound update\n")
+       "Address Family modifier\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (VTYSH_OSPFD, ip_ospf_retransmit_interval_cmd_vtysh, 
-       "ip ospf retransmit-interval <3-65535>", 
+DEFSH (VTYSH_OSPFD, debug_ospf_packet_send_recv_cmd_vtysh, 
+       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)", 
+       "Debugging functions\n"
+       "OSPF information\n"
+       "OSPF packets\n"
+       "OSPF Hello\n"
+       "OSPF Database Description\n"
+       "OSPF Link State Request\n"
+       "OSPF Link State Update\n"
+       "OSPF Link State Acknowledgment\n"
+       "OSPF all packets\n"
+       "Packet sent\n"
+       "Packet received\n"
+       "Detail information\n")
+
+DEFSH (VTYSH_OSPFD, no_ip_ospf_cost_addr_cmd_vtysh, 
+       "no ip ospf cost A.B.C.D", 
+       "Negate a command or set its defaults\n"
        "IP Information\n"
        "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "Seconds\n")
+       "Interface cost\n"
+       "Address of interface")
 
-DEFSH (VTYSH_ZEBRA, no_ip_route_cmd_vtysh, 
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE)", 
+DEFSH (VTYSH_OSPFD, area_stub_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) stub", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure OSPF area as stub\n")
+
+DEFSH (VTYSH_ZEBRA, show_table_cmd_vtysh, 
+       "show table", 
+       "Show running system information\n"
+       "default routing table to use for all clients\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_redistribute_ipv4_metric_rmap_cmd_vtysh, 
+       "no redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295> route-map WORD", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n")
+       "Redistribute information from another routing protocol\n"
+       "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, show_ip_bgp_vpnv4_all_cmd_vtysh, 
-       "show ip bgp vpnv4 all", 
+DEFSH (VTYSH_RIPNGD, ripng_redistribute_static_routemap_cmd_vtysh, 
+       "redistribute static route-map WORD", 
+       "Redistribute information from another routing protocol\n"
+       "Static routes\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_ZEBRA, show_ip_forwarding_cmd_vtysh, 
+       "show ip forwarding", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n")
+       "IP forwarding status\n")
 
-DEFSH (VTYSH_RIPD, no_key_string_cmd_vtysh, 
-       "no key-string [LINE]", 
+DEFSH (VTYSH_OSPFD, no_debug_ospf_event_cmd_vtysh, 
+       "no debug ospf event", 
        "Negate a command or set its defaults\n"
-       "Unset key string\n"
-       "The key\n")
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF event information\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_soft_reconfiguration_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "soft-reconfiguration inbound", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Per neighbor soft reconfiguration\n"
-       "Allow inbound soft reconfiguration for this neighbor\n")
+DEFSH (VTYSH_ZEBRA, show_ip_route_protocol_cmd_vtysh, 
+       "show ip route (bgp|connected|kernel|ospf|rip|static)", 
+       "Show running system information\n"
+       "IP information\n"
+       "IP routing table\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Connected\n"
+       "Kernel\n"
+       "Open Shortest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n")
 
-DEFSH (VTYSH_BGPD, no_debug_bgp_events_cmd_vtysh, 
-       "no debug bgp events", 
+DEFSH (VTYSH_BGPD, no_bgp_cluster_id_cmd_vtysh, 
+       "no bgp cluster-id", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "BGP events\n")
+       "Configure Route-Reflector Cluster-id\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) ", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n")
+DEFSH (VTYSH_BGPD, ip_extcommunity_list_name_standard_cmd_vtysh, 
+       "ip extcommunity-list standard WORD (deny|permit) .AA:NN", 
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Specify standard extcommunity-list\n"
+       "Extended Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
 
-DEFSH (VTYSH_ZEBRA, ip_irdp_holdtime_cmd_vtysh, 
-       "ip irdp holdtime <0-9000>", 
+DEFSH (VTYSH_RIPNGD, show_debugging_ripng_cmd_vtysh, 
+       "show debugging ripng", 
+       "Show running system information\n"
+       "RIPng configuration\n"
+       "Debugging information\n")
+
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_cmd_vtysh, 
+       "default-information originate metric <0-16777214>", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n")
+
+DEFSH (VTYSH_RIPD, no_ip_rip_authentication_mode_type_cmd_vtysh, 
+       "no ip rip authentication mode (md5|text)", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "ICMP Router discovery on this interface\n"
-       "Set holdtime value\n"
-       "Holdtime value in seconds. Default is 1800 seconds\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication mode\n"
+       "Keyed message digest\n"
+       "Clear text authentication\n")
 
-DEFSH (VTYSH_BGPD, match_community_cmd_vtysh, 
-       "match community (<1-99>|<100-199>|WORD)", 
+DEFSH (VTYSH_OSPFD, ospf_default_information_originate_metric_routemap_cmd_vtysh, 
+       "default-information originate metric <0-16777214> route-map WORD", 
+       "Control distribution of default information\n"
+       "Distribute a default route\n"
+       "OSPF default metric\n"
+       "OSPF metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (VTYSH_BGPD, match_aspath_cmd_vtysh, 
+       "match as-path WORD", 
        "Match values from routing table\n"
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n")
+       "Match BGP AS path list\n"
+       "AS path access-list name\n")
 
-DEFSH (VTYSH_BGPD, show_ip_extcommunity_list_cmd_vtysh, 
-       "show ip extcommunity-list", 
+DEFSH (VTYSH_BGPD, neighbor_ebgp_multihop_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "ebgp-multihop", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Allow EBGP neighbors not on directly connected networks\n")
+
+DEFSH (VTYSH_BGPD, clear_ip_bgp_all_soft_in_cmd_vtysh, 
+       "clear ip bgp * soft in", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all peers\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
+
+DEFSH (VTYSH_ZEBRA, show_ip_route_addr_cmd_vtysh, 
+       "show ip route A.B.C.D", 
        "Show running system information\n"
        "IP information\n"
-       "List extended-community list\n")
+       "IP routing table\n"
+       "Network in the IP routing table to display\n")
 
-DEFSH (VTYSH_OSPF6D, no_interface_area_cmd_vtysh, 
-       "no interface IFNAME area A.B.C.D", 
+DEFSH (VTYSH_RIPNGD, no_ripng_redistribute_bgp_metric_val_cmd_vtysh, 
+       "no redistribute bgp metric <0-16>", 
        "Negate a command or set its defaults\n"
-       "Disable routing on an IPv6 interface\n"
-       "Interface name(e.g. ep0)\n")
+       "Redistribute information from another routing protocol\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, no_access_list_extended_host_mask_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D A.B.C.D A.B.C.D", 
+DEFSH (VTYSH_RIPD|VTYSH_BGPD, no_ip_prefix_list_seq_cmd_vtysh, 
+       "no ip prefix-list WORD seq <1-4294967295> (deny|permit) (A.B.C.D/M|any)", 
        "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
+       "IP information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "Destination address\n"
-       "Destination Wildcard bits\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Any prefix match.  Same as \"0.0.0.0/0 le 32\"\n")
 
-DEFSH (VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD, access_list_cmd_vtysh, 
-       "access-list WORD (deny|permit) A.B.C.D/M", 
-       "Add an access list entry\n"
-       "IP zebra access-list name\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n")
+DEFSH (VTYSH_BGPD, neighbor_weight_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "weight <0-65535>", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Set default weight for routes from this neighbor\n"
+       "default weight\n")
 
-DEFSH (VTYSH_OSPFD, no_area_range_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", 
+DEFSH (VTYSH_RIPD, no_rip_redistribute_type_metric_cmd_vtysh, 
+       "no redistribute (kernel|connected|static|ospf|bgp) metric <0-16>", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Deconfigure OSPF area range for route summarization\n"
-       "area range prefix\n")
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes\n"
+       "Connected\n"
+       "Static routes\n"
+       "Open Shortest Path First (OSPF)\n"
+       "Border Gateway Protocol (BGP)\n"
+       "Metric\n"
+       "Metric value\n")
 
-DEFSH (VTYSH_BGPD, old_ipv6_bgp_network_cmd_vtysh, 
-       "ipv6 bgp network X:X::X:X/M", 
-       "IPv6 information\n"
-       "BGP information\n"
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+DEFSH (VTYSH_BGPD, bgp_distance_source_cmd_vtysh, 
+       "distance <1-255> A.B.C.D/M", 
+       "Define an administrative distance\n"
+       "Administrative distance\n"
+       "IP source prefix\n")
 
-DEFSH (VTYSH_BGPD, no_neighbor_filter_list_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "filter-list WORD (in|out)", 
+DEFSH (VTYSH_BGPD, no_neighbor_local_as_val_cmd_vtysh, 
+       "no neighbor (A.B.C.D|WORD) " "local-as <1-65535>", 
        "Negate a command or set its defaults\n"
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Establish BGP filters\n"
-       "AS path access-list name\n"
-       "Filter incoming routes\n"
-       "Filter outgoing routes\n")
+       "Neighbor address\nNeighbor tag\n"
+       "Specify a local-as number\n"
+       "AS number used as local AS\n")
 
-DEFSH (VTYSH_BGPD, show_ipv6_bgp_community_list_exact_cmd_vtysh, 
-       "show ipv6 bgp community-list WORD exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
+DEFSH (VTYSH_BGPD, no_ip_extcommunity_list_name_standard_cmd_vtysh, 
+       "no ip extcommunity-list standard WORD (deny|permit) .AA:NN", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Specify standard extcommunity-list\n"
+       "Extended Community list name\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n")
 
-DEFSH (VTYSH_RIPNGD, ripng_redistribute_connected_routemap_cmd_vtysh, 
-       "redistribute connected route-map WORD", 
+DEFSH (VTYSH_OSPFD, timers_spf_cmd_vtysh, 
+       "timers spf <0-4294967295> <0-4294967295>", 
+       "Adjust routing timers\n"
+       "OSPF SPF timers\n"
+       "Delay between receiving a change to SPF calculation\n"
+       "Hold time between consecutive SPF calculations\n")
+
+DEFSH (VTYSH_OSPFD, ip_ospf_message_digest_key_addr_cmd_vtysh, 
+       "ip ospf message-digest-key <1-255> md5 KEY A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Message digest authentication password (key)\n"
+       "Key ID\n"
+       "Use MD5 algorithm\n"
+       "The OSPF password (key)"
+       "Address of interface")
+
+DEFSH (VTYSH_RIPNGD, no_ripng_passive_interface_cmd_vtysh, 
+       "no passive-interface IFNAME", 
+       "Negate a command or set its defaults\n"
+       "Suppress routing updates on an interface\n"
+       "Interface name\n")
+
+DEFSH (VTYSH_BGPD, no_bgp_timers_cmd_vtysh, 
+       "no timers bgp", 
+       "Negate a command or set its defaults\n"
+       "Adjust routing timers\n"
+       "BGP timers\n")
+
+DEFSH (VTYSH_BGPD, bgp_redistribute_ipv4_metric_rmap_cmd_vtysh, 
+       "redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295> route-map WORD", 
        "Redistribute information from another routing protocol\n"
        "Connected\n"
+       "Kernel routes\n"
+       "Open Shurtest Path First (OSPF)\n"
+       "Routing Information Protocol (RIP)\n"
+       "Static routes\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (VTYSH_BGPD, undebug_bgp_events_cmd_vtysh, 
-       "undebug bgp events", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP events\n")
+DEFSH (VTYSH_BGPD, neighbor_nexthop_self_cmd_vtysh, 
+       "neighbor (A.B.C.D|WORD) " "next-hop-self", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor tag\n"
+       "Disable the next hop calculation for this neighbor\n")
 
 void
 vtysh_init_cmd ()
 {
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_tags_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_detail_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbors_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_extcommunity_list_name_all_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_instance_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_nsm_sub_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_message_digest_key_addr_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_static_metric_routemap_cmd_vtysh);
-  install_element (OSPF_NODE, &no_network_area_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_version_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_name_seq_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_route_server_client_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_name_all_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_routemap_cmd_vtysh);
-  install_element (OSPF6_NODE, &interface_area_passive_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_packet_all_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_route_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_external_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_ism_sub_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_standard_nomask_cmd_vtysh);
-  install_element (RMAP_NODE, &match_aspath_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_nsm_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_default_originate_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_metric_type_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_connected_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_ipv6_bgp_network_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_lsa_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_activate_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_route_server_client_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_any_host_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_soft_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_prefix_list_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ospf_network_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_le_ge_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ecommunity_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community3_exact_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_fast_external_failover_cmd_vtysh);
   install_element (INTERFACE_NODE, &no_ip_rip_authentication_string_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_seq_ge_le_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_neighbor_int_detail_cmd_vtysh);
-  install_element (RMAP_NODE, &set_vpnv4_nexthop_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_ipv6_aggregate_address_summary_only_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_prefix_longer_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ecommunity_rt_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_soft_in_cmd_vtysh);
-  install_element (VIEW_NODE, &ipv6_mbgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_timers_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_neighborlist_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_cmd_vtysh);
-  install_element (CONFIG_NODE, &dump_bgp_routes_interval_cmd_vtysh);
-  install_element (OSPF6_NODE, &interface_area_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_metric_type_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_prefix_longer_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_zebra_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_regexp_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_detail_all_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_origin_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_soft_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ip_address_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_paths_cmd_vtysh);
-  install_element (ZEBRA_NODE, &no_redistribute_ospf6_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_timers_connect_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_aspath_prepend_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_longer_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_as_set_summary_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_static_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_send_version_cmd_vtysh);
-  install_element (RIPNG_NODE, &default_information_originate_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_filter_list_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_metric_cmd_vtysh);
-  install_element (RMAP_NODE, &set_ipv6_nexthop_local_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_self_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_as_path_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_normal_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_unsuppress_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_name_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_id_adv_router_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_cidr_only_cmd_vtysh);
-  install_element (RMAP_NODE, &match_metric_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_prefix_list_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_allowas_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_addr_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community3_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_attr_info_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_in_cmd_vtysh);
-  install_element (KEYCHAIN_NODE, &no_key_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_view_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_host_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ripng_zebra_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_access_list_name_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_extcommunity_list_standard2_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_damp_unset2_cmd_vtysh);
   install_element (ENABLE_NODE, &show_ip_bgp_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_name_seq_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_topology_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_in_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_cost_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_prefix_longer_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_atomic_aggregate_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community_list_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_out_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_mask_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &router_zebra_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ipv6_next_hop_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_router_zebra_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_summary_cmd_vtysh);
-  install_element (OSPF_NODE, &neighbor_pollinterval_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_route_pref_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_packet_send_recv_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_in_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community4_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_zebra_packet_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_local_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_detail_name_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_instance_all_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_send_community_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_vpnv4_nexthop_val_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_damp_set3_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &ipv6_aggregate_address_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community_all_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_id_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ospf_retransmit_interval_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_default_ipv4_unicast_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ripng_packet_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_longer_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_always_compare_med_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_filter_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community3_exact_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_bgp_multiple_instance_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_advertisement_no_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_out_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community2_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_route_server_client_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_soft_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_events_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_type_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_all_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_distance_ospf_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_network_mask_cmd_vtysh);
-  install_element (RMAP_NODE, &match_community_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_metric_routemap_cmd_vtysh);
-  install_element (CONFIG_NODE, &bgp_config_type_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_in_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_extcommunity_list_all_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_damp_unset_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_neighbor_detail_all_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_sequence_number_cmd_vtysh);
   install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_keepalive_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_extcommunity_list_standard_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
   install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_summary_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_remark_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_cidr_only_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_confederation_peers_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_distribute_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_cidr_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_summary_name_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_seq_ge_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_inter_external_intra_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community2_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_advertised_route_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_in_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_bestpath_med3_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_local_val_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_as_set_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_in_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (OSPF_NODE, &area_authentication_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_type_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_timers_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_address_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_event_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_zebra_packet_detail_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ip_address_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community2_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_soft_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_standard_nomask_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community_list_exact_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_route_map_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_compatible_rfc1583_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_first_match_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_longer_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_out_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_send_community_type_cmd_vtysh);
+  install_element (OSPF6_NODE, &flap_damping_route_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_metric_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_route_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_ecommunity_rt_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_route_cmd_vtysh);
+  install_element (RMAP_NODE, &ospf6_routemap_no_set_metric_type_cmd_vtysh);
   install_element (RMAP_NODE, &no_match_community_val_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_topology_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_tree_cmd_vtysh);
-  install_element (OSPF6_NODE, &interface_area_plist_passive_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community3_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_as_set_summary_cmd_vtysh);
-  install_element (OSPF_NODE, &neighbor_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_distance_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_dampened_paths_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_route_ifname_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_network_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_bgp_fsm_cmd_vtysh);
-  install_element (OSPF_NODE, &no_passive_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_lsa_sub_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_maxadvertinterval_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_receive_version_num_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_all_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_route_ifname_cmd_vtysh);
-  install_element (KEYCHAIN_NODE, &no_key_chain_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_filter_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_detail_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_view_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community4_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community_all_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_client_to_client_reflection_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_ra_lifetime_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_topology_router_lsid_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_type_routemap_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_address_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_allowas_in_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_seq_ge_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_retransmitinterval_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_extcommunity_list_arg_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_filter_list_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_cluster_id_cmd_vtysh);
-  install_element (OSPF_NODE, &no_neighbor_priority_pollinterval_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_bgp_normal_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_routes_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_name_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbors_peer_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_out_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_confederation_peers_cmd_vtysh);
-  install_element (RMAP_NODE, &set_local_pref_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_peer_group_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_addr_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_update_direct_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_neighbor_detail_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_fsm_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_neighbors_peer_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_any_host_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authkey_cmd_vtysh);
+  install_element (ZEBRA_NODE, &ripng_redistribute_ripng_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_metric_rmap_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_summary_as_set_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community_list_exact_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_route_mask_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_description_val_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_md5_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_rip_packet_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_connected_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_sequence_number_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &bgp_network_mask_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_damp_set2_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_view_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ripng_events_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_route_map_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_kernel_metric_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_out_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_remove_private_as_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_route_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_as_set_cmd_vtysh);
+  install_element (OSPF_NODE, &no_refresh_timer_val_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_route_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_default_metric_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_paths_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_local_as_no_prepend_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_tree_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_connected_metric_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (OSPF_NODE, &area_range_substitute_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_id_adv_router_cmd_vtysh);
   install_element (OSPF_NODE, &no_area_import_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_soft_out_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_ebgp_multihop_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_mask_cmd_vtysh);
-  install_element (BGP_NODE, &old_no_ipv6_aggregate_address_summary_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_forwarding_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_cmd_vtysh);
-  install_element (RMAP_NODE, &no_rmap_onmatch_next_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_local_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_detail_name_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_metric_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_inter_intra_cmd_vtysh);
-  install_element (RMAP_NODE, &set_community_none_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_cluster_id32_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_intra_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_kernel_metric_routemap_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_distance_source_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_network_mask_natural_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_out_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_view_route_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_local_as_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_update_cmd_vtysh);
+  install_element (VIEW_NODE, &show_table_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ripng_packet_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_shutdown_if_cmd_vtysh);
+  install_element (OSPF_NODE, &area_shortcut_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_priority_addr_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_fsm_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_any_mask_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_normal_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_prefix_longer_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_in_cmd_vtysh);
   install_element (ENABLE_NODE, &no_debug_bgp_update_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_route_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_database_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_in_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_default_local_preference_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_zebra_packet_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_transparent_nexthop_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_reachable_time_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_out_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_dead_interval_addr_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_distribute_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_neighbor_detail_all_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_nexthop_self_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_passive_interface_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_any_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_in_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_name_expanded_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_seq_le_ge_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_topology_router_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_in_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_infinite_day_month_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_summary_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ripng_zebra_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_bgp_events_cmd_vtysh);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ripng_packet_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_in_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_distribute_list_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_param4_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_nexthop_self_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_string2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_bgp_keepalive_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_soft_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_network_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_route_pref_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_damp_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_route_mask_pref_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_summary_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_advertised_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_soft_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_prefix_longer_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_events_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
-  install_element (RMAP_NODE, &set_origin_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_debug_ospf6_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_out_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community2_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_ge_le_cmd_vtysh);
-  install_element (RMAP_NODE, &set_community_delete_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_in_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_capability_dynamic_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_send_version_num_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_rip_zebra_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_fast_external_failover_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &no_key_chain_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_default_metric_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_router_id_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_metric_routemap_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_any_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_origin_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_filter_list_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_aggregate_address_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_route_map_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_cluster_id_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_default_local_preference_cmd_vtysh);
+  install_element (RMAP_NODE, &set_atomic_aggregate_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &no_key_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_distance_source_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_override_capability_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_camp_config_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_abr_type_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_import_check_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_topology_router_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_as_set_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_origin_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_forwarding_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_in_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_community_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_mask_natural_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_cmd_vtysh);
   install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_adv_router_dump_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_filter_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_routes_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_mask_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_description_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_route_pref_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_other_config_flag_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_weight_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_type_metric_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_statistics_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_statistics_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_routemap_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd_vtysh);
   install_element (INTERFACE_NODE, &no_ip_address_label_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community2_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_soft_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_ospf6_external_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_authentication_key_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_cmd_vtysh);
-  install_element (INTERFACE_NODE, &interface_ip_ospf_authentication_cmd_vtysh);
-  install_element (ZEBRA_NODE, &no_ripng_redistribute_ripng_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_exact_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_neighbor_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_rip_packet_direct_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_priority_addr_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_update_source_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_transparent_nexthop_cmd_vtysh);
+  install_element (BGP_NODE, &no_synchronization_cmd_vtysh);
+  install_element (OSPF_NODE, &neighbor_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community2_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_name_standard_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_out_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_cmd_vtysh);
+  install_element (OSPF_NODE, &area_filter_list_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_mask_as_set_summary_cmd_vtysh);
   install_element (BGP_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_zebra_packet_direct_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_confederation_identifier_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_protocol_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_route_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_view_route_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_host_any_cmd_vtysh);
-  install_element (RIP_NODE, &rip_default_information_originate_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_distance_source_access_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community_list_exact_cmd_vtysh);
-  install_element (OSPF6_NODE, &ospf6_redistribute_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ipv6_address_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community_list_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_holdtime_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community3_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_neighbor_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_route_map_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_route_ifname_pref_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_debugging_bgp_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ipv6_next_hop_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_nsm_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_first_match_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_standard_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community2_exact_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_send_community_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_mask_natural_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_in_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community_list_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_as_set_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_zebra_sub_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &bgp_network_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_soft_in_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ip_nexthop_cmd_vtysh);
-  install_element (OSPF_NODE, &network_area_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_version_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_regexp_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_send_ra_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_damp_set2_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_node_cmd_vtysh);
-  install_element (VIEW_NODE, &ipv6_bgp_neighbor_received_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_route_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_prefix_first_match_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_mask_as_set_summary_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_summary_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_le_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_param3_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_rip_zebra_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_enforce_first_as_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_export_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_router_id_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_routes_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_bgp_filter_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_route_mask_pref_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_update_direct_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_distance_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_debugging_rip_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_out_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_authtype_authkey_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_out_cmd_vtysh);
   install_element (VIEW_NODE, &show_ip_route_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (RMAP_NODE, &ospf6_routemap_set_metric_type_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_update_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_summary_only_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ripng_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_capability_route_refresh_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_route_reflector_client_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_route_addr_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_import_check_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_infinite_month_day_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ipv6_prefix_list_name_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_nexthop_self_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community_all_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_type_metric_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_ebgp_multihop_ttl_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_routemap_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_le_cmd_vtysh);
-  install_element (RIP_NODE, &rip_network_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_metric_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community2_exact_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_metric_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_router_id_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_default_metric_val_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_route_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &bgp_network_mask_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_topology_router_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_distance_source_access_list_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_metric_type_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community2_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_as_set_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
-  install_element (OSPF6_NODE, &interface_area_plist_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_damp_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_community_list_arg_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ipv6_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_out_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_filter_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_default_originate_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_hello_interval_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_in_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_prefix_cmd_vtysh);
-  install_element (RIP_NODE, &rip_timers_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_dump_bgp_routes_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_intra_external_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_update_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_out_cmd_vtysh);
-  install_element (OSPF6_NODE, &no_ospf6_redistribute_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_extcommunity_list_name_expanded_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_adv_router_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community3_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_name_seq_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_activate_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_standard_host_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_flap_cmd_vtysh);
   install_element (INTERFACE_NODE, &ipv6_ospf6_advertise_force_prefix_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_cost_addr_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community3_exact_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (INTERFACE_NODE, &multicast_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_prefix_longer_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_debug_ospf6_damp_cmd_vtysh);
+  install_element (OSPF6_NODE, &interface_area_passive_cmd_vtysh);
+  install_element (OSPF_NODE, &area_range_not_advertise_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (CONFIG_NODE, &dump_bgp_routes_interval_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_rip_zebra_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_fsm_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_cmd_vtysh);
+  install_element (OSPF_NODE, &no_router_id_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_always_compare_med_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_all_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community4_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_view_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_as_set_summary_cmd_vtysh);
+  install_element (VIEW_NODE, &show_debug_ospf6_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
+  install_element (CONFIG_NODE, &dump_bgp_all_interval_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_metric_type_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_host_mask_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_zebra_packet_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ospf_dead_interval_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_type_routemap_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_ge_le_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_host_any_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_mask_as_set_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_authentication_key_addr_cmd_vtysh);
   install_element (BGP_NODE, &bgp_deterministic_med_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_all_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_metric_rmap_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_message_digest_key_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_type_metric_routemap_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_cmd_vtysh);
-  install_element (RMAP_NODE, &set_community_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_nsm_sub_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community4_exact_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_default_local_preference_val_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &bgp_network_mask_natural_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_prefix_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_ebgp_multihop_cmd_vtysh);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_activate_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ospf_priority_cmd_vtysh);
-  install_element (CONFIG_NODE, &dump_bgp_routes_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community3_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_metric_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distribute_list_out_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_cluster_id_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_packet_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_summary_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_ism_sub_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_bgp_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_rip_packet_direct_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (OSPF_NODE, &no_auto_cost_reference_bandwidth_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_timers_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbors_peer_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_int_detail_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_keepalive_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_ra_interval_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community4_cmd_vtysh);
-  install_element (RIP_NODE, &rip_offset_list_ifname_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_bgp_metric_routemap_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (RMAP_NODE, &rmap_onmatch_next_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_in_prefix_filter_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_metric_routemap_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_access_list_name_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_filter_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_in_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_addr_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_distance_source_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_rmap_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_any_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_zebra_kernel_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_neighbor_received_routes_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_extcommunity_list_standard_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community_exact_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_as_set_cmd_vtysh);
+  install_element (RMAP_NODE, &no_rmap_onmatch_goto_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_timers_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_param4_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbor_routes_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_authentication_key_chain2_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_extcommunity_list_name_standard_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_zebra_events_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_aspath_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_expanded_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_debugging_ripng_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_topology_router_lsid_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_nsm_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_passive_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_cmd_vtysh);
+  install_element (RIP_NODE, &rip_redistribute_type_metric_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (ENABLE_NODE, &reload_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_route_protocol_cmd_vtysh);
+  install_element (CONFIG_NODE, &dump_bgp_updates_cmd_vtysh);
+  install_element (RMAP_NODE, &match_interface_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_description_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_hello_interval_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_hello_interval_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_rip_packet_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
   install_element (VIEW_NODE, &show_ip_bgp_regexp_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_zebra_interface_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_mask_summary_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_self_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_in_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_send_community_type_cmd_vtysh);
-  install_element (VIEW_NODE, &ipv6_mbgp_neighbor_routes_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_authtype_md5_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_filter_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_protocol_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_origin_val_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_send_version_2_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_standard_cmd_vtysh);
   install_element (VIEW_NODE, &show_ip_ospf_database_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_managed_config_flag_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_local_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_unsuppress_map_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_month_day_day_month_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_exact_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_ecommunity_soo_val_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_confederation_identifier_arg_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_all_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_area_topology_router_lsid_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_activate_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_mask_backdoor_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_multicast_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_zebra_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_any_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_out_cmd_vtysh);
+  install_element (OSPF6_NODE, &no_interface_area_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_rip_events_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_out_cmd_vtysh);
   install_element (CONFIG_NODE, &no_debug_ospf_event_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_static_metric_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_soft_out_cmd_vtysh);
-  install_element (INTERFACE_NODE, &bandwidth_if_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_intra_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community2_exact_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authtype_authkey_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_metric_val_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_priority_addr_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_instance_summary_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_out_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_send_community_type_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_static_metric_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_dump_bgp_all_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_authtype_md5_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_lsa_sub_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_damp_unset2_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_hellointerval_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_route_server_client_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_default_originate_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_area_topology_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_version_ospf6_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_topology_router_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ecommunity_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_send_version_num_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_send_community_type_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_metric_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_priority_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_redistribute_type_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_prefix_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_rip_packet_direct_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_prefix_first_match_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_out_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_local_as_cmd_vtysh);
+  install_element (OSPF_NODE, &neighbor_priority_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &key_string_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_static_routemap_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_atomic_aggregate_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_authkey_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_ism_sub_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_topology_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (RMAP_NODE, &no_rmap_onmatch_next_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_version_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_summary_as_set_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_route_reflector_client_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_summary_as_set_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_prefix_list_cmd_vtysh);
+  install_element (RMAP_NODE, &ospf6_routemap_match_address_prefixlist_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_routes_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_passive_interface_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_allowas_in_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_ism_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community2_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_instance_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_standard_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_duration_day_month_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_bgp_normal_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_metric_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_name_all_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community4_cmd_vtysh);
+  install_element (RMAP_NODE, &set_metric_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_route_map_cmd_vtysh);
   install_element (OSPF_NODE, &area_range_advertise_cost_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_ebgp_multihop_ttl_cmd_vtysh);
+  install_element (OSPF_NODE, &no_timers_spf_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_val_cmd_vtysh);
+  install_element (RMAP_NODE, &set_community_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_cmd_vtysh);
+  install_element (OSPF_NODE, &refresh_timer_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_keepalive_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_retransmitinterval_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_intra_inter_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_rip_packet_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_le_ge_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_distance2_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_route_server_client_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_description_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_bgp_cmd_vtysh);
+  install_element (OSPF_NODE, &no_network_area_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_range_advertise_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_extcommunity_list_arg_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_send_community_type_cmd_vtysh);
+  install_element (CONFIG_NODE, &dump_bgp_all_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_confederation_peers_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_aggregate_address_summary_as_set_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_local_as_val_cmd_vtysh);
   install_element (OSPF_NODE, &no_neighbor_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_rip_packet_detail_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_aspath_prepend_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbor_routes_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_ge_le_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_summary_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_summary_name_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd_vtysh);
-  install_element (OSPF_NODE, &area_stub_cmd_vtysh);
-  install_element (OSPF_NODE, &area_authentication_message_digest_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_detail_name_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_cost_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_filter_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_ism_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_passive_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_network_mask_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (CONFIG_NODE, &router_zebra_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_detail_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_summary_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_ge_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_routerid_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_distribute_list_out_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_route_server_client_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_export_list_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_cost_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_route_distance_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_extcommunity_list_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_interface_val_cmd_vtysh);
+  install_element (OSPF_NODE, &area_import_list_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_stub_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_stub_no_summary_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_tags_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd_vtysh);
+  install_element (RMAP_NODE, &match_aspath_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_bgp_update_cmd_vtysh);
+  install_element (OSPF6_NODE, &interface_area_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_exact_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_summary_as_set_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_prefix_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_view_prefix_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_routerid_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_debugging_zebra_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_lsa_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_prefix_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_weight_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_in_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_route_map_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_database_type_cmd_vtysh);
+  install_element (RIP_NODE, &rip_version_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_fast_external_failover_cmd_vtysh);
   install_element (INTERFACE_NODE, &ospf_cost_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_day_month_month_day_cmd_vtysh);
-  install_element (RMAP_NODE, &set_ip_nexthop_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_event_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_activate_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_rmap_metric_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_fsm_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_override_capability_cmd_vtysh);
-  install_element (VIEW_NODE, &show_table_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_enforce_first_as_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_send_community_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_in_prefix_filter_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_send_version_1_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ripng_events_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_route_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbors_peer_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_summary_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbor_routes_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_transmit_delay_addr_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_capability_dynamic_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ip_address_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_community_val_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_metric_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_zebra_sub_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_allowas_in_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_mask_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_community_exact_cmd_vtysh);
+  install_element (RMAP_NODE, &set_community_delete_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_default_cost_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_receive_version_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ripng_packet_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_param2_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_infinite_day_month_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_exact_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_weight_val_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_timers_connect_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_zebra_packet_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_weight_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_address_secondary_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_mask_summary_as_set_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_route_mask_distance_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_port_cmd_vtysh);
   install_element (BGP_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_cost_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_soft_out_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_damp_set_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_metric_val_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community2_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community3_exact_cmd_vtysh);
-  install_element (CONFIG_NODE, &dump_bgp_all_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ripng_packet_detail_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_zebra_kernel_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_route_protocol_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_message_digest_key_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_timers_arg_cmd_vtysh);
   install_element (INTERFACE_NODE, &ospf_transmit_delay_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_as_set_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_distance2_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_param2_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_filter_list_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_in_cmd_vtysh);
-  install_element (OSPF_NODE, &auto_cost_reference_bandwidth_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_route_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_priority_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_description_arg_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_address_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_routes_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_filter_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_le_ge_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_debugging_ripng_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community4_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community_list_exact_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_filter_list_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_message_digest_key_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_sequence_number_cmd_vtysh);
-  install_element (VIEW_NODE, &ipv6_mbgp_neighbor_received_routes_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_prefix_first_match_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_scan_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_cmd_vtysh);
-  install_element (OSPF_NODE, &no_refresh_timer_val_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_transmit_delay_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_instance_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_local_pref_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_distance_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_any_host_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_prefix_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_month_day_month_day_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_weight_val_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_type_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_debugging_zebra_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbor_advertised_route_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_ip_nexthop_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_out_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_distribute_list_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_prefix_list_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (OSPF6_NODE, &ospf6_redistribute_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_cost_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_nsm_sub_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_confederation_identifier_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_metric_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_distribute_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_in_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_update_source_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_deadinterval_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_out_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_kernel_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_zebra_events_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_default_originate_cmd_vtysh);
+  install_element (RIP_NODE, &rip_redistribute_type_routemap_cmd_vtysh);
   install_element (BGP_NODE, &bgp_network_backdoor_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_month_day_day_month_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_distribute_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_instance_all_soft_out_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_redistribute_source_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_route_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_ism_sub_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_packet_send_recv_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_vpnv4_network_cmd_vtysh);
+  install_element (ZEBRA_NODE, &no_rip_redistribute_rip_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_aspath_prepend_cmd_vtysh);
+  install_element (CONFIG_NODE, &config_table_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_dont_capability_negotiate_cmd_vtysh);
   install_element (OSPF_NODE, &area_range_cost_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_routerid_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community4_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_remove_private_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_zebra_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_ism_cmd_vtysh);
-  install_element (RMAP_NODE, &ospf6_routemap_no_set_metric_type_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_bgp_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_route_server_client_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_priority_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_lsa_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_rip_packet_direct_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_rip_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_regexp_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_summary_only_cmd_vtysh);
+  install_element (OSPF_NODE, &auto_cost_reference_bandwidth_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cidr_only_cmd_vtysh);
+  install_element (RIP_NODE, &rip_distance_source_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_out_cmd_vtysh);
+  install_element (VIEW_NODE, &show_interface_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_extcommunity_list_name_standard2_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_route_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_mask_host_cmd_vtysh);
+  install_element (KEYCHAIN_NODE, &no_key_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_always_compare_med_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_regexp_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_node_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_network_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_interface_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_dont_capability_negotiate_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_passive_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_name_seq_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community3_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_default_metric_cmd_vtysh);
+  install_element (OSPF_NODE, &area_stub_no_summary_cmd_vtysh);
+  install_element (RMAP_NODE, &rmap_onmatch_next_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_topology_router_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_host_host_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_filter_list_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_aggregator_as_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community3_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_adv_router_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_interface_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_intra_inter_external_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_mask_as_set_summary_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_address_label_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ripng_events_cmd_vtysh);
   install_element (BGP_NODE, &neighbor_remove_private_as_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_standard_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_static_metric_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_list_exact_cmd_vtysh);
-  install_element (ZEBRA_NODE, &rip_redistribute_rip_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_key_chain_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_send_community_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_router_ospf_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_regexp_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_passive_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_self_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_summary_as_set_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_zebra_packet_detail_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ripng_packet_detail_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_send_community_type_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_distribute_list_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_rip_packet_detail_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_detail_all_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_timers_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_zebra_events_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_distance_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_month_day_month_day_cmd_vtysh);
+  install_element (RIPNG_NODE, &default_information_originate_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_bestpath_compare_router_id_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (OSPF_NODE, &neighbor_priority_poll_interval_cmd_vtysh);
   install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authkey_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_nexthop_self_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authtype_args_authkey_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_ism_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_debugging_bgp_cmd_vtysh);
+  install_element (OSPF_NODE, &no_neighbor_poll_interval_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_cidr_only_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_confederation_identifier_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_protocols_rip_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf6_damp_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_rfc1583_flag_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_static_metric_val_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_metric_type_routemap_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_infinite_day_month_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_bestpath_med2_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbors_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_range_cmd_vtysh);
+  install_element (RMAP_NODE, &rmap_onmatch_goto_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community_exact_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_metric_type_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_distance_source_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_address_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_prefix_list_name_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_routemap_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_lsa_sub_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_shutdown_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_out_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_network_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_redistribute_type_routemap_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ip_next_hop_prefix_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_prefix_list_name_prefix_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_metric_val_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_database_type_self_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_metric_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
   install_element (CONFIG_NODE, &no_access_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_router_bgp_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_timers_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_in_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ospf_dead_interval_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_self_cmd_vtysh);
-  install_element (OSPF_NODE, &area_shortcut_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_authentication_key_chain_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_sequence_number_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_bgp_config_type_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_mask_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_detail_cmd_vtysh);
   install_element (BGP_NODE, &no_neighbor_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighborlist_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_summary_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_instance_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_regexp_cmd_vtysh);
-  install_element (RMAP_NODE, &match_origin_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_filter_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cidr_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_out_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_table_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_nexthop_self_cmd_vtysh);
-  install_element (RIP_NODE, &rip_default_metric_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_param3_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_regexp_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_regexp_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_md5_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_priority_addr_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_regexp_cmd_vtysh);
+  install_element (OSPF_NODE, &no_auto_cost_reference_bandwidth_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ripng_zebra_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_bestpath_compare_router_id_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_prefix_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_summary_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_activate_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_range_cost_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_host_host_cmd_vtysh);
   install_element (BGP_NODE, &neighbor_set_peer_group_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community_list_exact_cmd_vtysh);
-  install_element (BGP_NODE, &old_ipv6_bgp_network_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_default_originate_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_seq_ge_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_as_set_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_local_pref_val_cmd_vtysh);
-  install_element (OSPF_NODE, &no_neighbor_pollinterval_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_cmd_vtysh);
   install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_filter_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_bgp_keepalive_cmd_vtysh);
-  install_element (RIP_NODE, &rip_distance_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_weight_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_rip_events_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbor_routes_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_lsa_cmd_vtysh);
-  install_element (BGP_NODE, &old_no_ipv6_aggregate_address_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_access_list_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_metric_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_mask_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community2_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_bestpath_aspath_ignore_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_in_prefix_filter_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_addr_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_network_cmd_vtysh);
-  install_element (OSPF_NODE, &no_router_id_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_local_as_no_prepend_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
-  install_element (BGP_NODE, &no_synchronization_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_update_source_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_address_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_extcommunity_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_all_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_route_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_rip_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_standard_host_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_sequence_number_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_longer_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_as_set_summary_cmd_vtysh);
-  install_element (RMAP_NODE, &ospf6_routemap_set_forwarding_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_ism_sub_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_zebra_sub_cmd_vtysh);
   install_element (OSPF_NODE, &no_area_range_advertise_cost_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_prefix_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_month_day_day_month_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_activate_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_dampened_paths_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_retransmit_interval_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_in_prefix_filter_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_list_exact_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_any_any_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbor_flap_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_update_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_allowas_in_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbor_routes_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_name_expanded_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_filter_list_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_summary_only_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_name_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_connected_routemap_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_in_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_confederation_peers_cmd_vtysh);
+  install_element (RMAP_NODE, &set_ecommunity_soo_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_damp_set2_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_routemap_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_ecommunity_soo_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_bgp_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_summary_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_bgp_filter_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_all_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_external_inter_intra_cmd_vtysh);
   install_element (CONFIG_NODE, &ip_prefix_list_le_ge_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_addr_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community_exact_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_remark_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_dead_interval_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_preference_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_as_set_summary_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_regexp_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_prefix_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_detail_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_passive_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community4_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_prefix_list_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ip_next_hop_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_bgp_fsm_cmd_vtysh);
+  install_element (CONFIG_NODE, &bgp_multiple_instance_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_all_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_route_server_client_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_router_bgp_view_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_inter_intra_external_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_le_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_standard_host_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_community_list_arg_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_paths_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_node_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_default_metric_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_zebra_sub_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_address_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &bgp_config_type_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_cost_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ipv6_ospf6_passive_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_kernel_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_filter_list_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_mask_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_default_metric_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_seq_le_ge_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_longer_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_authentication_addr_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_regexp_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_metric_val_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_as_path_all_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_cmd_vtysh);
   install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_metric_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_originator_id_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_static_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_capability_route_refresh_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_metric_routemap_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_send_community_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_forwarding_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_prefix_longer_cmd_vtysh);
-  install_element (RMAP_NODE, &no_rmap_onmatch_goto_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_routemap_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_metric_val_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_receive_version_1_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_scan_time_val_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_send_community_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community4_cmd_vtysh);
+  install_element (CONFIG_NODE, &dump_bgp_updates_interval_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_remark_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_scan_time_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_rmap_metric_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_nexthop_self_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_mask_backdoor_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_authentication_string2_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_default_originate_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_tags_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_static_metric_routemap_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_authentication_key_chain_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_authentication_args_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_timers_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_le_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_any_any_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_in_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_default_metric_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_extcommunity_list_name_expanded_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_distance_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_neighbor_detail_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_summary_as_set_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_local_as_val2_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_redistribute_source_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community4_exact_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_day_month_month_day_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_metric_routemap_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_route_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_database_type_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_compatible_rfc1583_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_bestpath_med3_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_router_id_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_cidr_only_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_address_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community2_exact_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_filter_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_aggregate_address_as_set_summary_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_name_standard2_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_summary_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_bestpath_med3_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_type_routemap_cmd_vtysh);
   install_element (ENABLE_NODE, &no_debug_ripng_packet_direct_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_metric_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_external_inter_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_le_ge_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_ospf6_external_prefix_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &vpnv4_network_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_rfc1583_flag_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_param2_cmd_vtysh);
-  install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_received_routes_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_standard2_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_summary_only_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_summary_name_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_attr_info_cmd_vtysh);
-  install_element (RMAP_NODE, &set_originator_id_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ripng_packet_direct_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_name_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_out_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_cluster_id32_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_redistribute_type_routemap_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_client_to_client_reflection_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_address_val_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_advertise_prefix_list_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_inter_intra_external_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_filter_list_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &ipv6_bgp_network_route_map_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_network_mask_natural_route_map_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_access_list_any_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_range_cost_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_param4_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_forwarding_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_route_mask_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_day_month_day_month_cmd_vtysh);
   install_element (BGP_IPV4M_NODE, &neighbor_send_community_type_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community_cmd_vtysh);
-  install_element (RMAP_NODE, &set_ecommunity_rt_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_cidr_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_authentication_string_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_instance_all_soft_cmd_vtysh);
-  install_element (OSPF_NODE, &timers_spf_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_seq_le_ge_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_port_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_community_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_out_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_zebra_events_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_soft_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_summary_only_cmd_vtysh);
+  install_element (OSPF6_NODE, &interface_area_plist_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_normal_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_topology_router_lsid_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_distribute_list_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_route_server_client_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_bgp_events_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_prefix_list_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_packet_send_recv_detail_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community3_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_metric_type_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_routemap_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_keepalive_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_database_type_adv_router_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_message_digest_key_addr_cmd_vtysh);
   install_element (CONFIG_NODE, &debug_ospf6_all_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_in_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_zebra_kernel_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_neighbor_all_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_multicast_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &dump_bgp_updates_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_routemap_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_always_compare_med_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_reachable_time_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_address_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_kernel_cmd_vtysh);
-  install_element (VIEW_NODE, &show_debug_ospf6_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ripng_events_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_authtype_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_route_reflector_client_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_remote_as_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community_exact_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_set_peer_group_cmd_vtysh);
-  install_element (ENABLE_NODE, &reload_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_route_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_host_host_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_ospf6_external_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_dont_capability_negotiate_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_cost_addr_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_all_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_mask_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_summary_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_transmitdelay_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_cost_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_send_community_type_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community_list_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_distance_source_access_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_route_prefix_longer_cmd_vtysh);
   install_element (INTERFACE_NODE, &ip_rip_receive_version_2_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_ra_interval_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_topology_router_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_ge_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_advertisement_cmd_vtysh);
-  install_element (RMAP_NODE, &set_metric_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_bestpath_compare_router_id_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_route_map_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ripng_packet_direct_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_seq_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_authentication_key_addr_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_route_reflector_client_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_distance_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_summary_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_route_mask_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_filter_list_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_minadvertinterval_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_transmit_delay_addr_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_routerid_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community2_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_default_originate_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_distance_source_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_in_prefix_filter_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_filter_list_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_route_map_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_name_standard2_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_ge_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_in_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_kernel_routemap_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ipv6_prefix_list_name_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_out_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_protocols_rip_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_out_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_description_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_standard_any_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_cost_addr_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_fsm_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_out_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community4_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_detail_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_rip_zebra_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_longer_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ecommunity_soo_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_managed_config_flag_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_metric_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_seq_cmd_vtysh);
-  install_element (BGP_NODE, &old_ipv6_aggregate_address_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_route_pref_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_sequence_number_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_prefix_longer_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_advertise_interval_val_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_any_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community_all_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_neighbor_id_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_day_month_day_month_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_in_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_authentication_mode_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_seq_le_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_zebra_packet_detail_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_as_path_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community2_exact_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_type_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_regexp_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_id_adv_router_dump_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_param3_cmd_vtysh);
+  install_element (OSPF_NODE, &area_export_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_intra_external_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_as_set_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_rip_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_addr_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_send_community_cmd_vtysh);
   install_element (OSPF_NODE, &ospf_redistribute_source_metric_routemap_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_access_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_route_server_client_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_filter_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_in_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_scan_time_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community_all_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_send_community_type_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community3_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_route_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_seq_ge_le_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_priority_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_authkey_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_distance_source_access_list_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_param1_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_debugging_rip_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_route_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_tree_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_static_routemap_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_mask_host_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_default_metric_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_bandwidth_if_cmd_vtysh);
-  install_element (VIEW_NODE, &ipv6_bgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_bgp_fsm_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_seq_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_interface_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_default_metric_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_default_metric_val_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_lsa_sub_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_metric_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_list_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_in_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_mask_natural_backdoor_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_key_chain2_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_timers_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_adv_router_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_host_any_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_inter_external_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community_list_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_metric_routemap_cmd_vtysh);
-  install_element (RMAP_NODE, &ospf6_routemap_no_set_forwarding_cmd_vtysh);
-  install_element (RMAP_NODE, &set_ipv6_nexthop_global_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_bestpath_compare_router_id_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_default_originate_cmd_vtysh);
   install_element (BGP_IPV4M_NODE, &no_aggregate_address_as_set_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
-  install_element (INTERFACE_NODE, &shutdown_if_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_connected_metric_routemap_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_address_secondary_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_duration_month_day_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_zebra_kernel_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_standard2_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_redistribute_type_metric_routemap_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_all_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_route_cmd_vtysh);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_zebra_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community3_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_out_cmd_vtysh);
-  install_element (RIP_NODE, &rip_distance_source_cmd_vtysh);
-  install_element (OSPF_NODE, &router_id_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_bgp_all_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_community_delete_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_list_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_route_reflector_client_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community3_exact_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_advertise_interval_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_bestpath_med2_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_aggregator_as_val_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_addr_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_default_information_originate_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_network_mask_route_map_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_address_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_activate_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_default_information_originate_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_packet_all_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_capability_dynamic_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_address_secondary_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_scan_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_regexp_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_bgp_keepalive_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_rip_packet_direct_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_activate_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_host_any_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_address_cmd_vtysh);
+  install_element (INTERFACE_NODE, &multicast_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_out_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_authentication_key_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_adv_router_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_routemap_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_mask_host_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_advertised_route_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_bestpath_med_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authtype_authkey_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_rip_zebra_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_id_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_type_cmd_vtysh);
   install_element (BGP_IPV6_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (INTERFACE_NODE, &interface_ip_ospf_authentication_addr_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_mask_as_set_summary_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ip_address_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_summary_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_standard_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_adv_router_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community_list_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_send_version_1_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbors_peer_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_out_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_addr_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &no_key_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_access_list_remark_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_topology_router_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_prefix_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_nsm_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_damp_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_name_expanded_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_view_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community3_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_route_map_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_advertise_prefix_list_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_summary_as_set_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_key_chain_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community4_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_all_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_community_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_aggregator_as_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_soft_in_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_neighbor_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_cmd_vtysh);
   install_element (OSPF_NODE, &no_refresh_timer_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_prefix_list_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_mask_natural_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_ospf6_external_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_unsuppress_map_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_remove_private_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_send_community_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_forwarding_cmd_vtysh);
-  install_element (RIP_NODE, &rip_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_rip_packet_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (OSPF_NODE, &neighbor_priority_pollinterval_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_port_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_detail_name_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_static_routemap_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_paths_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_mask_summary_only_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ripng_zebra_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_route_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community4_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_prefix_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_external_intra_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_statistics_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &bgp_network_mask_natural_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ripng_packet_detail_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_as_set_summary_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_routes_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_default_ipv4_unicast_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_in_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_scan_time_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_zebra_sub_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_out_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_as_set_summary_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_instance_ipv4_summary_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_in_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ripng_cmd_vtysh);
   install_element (BGP_NODE, &bgp_damp_unset_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distribute_list_out_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_extcommunity_list_all_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_dump_bgp_updates_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_in_prefix_filter_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_standard_host_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_nexthop_self_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_prefix_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_bgp_events_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &bgp_network_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community4_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_route_addr_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_remote_as_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_dead_interval_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_instance_summary_cmd_vtysh);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_soft_out_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_static_metric_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_prefix_cmd_vtysh);
-  install_element (BGP_NODE, &no_auto_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &ipv6_bgp_neighbor_routes_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ipv6_address_prefix_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_send_community_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_send_community_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_filter_list_cmd_vtysh);
-  install_element (OSPF_NODE, &area_range_advertise_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_soft_in_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_addr_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_out_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_expanded_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_rip_events_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_prefix_list_summary_cmd_vtysh);
-  install_element (INTERFACE_NODE, &interface_ip_ospf_authentication_args_addr_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_metric_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_prefix_longer_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_send_ra_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_send_version_2_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community2_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ripng_packet_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_lsa_sub_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_rip_split_horizon_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_damp_set3_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_tree_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_route_map_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_enforce_multihop_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_route_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_as_path_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_host_mask_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_summary_only_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbor_routes_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_nsm_sub_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_unsuppress_map_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_route_map_cmd_vtysh);
+  install_element (KEYCHAIN_NODE, &no_key_chain_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_remark_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_strict_capability_cmd_vtysh);
   install_element (ENABLE_NODE, &show_ip_bgp_community_info_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_metric_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_regexp_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_name_standard_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_nsm_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_confederation_identifier_arg_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community2_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_version_ospf6_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_ipv6_bgp_network_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community_list_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_rip_packet_direct_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_metric_routemap_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_route_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_prefix_longer_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_passive_interface_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_mask_any_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_tags_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbor_routes_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_received_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_in_prefix_filter_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_distribute_list_out_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_interface_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_extcommunity_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &ipv6_bgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_default_originate_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authtype_args_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_instance_ipv4_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_instance_summary_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_prefix_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authtype_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_community_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community4_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_retransmit_interval_addr_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_description_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_receive_version_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_ebgp_multihop_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_suppress_ra_cmd_vtysh);
-  install_element (OSPF_NODE, &area_filter_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_timers_connect_val_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_adv_router_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_unsuppress_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_list_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_interface_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_shutdown_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_zebra_interface_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_extcommunity_list_name_all_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_event_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
   install_element (OSPF_NODE, &ospf_distance_ospf_external_intra_inter_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_description_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_remark_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_hellointerval_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (CONFIG_NODE, &dump_bgp_all_interval_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_route_map_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_range_subst_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_network_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_zebra_events_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_origin_val_cmd_vtysh);
-  install_element (OSPF_NODE, &area_default_cost_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &key_string_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community4_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_route_server_client_cmd_vtysh);
-  install_element (BGP_NODE, &old_ipv6_aggregate_address_summary_only_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_node_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community_all_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_static_metric_routemap_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_message_digest_key_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_type_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_abr_type_cmd_vtysh);
+  install_element (RIP_NODE, &rip_default_information_originate_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_filter_list_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_ge_le_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_out_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_zebra_packet_direct_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_external_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_nexthop_self_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_authentication_mode_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_type_routemap_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_network_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_seq_le_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ripng_zebra_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbor_damp_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_metric_type_routemap_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_debug_ospf6_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_rip_packet_detail_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_enforce_first_as_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_param4_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_passive_interface_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh);
+  install_element (OSPF_NODE, &no_passive_interface_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_prefix_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_as_set_summary_cmd_vtysh);
   install_element (BGP_NODE, &neighbor_enforce_multihop_cmd_vtysh);
-  install_element (RMAP_NODE, &set_weight_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_tags_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_route_distance_cmd_vtysh);
+  install_element (OSPF_NODE, &area_range_advertise_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_backdoor_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_standard_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_prefix_list_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_bestpath_med_cmd_vtysh);
+  install_element (ZEBRA_NODE, &no_redistribute_ospf6_cmd_vtysh);
+  install_element (OSPF_NODE, &passive_interface_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_bgp_keepalive_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_damp_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ospf_message_digest_key_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_route_server_client_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_metric_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_address_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_metric_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_filter_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community2_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_distribute_list_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_bestpath_aspath_ignore_cmd_vtysh);
+  install_element (OSPF_NODE, &area_range_cmd_vtysh);
+  install_element (CONFIG_NODE, &dump_bgp_routes_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_shortcut_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_authentication_string_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_expanded_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_weight_cmd_vtysh);
   install_element (VIEW_NODE, &show_debugging_ripng_cmd_vtysh);
-  install_element (OSPF_NODE, &area_import_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_zebra_packet_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_default_information_originate_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_stub_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_extcommunity_list_expanded_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_send_community_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_bgp_routemap_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_network_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ripng_events_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_mask_natural_route_map_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_default_local_preference_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_id_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ip_next_hop_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_soft_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_community_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_debugging_zebra_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community4_exact_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_mask_summary_only_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authtype_args_md5_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_default_originate_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community3_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_cidr_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_access_list_name_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_route_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ripng_packet_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_range_not_advertise_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_routemap_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_topology_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_prefix_longer_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community3_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_prefix_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_default_ipv4_unicast_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_summary_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_route_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_mask_natural_backdoor_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_seq_ge_le_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_in_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community_list_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_infinite_month_day_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_int_detail_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_inter_external_intra_cmd_vtysh);
+  install_element (VIEW_NODE, &show_zebra_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_originator_id_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_port_val_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_statistics_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_flap_cmd_vtysh);
+  install_element (VIEW_NODE, &show_version_ospf6_cmd_vtysh);
   install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_as_set_summary_cmd_vtysh);
-  install_element (CONFIG_NODE, &bgp_multiple_instance_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_summary_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_detail_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_router_rip_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_inter_external_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_list_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ospf_retransmit_interval_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_rfc1583_flag_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_as_set_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_name_standard_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_bgp_all_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_timers_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_bgp_metric_routemap_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community3_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_zebra_events_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_distance_ospf_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_standard_nomask_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_duration_day_month_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_route_reflector_client_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_protocols_rip_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_passive_interface_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_set_peer_group_cmd_vtysh);
+  install_element (RIP_NODE, &rip_network_cmd_vtysh);
+  install_element (RIP_NODE, &rip_redistribute_type_cmd_vtysh);
   install_element (RMAP_NODE, &no_match_metric_val_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_originator_id_val_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_bestpath_med_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_intra_external_inter_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_neighbor_received_routes_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_summary_only_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_seq_le_ge_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_md5_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_zebra_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community2_exact_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_type_metric_routemap_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &bgp_network_mask_route_map_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_send_community_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_filter_list_cmd_vtysh);
+  install_element (RMAP_NODE, &set_vpnv4_nexthop_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_attr_info_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_paths_cmd_vtysh);
   install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_le_cmd_vtysh);
-  install_element (CONFIG_NODE, &dump_bgp_updates_interval_cmd_vtysh);
-  install_element (OSPF_NODE, &passive_interface_addr_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_as_set_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_summary_as_set_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_default_metric_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &bgp_network_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_community_list_arg_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_as_path_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_detail_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_ge_le_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_bestpath_med_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_view_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community_all_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_community_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_instance_ipv4_summary_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_offset_list_ifname_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_mask_summary_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_nsm_sub_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community3_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_host_mask_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_authtype_authkey_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_route_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_allowas_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_normal_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_scan_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_abr_type_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_filter_list_cmd_vtysh);
-  install_element (RIP_NODE, &rip_redistribute_type_metric_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_network_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_route_mask_distance_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_routes_cmd_vtysh);
+  install_element (OSPF_NODE, &area_stub_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_list_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_month_day_month_day_cmd_vtysh);
+  install_element (RIP_NODE, &rip_offset_list_ifname_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_activate_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_mask_as_set_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_bgp_network_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_send_community_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_default_ipv4_unicast_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_zebra_packet_detail_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_rip_events_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_bgp_network_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_mask_summary_as_set_cmd_vtysh);
   install_element (BGP_IPV4_NODE, &no_neighbor_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_ism_sub_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_route_map_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_transparent_as_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_route_map_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_any_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_bgp_update_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_rip_send_version_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_dont_capability_negotiate_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_other_config_flag_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_route_map_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_advertised_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_filter_cmd_vtysh);
+  install_element (RIP_NODE, &rip_timers_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_authentication_key_chain_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_static_routemap_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_mask_as_set_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community4_exact_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_infinite_month_day_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_cmd_vtysh);
+  install_element (BGP_NODE, &no_auto_summary_cmd_vtysh);
   install_element (KEYCHAIN_KEY_NODE, &no_key_string_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_address_val_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_metric_val_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community2_exact_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ospf_authentication_key_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_community_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_out_cmd_vtysh);
+  install_element (INTERFACE_NODE, &rip_split_horizon_cmd_vtysh);
+  install_element (OSPF_NODE, &timers_spf_cmd_vtysh);
+  install_element (OSPF6_NODE, &no_ospf6_redistribute_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_description_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_longer_cmd_vtysh);
+  install_element (RMAP_NODE, &set_origin_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_mask_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_network_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_update_direct_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_inter_cmd_vtysh);
   install_element (RMAP_NODE, &set_aggregator_as_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_out_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_le_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_priority_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_out_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_infinite_day_month_cmd_vtysh);
-  install_element (RIP_NODE, &rip_version_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_remote_as_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ripng_zebra_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_priority_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_nsm_sub_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_exact_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_community_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_update_source_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_distribute_list_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_redistribute_type_metric_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_port_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_set_peer_group_cmd_vtysh);
   install_element (ENABLE_NODE, &show_debugging_ospf_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community3_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_route_addr_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ospf_priority_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_metric_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_bandwidth_if_val_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_routemap_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_summary_name_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_paths_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_unsuppress_map_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ip_address_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_as_set_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_bgp_multiple_instance_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_address_val_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_peer_group_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_extcommunity_list_expanded_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_bgp_normal_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_damp_set_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_send_community_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_timers_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_zebra_cmd_vtysh);
+  install_element (RMAP_NODE, &ospf6_routemap_no_set_forwarding_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_area_topology_router_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_interface_cmd_vtysh);
+  install_element (RMAP_NODE, &match_community_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_route_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_metric_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_community_none_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_summary_as_set_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_connected_metric_routemap_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_mask_route_map_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_view_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_route_server_client_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_neighbor_int_detail_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_timers_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_type_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_external_inter_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_route_map_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_database_type_adv_router_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_next_hop_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_zebra_packet_cmd_vtysh);
   install_element (BGP_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_soft_in_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_prefix_list_name_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_distribute_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_access_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_list_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_as_set_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_nsm_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_topology_router_lsid_cmd_vtysh);
   install_element (BGP_NODE, &no_neighbor_strict_capability_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ripng_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_duration_month_day_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbors_peer_cmd_vtysh);
-  install_element (VIEW_NODE, &ipv6_bgp_neighbor_routes_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_default_metric_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_packet_send_recv_detail_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_protocols_rip_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community3_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_peer_group_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_infinite_month_day_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_soft_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_rip_split_horizon_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authtype_md5_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_in_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_filter_list_cmd_vtysh);
-  install_element (OSPF_NODE, &passive_interface_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_topology_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_as_set_summary_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbor_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_longer_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_advertise_interval_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_dump_bgp_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_in_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_prefix_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_summary_name_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_mask_summary_only_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_cost_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_route_protocol_cmd_vtysh);
-  install_element (OSPF_NODE, &area_export_list_cmd_vtysh);
-  install_element (OSPF6_NODE, &router_id_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_access_list_exact_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_abr_type_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_aspath_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &bgp_network_mask_natural_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_dampened_paths_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_peer_group_remote_as_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_metric_rmap_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_shortcut_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_natural_route_map_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_metric_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_authentication_key_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_routemap_cmd_vtysh);
   install_element (INTERFACE_NODE, &ip_ospf_hello_interval_addr_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_redistribute_type_metric_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_zebra_kernel_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_nsm_sub_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_distance_source_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_host_host_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf6_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_neighbors_peer_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_interface_ip_ospf_authentication_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_paths_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ripng_packet_detail_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_self_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_ism_sub_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_out_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_name_standard2_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_route_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_bestpath_med2_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_summary_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_name_cmd_vtysh);
-  install_element (ZEBRA_NODE, &redistribute_ospf6_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_forwarding_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_deterministic_med_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_neighbor_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_summary_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_ge_le_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_summary_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_cmd_vtysh);
   install_element (CONFIG_NODE, &debug_zebra_packet_direct_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_mask_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_rip_packet_detail_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_cluster_id_arg_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_description_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_zebra_cmd_vtysh);
-  install_element (RMAP_NODE, &match_community_exact_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_received_prefix_filter_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_fast_external_failover_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_soft_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_description_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_damp_set3_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_capability_route_refresh_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_topology_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_dump_bgp_routes_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_vpnv4_nexthop_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_in_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_rip_events_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_address_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_ism_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_version_val_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_event_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_param1_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_routemap_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_routemap_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_aggregate_address_as_set_summary_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_nsm_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_send_community_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_prefix_list_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_table_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_ge_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_send_community_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_static_metric_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
+  install_element (RIP_NODE, &rip_route_cmd_vtysh);
+  install_element (OSPF_NODE, &area_default_cost_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_event_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_tags_cmd_vtysh);
+  install_element (BGP_NODE, &aggregate_address_mask_as_set_summary_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_cost_addr_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_transparent_as_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_distribute_list_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_remote_as_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &bgp_network_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_summary_name_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (ZEBRA_NODE, &no_ripng_redistribute_ripng_cmd_vtysh);
+  install_element (INTERFACE_NODE, &bandwidth_if_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_in_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_bgp_metric_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_rmap_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_authentication_args_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_in_prefix_filter_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_rip_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_network_mask_natural_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_client_to_client_reflection_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_as_set_summary_cmd_vtysh);
+  install_element (INTERFACE_NODE, &shutdown_if_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ripng_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_set_peer_group_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_activate_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_static_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_dead_interval_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_description_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_filter_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_detail_name_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_activate_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_name_seq_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_addr_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_timers_connect_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_receive_version_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_send_community_type_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_out_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_allowas_in_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_route_reflector_client_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_lsa_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_filter_list_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_standard_any_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_offset_list_ifname_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_aspath_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_lsa_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_priority_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf6_all_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighborlist_cmd_vtysh);
   install_element (BGP_IPV4_NODE, &no_bgp_network_mask_natural_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_mask_natural_route_map_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_retransmit_interval_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_mask_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_community_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_longer_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_distance_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_advertisement_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community2_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_route_supernets_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_rmap_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_nd_suppress_ra_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_router_id_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_community_delete_val_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_metric_rmap_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_vlink_param1_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_connected_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_summary_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_send_community_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_prefix_list_prefix_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_intra_inter_external_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_rmap_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_cmd_vtysh);
-  install_element (OSPF_NODE, &refresh_timer_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_list_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_month_day_month_day_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_zebra_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_zebra_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_route_reflector_client_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_neighbor_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_bgp_network_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_attr_info_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_in_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_instance_ipv4_summary_cmd_vtysh);
   install_element (CONFIG_NODE, &no_debug_bgp_filter_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_rip_zebra_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_rip_packet_cmd_vtysh);
-  install_element (VIEW_NODE, &show_version_ospf6_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_route_supernets_cmd_vtysh);
-  install_element (RIP_NODE, &rip_redistribute_type_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_address_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_val_cmd_vtysh);
-  install_element (RMAP_NODE, &rmap_onmatch_goto_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_type_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_summary_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_view_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_adv_router_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_ism_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_events_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_route_map_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_range_advertise_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_out_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_ism_sub_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_addr_cmd_vtysh);
+  install_element (RMAP_NODE, &match_community_exact_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community_list_exact_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_peer_group_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_peer_group_remote_as_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_packet_all_cmd_vtysh);
   install_element (ENABLE_NODE, &debug_ripng_zebra_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_allowas_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community3_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_prefix_list_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community4_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_send_community_type_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_send_community_type_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_duration_month_day_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_route_server_client_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_seq_ge_le_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_prefix_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_global_val_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_range_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_route_prefix_longer_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_local_as_val_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_route_map_all_cmd_vtysh);
-  install_element (OSPF_NODE, &no_passive_interface_addr_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_as_soft_out_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_send_community_type_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_routes_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_activate_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_enforce_first_as_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_rip_events_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_kernel_metric_routemap_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_passive_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_community4_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_static_metric_val_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ecommunity_rt_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_send_community_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_backdoor_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_enforce_multihop_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_prefix_list_name_prefix_cmd_vtysh);
-  install_element (OSPF6_NODE, &ospf6_redistribute_routemap_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_send_community_type_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &bgp_network_mask_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ospf_message_digest_key_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_tags_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_exact_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_mask_backdoor_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_cmd_vtysh);
-  install_element (CONFIG_NODE, &config_table_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_seq_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_receive_version_1_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_override_capability_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_transmit_delay_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_zebra_kernel_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_cmd_vtysh);
   install_element (BGP_IPV4_NODE, &no_aggregate_address_as_set_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_topology_router_lsid_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_filter_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_ge_le_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_instance_all_soft_in_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_route_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_mask_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_mask_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_out_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_packet_all_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_route_reflector_client_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_default_information_originate_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_rip_send_version_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_router_id_val_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_route_server_client_cmd_vtysh);
   install_element (CONFIG_NODE, &debug_zebra_packet_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_summary_only_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_metric_val_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_route_map_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_prefix_list_cmd_vtysh);
-  install_element (OSPF6_NODE, &area_range_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_rip_events_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_seq_le_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_cmd_vtysh);
-  install_element (RMAP_NODE, &match_interface_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_community_exact_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_version_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_in_prefix_filter_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_standard_any_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_lsa_sub_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_intra_inter_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_keepalive_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_peer_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_any_any_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ripng_packet_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (RIP_NODE, &rip_offset_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_view_route_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_router_bgp_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community_all_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_neighbors_peer_cmd_vtysh);
+  install_element (RIP_NODE, &rip_default_metric_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_out_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_default_local_preference_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_nsm_sub_cmd_vtysh);
+  install_element (OSPF_NODE, &area_authentication_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_cmd_vtysh);
+  install_element (RIP_NODE, &rip_neighbor_cmd_vtysh);
   install_element (BGP_NODE, &no_bgp_network_import_check_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_in_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_prefix_list_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_default_cost_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_ge_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_paths_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_offset_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_remark_arg_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_zebra_kernel_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_lsa_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_default_metric_val_cmd_vtysh);
-  install_element (OSPF_NODE, &area_range_not_advertise_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_type_metric_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_zebra_client_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_prefix_list_le_ge_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_summary_only_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_in_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_vpnv4_nexthop_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_out_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_aspath_prepend_val_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_extcommunity_list_arg_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_peer_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_timers_connect_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_remark_arg_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbor_routes_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_prefix_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
   install_element (BGP_IPV6_NODE, &no_neighbor_nexthop_self_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_out_cmd_vtysh);
-  install_element (OSPF_NODE, &area_range_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community_list_exact_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_metric_type_cmd_vtysh);
-  install_element (RIP_NODE, &rip_distance_source_access_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_router_bgp_view_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_all_soft_in_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_shutdown_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_inter_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_name_standard_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_redistribute_type_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_regexp_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_in_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_prefix_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_ge_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_activate_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_prefix_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ecommunity_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_allowas_in_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authtype_args_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_retransmit_interval_addr_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_adv_router_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ip_address_prefix_list_cmd_vtysh);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_cmd_vtysh);
-  install_element (OSPF_NODE, &no_neighbor_priority_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_route_mask_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_in_prefix_filter_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community4_exact_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_rip_receive_version_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_compatible_rfc1583_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_soft_out_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_passive_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_default_originate_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_rmap_metric_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_any_any_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_shutdown_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_regexp_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_summary_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_route_prefix_longer_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community4_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_distribute_list_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_route_map_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_origin_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_damp_unset2_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community_all_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_dump_bgp_updates_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_network_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_weight_val_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ipv6_address_prefix_list_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_multicast_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community3_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_standard_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_prefix_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_lsa_sub_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_bandwidth_if_val_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf6_damp_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_address_mask_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_allowas_in_cmd_vtysh);
   install_element (ENABLE_NODE, &show_ip_ospf_database_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_distribute_list_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged9_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_authtype_args_authkey_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_flap_filter_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community4_exact_cmd_vtysh);
-  install_element (OSPF_NODE, &neighbor_priority_cmd_vtysh);
-  install_element (BGP_NODE, &old_no_ipv6_bgp_network_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_in_prefix_filter_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_exact_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &aggregate_address_mask_as_set_summary_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_filter_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_weight_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_timers_connect_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_address_secondary_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_distribute_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_aggregate_address_summary_as_set_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_community_none_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_version_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_exact_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_dead_interval_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_interface_ip_ospf_authentication_addr_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_ipv6_aggregate_address_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_ospf_route_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_local_as_val2_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_aspath_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_normal_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_bestpath_med2_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_redistribute_source_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_shutdown_if_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_flap_address_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_zebra_sub_cmd_vtysh);
-  install_element (RMAP_NODE, &set_metric_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbors_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_filter_list_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_damp_set3_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_bgp_update_direct_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_always_routemap_cmd_vtysh);
-  install_element (BGP_NODE, &aggregate_address_summary_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_in_prefix_filter_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_list_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_zebra_client_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_route_server_client_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ripng_events_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_default_originate_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_weight_val_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_update_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_filter_list_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged9_cmd_vtysh);
   install_element (BGP_IPV4M_NODE, &no_neighbor_route_map_cmd_vtysh);
-  install_element (RMAP_NODE, &set_atomic_aggregate_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_in_prefix_filter_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_global_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_scan_time_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_update_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_route_prefix_longer_cmd_vtysh);
-  install_element (CONFIG_NODE, &ipv6_route_ifname_pref_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
-  install_element (RIP_NODE, &rip_passive_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_filter_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_neighbor_advertised_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_name_seq_cmd_vtysh);
-  install_element (RMAP_NODE, &set_aspath_prepend_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_topology_router_lsid_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_routes_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ip_next_hop_prefix_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_route_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_activate_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_timers_arg_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_peer_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_advertise_interval_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_activate_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_external_soft_in_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_send_community_type_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community4_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_address_label_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_ospf6_routemap_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_name_standard_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_ge_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_filter_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_zebra_events_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged6_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_addr_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_detail_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_distance_source_access_list_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_community_delete_val_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_prefix_list_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_param3_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_in_cmd_vtysh);
+  install_element (OSPF_NODE, &no_neighbor_priority_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
   install_element (BGP_IPV4_NODE, &no_aggregate_address_summary_only_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_ospf_interface_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_standard2_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (OSPF6_NODE, &no_interface_area_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_prefix_list_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_rfc1583_flag_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_route_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community3_exact_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_route_server_client_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_all_soft_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_allowas_in_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_mask_backdoor_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_aggregate_address_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community4_exact_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_prefix_list_seq_le_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_le_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_capability_dynamic_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_regexp_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_connected_routemap_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ospf_transmit_delay_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_redistribute_type_metric_routemap_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ripng_events_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_route_cmd_vtysh);
-  install_element (ZEBRA_NODE, &ripng_redistribute_ripng_cmd_vtysh);
-  install_element (CONFIG_NODE, &access_list_extended_mask_host_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &ipv6_aggregate_address_summary_only_cmd_vtysh);
-  install_element (ZEBRA_NODE, &no_rip_redistribute_rip_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_default_information_originate_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_received_routes_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_soft_out_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community3_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_as_set_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_packet_all_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community4_exact_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_allowas_in_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_summary_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_database_type_self_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_metric_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_detail_cmd_vtysh);
   install_element (INTERFACE_NODE, &ospf_hello_interval_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community_all_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_timers_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_override_capability_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_redistribute_kernel_metric_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_mask_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_route_server_client_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_route_map_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_neighbor_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_route_protocol_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_address_mask_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_day_month_month_day_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_external_in_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_summary_only_cmd_vtysh);
-  install_element (OSPF_NODE, &area_vlink_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_external_intra_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_prefix_list_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_network_mask_natural_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_retransmit_interval_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_day_month_day_month_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_tags_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_event_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_duration_day_month_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_hello_interval_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_description_arg_cmd_vtysh);
-  install_element (ENABLE_NODE, &ipv6_bgp_neighbor_received_routes_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_passive_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_ge_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_type_routemap_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_default_information_originate_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_prefix_list_prefix_first_match_cmd_vtysh);
-  install_element (RMAP_NODE, &match_ip_next_hop_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_exact_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_as_soft_out_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (ENABLE_NODE, &undebug_bgp_keepalive_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_ospf_zebra_sub_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ipv6_address_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_rmap_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_route_prefix_longer_cmd_vtysh);
+  install_element (OSPF6_NODE, &router_id_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ripng_packet_direct_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_community2_exact_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_send_version_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_aggregate_address_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_router_rip_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_name_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_in_cmd_vtysh);
   install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_metric_routemap_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_router_id_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_packet_all_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_confederation_identifier_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_nexthop_self_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_out_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_ism_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_zebra_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_network_mask_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_param1_cmd_vtysh);
+  install_element (RIP_NODE, &rip_passive_interface_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_description_arg_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_cmd_vtysh);
+  install_element (ZEBRA_NODE, &redistribute_ospf6_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_exact_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_default_metric_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_detail_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_timers_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_remove_private_as_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_allowas_in_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_type_metric_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_summary_only_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_origin_val_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_aggregate_address_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_cidr_only_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_route_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_bgp_network_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &vpnv4_network_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_route_reflector_client_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_network_cmd_vtysh);
   install_element (ENABLE_NODE, &debug_ripng_packet_direct_cmd_vtysh);
-  install_element (INTERFACE_NODE, &interface_ip_ospf_authentication_args_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_neighborlist_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_in_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_detail_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_standard_any_cmd_vtysh);
+  install_element (OSPF_NODE, &neighbor_poll_interval_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_community_list_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_bestpath_aspath_ignore_cmd_vtysh);
   install_element (OSPF6_NODE, &passive_interface_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged6_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_route_addr_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_unsuppress_map_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_kernel_metric_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_type_routemap_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_router_id_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_default_local_preference_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_metric_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_extcommunity_list_name_expanded_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ripng_packet_direct_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_extcommunity_list_name_standard_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_any_mask_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_advertise_interval_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_rip_zebra_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &bgp_network_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community_exact_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_community_info_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_cmd_vtysh);
+  install_element (ZEBRA_NODE, &rip_redistribute_rip_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_scan_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_community_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ospf_authentication_key_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_out_cmd_vtysh);
+  install_element (RMAP_NODE, &match_origin_cmd_vtysh);
+  install_element (VIEW_NODE, &show_debugging_zebra_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ipv6_ospf6_advertise_prefix_list_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_transmit_delay_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_route_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_in_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_originator_id_val_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_inter_intra_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_filter_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_database_type_id_adv_router_dump_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_distance_source_access_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_out_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_allowas_in_cmd_vtysh);
+  install_element (OSPF_NODE, &passive_interface_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd_vtysh);
   install_element (BGP_NODE, &neighbor_route_server_client_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_any_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_send_community_type_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_warning_cmd_vtysh);
-  install_element (RIPNG_NODE, &ripng_aggregate_address_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_port_val_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_vpnv4_network_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_redistribute_source_type_metric_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_interface_cmd_vtysh);
+  install_element (OSPF_NODE, &area_authentication_message_digest_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_routemap_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_metric_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_authentication_cmd_vtysh);
+  install_element (OSPF6_NODE, &interface_area_plist_passive_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_community_delete_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_neighbor_id_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_version_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_as_set_summary_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_receive_version_num_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authtype_md5_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_advertise_interval_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_access_list_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_route_map_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_metric_routemap_cmd_vtysh);
+  install_element (RMAP_NODE, &set_ecommunity_rt_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_filter_list_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_default_originate_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_rip_zebra_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_extcommunity_list_expanded_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_capability_orf_prefix_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_distribute_list_cmd_vtysh);
   install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_ip_address_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_prefix_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ip_ospf_dead_interval_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_bandwidth_if_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_retransmit_interval_cmd_vtysh);
+  install_element (RMAP_NODE, &set_weight_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_ebgp_multihop_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_fsm_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_interface_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_local_pref_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_prefix_list_seq_ge_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_packet_all_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_prefix_longer_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_authentication_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_lsa_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ripng_packet_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_in_prefix_filter_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_maximum_prefix_val2_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_rip_packet_direct_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_activate_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ospf_network_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_out_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_route_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_normal_cmd_vtysh);
   install_element (BGP_NODE, &no_bgp_redistribute_ipv4_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_ecommunity_soo_val_cmd_vtysh);
-  install_element (BGP_NODE, &no_neighbor_description_val_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_bestpath_aspath_ignore_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_month_day_day_month_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community_exact_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_damp_unset2_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_metric_type_routemap_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_expanded_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_send_community_type_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ospf_network_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community2_exact_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_instance_summary_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_extended_mask_any_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_neighbors_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_stub_nosum_cmd_vtysh);
-  install_element (RMAP_NODE, &no_set_aggregator_as_val_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_in_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_network_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged7_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community3_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_distance_ospf_external_inter_intra_cmd_vtysh);
-  install_element (OSPF_NODE, &area_range_subst_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_prefix_cmd_vtysh);
-  install_element (ENABLE_NODE, &debug_bgp_filter_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_default_originate_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_connected_metric_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_ospf_nsm_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_origin_val_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_extcommunity_list_standard_cmd_vtysh);
+  install_element (RMAP_NODE, &set_community_none_cmd_vtysh);
+  install_element (RMAP_NODE, &set_metric_cmd_vtysh);
+  install_element (RIP_NODE, &rip_distance_source_access_list_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_damp_set_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_offset_list_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_standard_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_range_substitute_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_route_map_all_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_community_list_name_expanded_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_forwarding_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged10_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_distance_ospf_intra_external_inter_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_cluster_id_arg_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_zebra_kernel_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_route_supernets_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_remove_private_as_cmd_vtysh);
+  install_element (RMAP_NODE, &ospf6_routemap_no_match_address_prefixlist_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_priority_cmd_vtysh);
+  install_element (RIPNG_NODE, &no_ripng_redistribute_static_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_prefix_list_summary_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &aggregate_address_mask_summary_only_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_self_cmd_vtysh);
+  install_element (OSPF_NODE, &no_ospf_router_id_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_ospf_neighbor_all_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_ecommunity_rt_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_ospf_lsa_sub_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authtype_args_md5_cmd_vtysh);
+  install_element (CONFIG_NODE, &ip_as_path_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_capability_route_refresh_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_cmd_vtysh);
   install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_route_map_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_flap_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_damp_set2_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &ipv6_bgp_network_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_detail_cmd_vtysh);
-  install_element (RIP_NODE, &rip_neighbor_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_router_zebra_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_prefix_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_detail_name_cmd_vtysh);
+  install_element (ENABLE_NODE, &undebug_bgp_events_cmd_vtysh);
   install_element (BGP_VPNV4_NODE, &no_neighbor_distribute_list_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_standard_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged4_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_community_list_expanded_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_debug_rip_packet_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_network_mask_natural_backdoor_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_bgp_events_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_soft_reconfiguration_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_activate_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_allowas_in_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_ospf_authentication_key_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_access_list_remark_arg_cmd_vtysh);
-  install_element (OSPF_NODE, &ospf_default_information_originate_metric_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_external_out_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_activate_cmd_vtysh);
-  install_element (VIEW_NODE, &show_zebra_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_exact_cmd_vtysh);
-  install_element (RIP_NODE, &no_rip_network_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_prefix_list_cmd_vtysh);
-  install_element (OSPF_NODE, &no_ospf_compatible_rfc1583_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ospf_ism_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_topology_router_lsid_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &bgp_damp_unset_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community4_exact_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_activate_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_bgp_normal_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_bestpath_med3_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_ra_lifetime_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_route_map_cmd_vtysh);
-  install_element (OSPF6_NODE, &no_passive_interface_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_zebra_events_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_route_reflector_client_cmd_vtysh);
-  install_element (RMAP_NODE, &set_ecommunity_soo_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_out_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_transmitdelay_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_route_cmd_vtysh);
-  install_element (RIP_NODE, &rip_redistribute_type_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_rip_packet_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_summary_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_extcommunity_list_arg_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ip_irdp_address_preference_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_list_exact_cmd_vtysh);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_advertise_force_prefix_cmd_vtysh);
-  install_element (BGP_IPV6_NODE, &no_neighbor_allowas_in_cmd_vtysh);
-  install_element (BGP_NODE, &no_bgp_router_id_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ipv6_forwarding_cmd_vtysh);
-  install_element (OSPF_NODE, &no_area_authentication_cmd_vtysh);
-  install_element (CONFIG_NODE, &ip_community_list_name_expanded_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_in_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_strict_capability_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_version_cmd_vtysh);
+  install_element (BGP_NODE, &no_aggregate_address_as_set_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_send_community_type_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_always_metric_type_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_distribute_list_cmd_vtysh);
+  install_element (RMAP_NODE, &match_ip_next_hop_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_in_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_client_to_client_reflection_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_scan_time_cmd_vtysh);
+  install_element (OSPF_NODE, &network_area_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_cidr_only_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &no_key_chain_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_day_month_month_day_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_ge_le_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_unsuppress_map_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_route_map_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd_vtysh);
+  install_element (RMAP_NODE, &match_metric_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &send_lifetime_day_month_day_month_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_soft_reconfiguration_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_vpnv4_nexthop_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_interface_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_bgp_config_type_cmd_vtysh);
+  install_element (OSPF_NODE, &no_passive_interface_addr_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_dampened_paths_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_in_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_neighbor_send_community_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_exact_cmd_vtysh);
+  install_element (OSPF_NODE, &ospf_default_information_originate_type_metric_routemap_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_forwarding_cmd_vtysh);
+  install_element (RIP_NODE, &no_rip_distance_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_route_flapping_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_mask_any_cmd_vtysh);
   install_element (BGP_NODE, &no_neighbor_ebgp_multihop_ttl_cmd_vtysh);
-  install_element (BGP_IPV4M_NODE, &neighbor_set_peer_group_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ip_bgp_community_info_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_router_ospf_cmd_vtysh);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_all_cmd_vtysh);
-  install_element (ENABLE_NODE, &no_debug_ripng_events_cmd_vtysh);
-  install_element (OSPF_NODE, &no_timers_spf_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_cmd_vtysh);
-  install_element (VIEW_NODE, &show_ipv6_bgp_regexp_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_seq_le_ge_cmd_vtysh);
-  install_element (INTERFACE_NODE, &rip_split_horizon_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_bgp_community3_exact_cmd_vtysh);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_bgp_metric_val_cmd_vtysh);
-  install_element (RMAP_NODE, &no_match_interface_val_cmd_vtysh);
-  install_element (BGP_VPNV4_NODE, &neighbor_distribute_list_cmd_vtysh);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_route_cmd_vtysh);
-  install_element (BGP_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
-  install_element (CONFIG_NODE, &debug_ospf_zebra_sub_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_rmap_cmd_vtysh);
-  install_element (BGP_NODE, &bgp_timers_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_md5_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_authtype_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_ospf_neighbor_id_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_prefix_longer_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_list_cmd_vtysh);
+  install_element (OSPF_NODE, &no_area_vlink_authtype_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_send_community_type_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_send_community_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_rip_packet_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_out_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged2_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_rmap_cmd_vtysh);
+  install_element (OSPF6_NODE, &area_range_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_route_map_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_nexthop_self_cmd_vtysh);
+  install_element (OSPF6_NODE, &ospf6_redistribute_routemap_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd_vtysh);
+  install_element (RIP_NODE, &rip_distance_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_standard_nomask_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_out_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged1_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ipv6_ospf6_advertise_force_prefix_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_bgp_fsm_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_in_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged_cmd_vtysh);
+  install_element (OSPF6_NODE, &no_passive_interface_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged3_cmd_vtysh);
+  install_element (RIPNG_NODE, &ripng_redistribute_ospf6_metric_cmd_vtysh);
+  install_element (INTERFACE_NODE, &ipv6_ospf6_advertise_prefix_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_community_list_arg_cmd_vtysh);
+  install_element (RMAP_NODE, &no_match_metric_cmd_vtysh);
+  install_element (RIP_NODE, &rip_offset_list_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_flapping_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_key_chain_cmd_vtysh);
+  install_element (ENABLE_NODE, &no_debug_rip_events_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_flap_route_map_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_unsuppress_map_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_peer_cmd_vtysh);
+  install_element (OSPF_NODE, &router_id_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ipv6_route_ospf6_external_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_cluster_id_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &neighbor_route_map_cmd_vtysh);
+  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_duration_month_day_cmd_vtysh);
+  install_element (BGP_NODE, &no_bgp_deterministic_med_cmd_vtysh);
+  install_element (CONFIG_NODE, &debug_bgp_events_cmd_vtysh);
+  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_val_cmd_vtysh);
+  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged_cmd_vtysh);
+  install_element (BGP_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_route_supernets_cmd_vtysh);
+  install_element (RMAP_NODE, &set_ip_nexthop_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_dampening_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_bgp_events_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_default_originate_rmap_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_topology_cmd_vtysh);
+  install_element (RMAP_NODE, &set_originator_id_cmd_vtysh);
+  install_element (RMAP_NODE, &set_local_pref_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_prefix_list_detail_cmd_vtysh);
   install_element (BGP_NODE, &no_aggregate_address_mask_summary_as_set_cmd_vtysh);
-  install_element (ENABLE_NODE, &clear_bgp_peer_group_soft_out_cmd_vtysh);
-  install_element (BGP_IPV4_NODE, &neighbor_remove_private_as_cmd_vtysh);
-  install_element (OSPF_NODE, &area_stub_nosum_cmd_vtysh);
-  install_element (CONFIG_NODE, &no_ip_extcommunity_list_name_standard_cmd_vtysh);
-  install_element (KEYCHAIN_KEY_NODE, &accept_lifetime_duration_day_month_cmd_vtysh);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_deadinterval_cmd_vtysh);
+  install_element (ENABLE_NODE, &debug_rip_packet_direct_cmd_vtysh);
+  install_element (INTERFACE_NODE, &no_ip_ospf_network_cmd_vtysh);
+  install_element (OSPF_NODE, &neighbor_poll_interval_priority_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_le_cmd_vtysh);
+  install_element (RMAP_NODE, &ospf6_routemap_set_forwarding_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_bgp_ipv4_cidr_only_cmd_vtysh);
+  install_element (CONFIG_NODE, &no_access_list_extended_any_host_cmd_vtysh);
+  install_element (BGP_NODE, &neighbor_attr_unchanged8_cmd_vtysh);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged5_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd_vtysh);
+  install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_arg_cmd_vtysh);
+  install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_in_cmd_vtysh);
+  install_element (CONFIG_NODE, &access_list_extended_mask_any_cmd_vtysh);
+  install_element (RMAP_NODE, &ospf6_routemap_set_metric_type_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ipv6_route_ospf6_external_cmd_vtysh);
+  install_element (BGP_NODE, &bgp_network_mask_natural_backdoor_cmd_vtysh);
+  install_element (ENABLE_NODE, &show_ip_extcommunity_list_cmd_vtysh);
+  install_element (VIEW_NODE, &show_ip_route_prefix_longer_cmd_vtysh);
+  install_element (RMAP_NODE, &set_aspath_prepend_cmd_vtysh);
+  install_element (OSPF_NODE, &area_vlink_param2_cmd_vtysh);
+  install_element (RMAP_NODE, &no_set_local_pref_val_cmd_vtysh);
 }
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 6214767d..a83543ee 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -25,7 +25,7 @@ zebra_SOURCES = \
 
 noinst_HEADERS = \
 	connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
-	interface.h ipforward.h irdp.h
+	interface.h ipforward.h
 
 zebra_LDADD = ../lib/libzebra.a $(otherobj) $(LIB_IPV6)
 
@@ -38,7 +38,7 @@ EXTRA_DIST = $(sysconf_DATA) if_ioctl.c if_netlink.c if_proc.c if_sysctl.c \
 	ipforward_solaris.c ipforward_sysctl.c rt_ioctl.c rt_netlink.c \
 	rt_socket.c rtread_netlink.c rtread_proc.c rtread_sysctl.c \
 	rtread_getmsg.c kernel_socket.c kernel_netlink.c mtu_kvm.c \
-	GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB irdp.c
+	GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB
 
 #client : client_main.o ../lib/libzebra.a
 #	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
diff --git a/zebra/Makefile.in b/zebra/Makefile.in
index ad35b383..60dd1989 100644
--- a/zebra/Makefile.in
+++ b/zebra/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,129 +13,95 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
 host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BGPD = @BGPD@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
 CURSES = @CURSES@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
 IF_METHOD = @IF_METHOD@
 IF_PROC = @IF_PROC@
 
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 IPFORWARD = @IPFORWARD@
 KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
 LIBPAM = @LIBPAM@
-LIBS = @LIBS@
 
 LIB_IPV6 = @LIB_IPV6@
 LIB_REGEX = @LIB_REGEX@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
 MULTIPATH_NUM = @MULTIPATH_NUM@
-OBJEXT = @OBJEXT@
 OSPF6D = @OSPF6D@
 OSPFD = @OSPFD@
 OTHER_METHOD = @OTHER_METHOD@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RIPD = @RIPD@
 RIPNGD = @RIPNGD@
 RTREAD_METHOD = @RTREAD_METHOD@
 RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 VTYSH = @VTYSH@
 ZEBRA = @ZEBRA@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
+DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
 INSTALL_SDATA = @INSTALL@ -m 600
 
 ipforward = @IPFORWARD@
@@ -188,8 +154,10 @@ am_zebra_OBJECTS = zserv.$(OBJEXT) main.$(OBJEXT) interface.$(OBJEXT) \
 	zebra_snmp.$(OBJEXT) zebra_vty.$(OBJEXT)
 zebra_OBJECTS = $(am_zebra_OBJECTS)
 zebra_LDFLAGS =
-
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/connected.Po ./$(DEPDIR)/debug.Po \
@@ -202,6 +170,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
 DIST_SOURCES = $(zebra_SOURCES)
 DATA = $(sysconf_DATA)
 
@@ -229,7 +198,7 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
 	  else :; fi; \
 	done
 
@@ -269,26 +238,17 @@ distclean-depend:
 	-rm -rf ./$(DEPDIR)
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 sysconfDATA_INSTALL = $(INSTALL_DATA)
 
@@ -303,9 +263,6 @@ uninstall-sysconfDATA:
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -331,39 +288,20 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -449,28 +387,20 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS \
 	uninstall-sysconfDATA
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-sbinPROGRAMS ctags distclean distclean-compile \
-	distclean-depend distclean-generic distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-sbinPROGRAMS install-strip \
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-sbinPROGRAMS distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-sbinPROGRAMS install-strip \
 	install-sysconfDATA installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-sbinPROGRAMS uninstall-sysconfDATA
+	mostlyclean-compile mostlyclean-generic tags uninstall \
+	uninstall-am uninstall-info-am uninstall-sbinPROGRAMS \
+	uninstall-sysconfDATA
 
 
 #client : client_main.o ../lib/libzebra.a