[Xorp-cvs] SF.net SVN: xorp:[11649] trunk/xorp/etc/templates
bms_fbsd at users.sourceforge.net
bms_fbsd at users.sourceforge.net
Thu Dec 3 08:48:08 PST 2009
Revision: 11649
http://xorp.svn.sourceforge.net/xorp/?rev=11649&view=rev
Author: bms_fbsd
Date: 2009-12-03 16:48:08 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
Continue implementation of FHS style package layout for XORP.
Update all Router Manager command and template files to use
simple paths, and catch up with the renaming of various
tool binaries.
Forthcoming commits will update the Router Manager to use the
new locations, as well as creating symlinks inside $BUILDDIR
so that developers can run binaries during testing.
Modified Paths:
--------------
trunk/xorp/etc/templates/bgp.cmds
trunk/xorp/etc/templates/fea.cmds
trunk/xorp/etc/templates/fea.tp
trunk/xorp/etc/templates/fib2mrib.tp
trunk/xorp/etc/templates/firewall.tp
trunk/xorp/etc/templates/igmp.cmds
trunk/xorp/etc/templates/igmp.tp
trunk/xorp/etc/templates/interfaces.tp
trunk/xorp/etc/templates/mfea.cmds
trunk/xorp/etc/templates/mfea4.tp
trunk/xorp/etc/templates/mfea6.cmds
trunk/xorp/etc/templates/mfea6.tp
trunk/xorp/etc/templates/mld.cmds
trunk/xorp/etc/templates/mld.tp
trunk/xorp/etc/templates/olsr4.cmds
trunk/xorp/etc/templates/olsr4.tp
trunk/xorp/etc/templates/ospfv2.cmds
trunk/xorp/etc/templates/ospfv2.tp
trunk/xorp/etc/templates/ospfv3.cmds
trunk/xorp/etc/templates/ospfv3.tp
trunk/xorp/etc/templates/pim.cmds
trunk/xorp/etc/templates/pim6.cmds
trunk/xorp/etc/templates/pimsm4.tp
trunk/xorp/etc/templates/pimsm6.tp
trunk/xorp/etc/templates/policy.cmds
trunk/xorp/etc/templates/policy.tp
trunk/xorp/etc/templates/rib.cmds
trunk/xorp/etc/templates/rib.tp
trunk/xorp/etc/templates/rip.cmds
trunk/xorp/etc/templates/rip.tp
trunk/xorp/etc/templates/ripng.cmds
trunk/xorp/etc/templates/ripng.tp
trunk/xorp/etc/templates/static_routes.tp
trunk/xorp/etc/templates/vrrp.cmds
trunk/xorp/etc/templates/vrrp.tp
Modified: trunk/xorp/etc/templates/bgp.cmds
===================================================================
--- trunk/xorp/etc/templates/bgp.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/bgp.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,139 +7,139 @@
}
show bgp peers {
- %command: "bgp/tools/xorpsh_print_peers $0" %help: HELP;
+ %command: "bgp_print_peers $0" %help: HELP;
%module: bgp;
%tag: HELP "Show BGP peers info";
}
show bgp peers detail {
- %command: "bgp/tools/xorpsh_print_peers $0" %help: HELP;
+ %command: "bgp_print_peers $0" %help: HELP;
%module: bgp;
%tag: HELP "Show detailed BGP peers info";
}
show bgp routes {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP routes";
}
show bgp routes detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP routes";
}
show bgp routes summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP routes";
}
show bgp routes ipv4 {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP IPv4 routes";
}
show bgp routes ipv4 detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP IPv4 routes";
}
show bgp routes ipv4 summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP IPv4 routes";
}
show bgp routes ipv4 unicast {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP IPv4 unicast routes";
}
show bgp routes ipv4 unicast detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP IPv4 unicast routes";
}
show bgp routes ipv4 unicast summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP IPv4 unicast routes";
}
show bgp routes ipv4 multicast {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP IPv4 multicast routes";
}
show bgp routes ipv4 multicast detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP IPv4 multicast routes";
}
show bgp routes ipv4 multicast summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP IPv4 multicast routes";
}
show bgp routes ipv6 {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP IPv6 routes";
}
show bgp routes ipv6 detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP IPv6 routes";
}
show bgp routes ipv6 summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP IPv6 routes";
}
show bgp routes ipv6 unicast {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP IPv6 unicast routes";
}
show bgp routes ipv6 unicast detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP IPv6 unicast routes";
}
show bgp routes ipv6 unicast summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP IPv6 unicast routes";
}
show bgp routes ipv6 multicast {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print BGP IPv6 multicast routes";
}
show bgp routes ipv6 multicast detail {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print detailed BGP IPv6 multicast routes";
}
show bgp routes ipv6 multicast summary {
- %command: "bgp/tools/xorpsh_print_routes $0" %help: HELP;
+ %command: "bgp_print_routes $0" %help: HELP;
%module: bgp;
%tag: HELP "Print summary of BGP IPv6 multicast routes";
}
Modified: trunk/xorp/etc/templates/fea.cmds
===================================================================
--- trunk/xorp/etc/templates/fea.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/fea.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -1,13 +1,13 @@
/* $XORP: xorp/etc/templates/fea.cmds,v 1.8 2004/05/26 04:25:08 pavlin Exp $ */
show interfaces {
- %command: "fea/tools/show_interfaces" %help: HELP;
+ %command: "fea_show_interfaces" %help: HELP;
%module: interfaces;
%tag: HELP "Show network interface information";
}
show interfaces $(interfaces.interface.*) {
- %command: "fea/tools/show_interfaces -i $3" %help: HELP;
+ %command: "fea_show_interfaces -i $3" %help: HELP;
%module: interfaces;
%tag: HELP "Show information about a single network interface";
}
Modified: trunk/xorp/etc/templates/fea.tp
===================================================================
--- trunk/xorp/etc/templates/fea.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/fea.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -55,7 +55,7 @@
%help: short "Configure the Forwarding Engine Abstraction";
%modinfo: provides fea;
%modinfo: depends firewall;
- %modinfo: path "fea/xorp_fea";
+ %modinfo: path "xorp_fea";
%modinfo: default_targetname "fea";
%mandatory: $(@.targetname);
Modified: trunk/xorp/etc/templates/fib2mrib.tp
===================================================================
--- trunk/xorp/etc/templates/fib2mrib.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/fib2mrib.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -13,7 +13,7 @@
%help: short "Configure the FIB2MRIB module";
%modinfo: provides fib2mrib;
%modinfo: depends rib;
- %modinfo: path "fib2mrib/xorp_fib2mrib";
+ %modinfo: path "xorp_fib2mrib";
%modinfo: default_targetname "fib2mrib";
%modinfo: status_method xrl "$(fib2mrib.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: shutdown_method xrl "$(fib2mrib.targetname)/common/0.1/shutdown";
Modified: trunk/xorp/etc/templates/firewall.tp
===================================================================
--- trunk/xorp/etc/templates/firewall.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/firewall.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -46,7 +46,7 @@
%help: short "Configure the firewall";
%modinfo: provides firewall;
%modinfo: depends interfaces;
- %modinfo: path "fea/xorp_fea";
+ %modinfo: path "xorp_fea";
%modinfo: default_targetname "fea";
%modinfo: start_commit xrl "$(interfaces.targetname)/fea_firewall/0.1/start_transaction->tid:u32=$(firewall.TID)";
%modinfo: end_commit xrl "$(interfaces.targetname)/fea_firewall/0.1/commit_transaction?tid:u32=$(firewall.TID)";
Modified: trunk/xorp/etc/templates/igmp.cmds
===================================================================
--- trunk/xorp/etc/templates/igmp.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/igmp.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,19 +7,19 @@
}
show igmp group {
- %command: "cli/tools/send_cli_processor_xrl -t IGMP $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t IGMP $0" %help: HELP;
%module: igmp;
%tag: HELP "Display information about IGMP group membership";
}
show igmp interface {
- %command: "cli/tools/send_cli_processor_xrl -t IGMP $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t IGMP $0" %help: HELP;
%module: igmp;
%tag: HELP "Display information about IGMP interfaces";
}
show igmp interface address {
- %command: "cli/tools/send_cli_processor_xrl -t IGMP $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t IGMP $0" %help: HELP;
%module: igmp;
%tag: HELP "Display information about addresses of IGMP interfaces";
}
Modified: trunk/xorp/etc/templates/igmp.tp
===================================================================
--- trunk/xorp/etc/templates/igmp.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/igmp.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -35,7 +35,7 @@
%help: short "Configure the IGMP protocol";
%modinfo: provides igmp;
%modinfo: depends mfea4;
- %modinfo: path "mld6igmp/xorp_igmp";
+ %modinfo: path "xorp_igmp";
%modinfo: default_targetname "mld6igmp";
%modinfo: status_method xrl "$(igmp.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: startup_method xrl "$(igmp.targetname)/mld6igmp/0.1/start_mld6igmp";
Modified: trunk/xorp/etc/templates/interfaces.tp
===================================================================
--- trunk/xorp/etc/templates/interfaces.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/interfaces.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -49,7 +49,7 @@
interfaces {
%help: short "Configure network interfaces";
%modinfo: provides interfaces;
- %modinfo: path "fea/xorp_fea";
+ %modinfo: path "xorp_fea";
%modinfo: default_targetname "fea";
%modinfo: status_method xrl "$(interfaces.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: shutdown_method xrl "$(interfaces.targetname)/common/0.1/shutdown";
Modified: trunk/xorp/etc/templates/mfea.cmds
===================================================================
--- trunk/xorp/etc/templates/mfea.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/mfea.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,19 +7,19 @@
}
show mfea dataflow {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_4 $0" %help: HELP;
%module: mfea4;
%tag: HELP "Display information about MFEA IPv4 dataflow filters";
}
show mfea interface {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_4 $0" %help: HELP;
%module: mfea4;
%tag: HELP "Display information about MFEA IPv4 interfaces";
}
show mfea interface address {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_4 $0" %help: HELP;
%module: mfea4;
%tag: HELP "Display information about addresses of MFEA IPv4 interfaces";
}
@@ -28,7 +28,7 @@
* Commented-out, because when we run everything through the rtrmgr,
* the MFEA is not used to get the routes from the kernel.
show mfea mrib {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_4 $0" %help: HELP;
%module: mfea4;
%tag: HELP "Display MRIB IPv4 information inside MFEA";
}
Modified: trunk/xorp/etc/templates/mfea4.tp
===================================================================
--- trunk/xorp/etc/templates/mfea4.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/mfea4.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -29,7 +29,7 @@
%help: short "Configure the IPv4 Multicast Forwarding Engine Abstraction";
%modinfo: provides mfea4;
%modinfo: depends fea;
- %modinfo: path "fea/xorp_fea";
+ %modinfo: path "xorp_fea";
%modinfo: default_targetname "mfea";
%modinfo: status_method xrl "$(mfea4.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: startup_method xrl "$(mfea4.targetname)/mfea/0.1/start_mfea";
Modified: trunk/xorp/etc/templates/mfea6.cmds
===================================================================
--- trunk/xorp/etc/templates/mfea6.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/mfea6.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,19 +7,19 @@
}
show mfea6 dataflow {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_6 $0" %help: HELP;
%module: mfea6;
%tag: HELP "Display information about MFEA IPv6 dataflow filters";
}
show mfea6 interface {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_6 $0" %help: HELP;
%module: mfea6;
%tag: HELP "Display information about MFEA IPv6 interfaces";
}
show mfea6 interface address {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_6 $0" %help: HELP;
%module: mfea6;
%tag: HELP "Display information about addresses of MFEA IPv6 interfaces";
}
@@ -28,7 +28,7 @@
* Commented-out, because when we run everything through the rtrmgr,
* the MFEA is not used to get the routes from the kernel.
show mfea6 mrib {
- %command: "cli/tools/send_cli_processor_xrl -t MFEA_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MFEA_6 $0" %help: HELP;
%module: mfea6;
%tag: HELP "Display MRIB IPv6 information inside MFEA";
}
Modified: trunk/xorp/etc/templates/mfea6.tp
===================================================================
--- trunk/xorp/etc/templates/mfea6.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/mfea6.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -29,7 +29,7 @@
%help: short "Configure the IPv6 Multicast Forwarding Engine Abstraction";
%modinfo: provides mfea6;
%modinfo: depends fea;
- %modinfo: path "fea/xorp_fea";
+ %modinfo: path "xorp_fea";
%modinfo: default_targetname "mfea";
%modinfo: status_method xrl "$(mfea6.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: startup_method xrl "$(mfea6.targetname)/mfea/0.1/start_mfea";
Modified: trunk/xorp/etc/templates/mld.cmds
===================================================================
--- trunk/xorp/etc/templates/mld.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/mld.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,19 +7,19 @@
}
show mld group {
- %command: "cli/tools/send_cli_processor_xrl -t MLD $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MLD $0" %help: HELP;
%module: mld;
%tag: HELP "Display information about MLD group membership";
}
show mld interface {
- %command: "cli/tools/send_cli_processor_xrl -t MLD $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MLD $0" %help: HELP;
%module: mld;
%tag: HELP "Display information about MLD interfaces";
}
show mld interface address {
- %command: "cli/tools/send_cli_processor_xrl -t MLD $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t MLD $0" %help: HELP;
%module: mld;
%tag: HELP "Display information about addresses of MLD interfaces";
}
Modified: trunk/xorp/etc/templates/mld.tp
===================================================================
--- trunk/xorp/etc/templates/mld.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/mld.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -35,7 +35,7 @@
%help: short "Configure the MLD protocol";
%modinfo: provides mld;
%modinfo: depends mfea6;
- %modinfo: path "mld6igmp/xorp_mld";
+ %modinfo: path "xorp_mld";
%modinfo: default_targetname "mld6igmp";
%modinfo: status_method xrl "$(mld.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: startup_method xrl "$(mld.targetname)/mld6igmp/0.1/start_mld6igmp";
Modified: trunk/xorp/etc/templates/olsr4.cmds
===================================================================
--- trunk/xorp/etc/templates/olsr4.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/olsr4.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -6,7 +6,7 @@
*/
clear olsr4 database {
- %command: "contrib/olsr/tools/clear_database" %help: HELP;
+ %command: "clear_database" %help: HELP;
%module: olsr4;
%tag: HELP "Clear OLSRv1 databases";
}
@@ -22,7 +22,7 @@
*/
show olsr4 interface {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 interface status";
}
@@ -33,7 +33,7 @@
*/
show olsr4 link {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 link status";
}
@@ -44,7 +44,7 @@
*/
show olsr4 neighbor {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 one-hop neighbor status";
}
@@ -55,7 +55,7 @@
*/
show olsr4 twohop-link {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 two-hop link status";
}
@@ -66,7 +66,7 @@
*/
show olsr4 twohop-neighbor {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 two-hop neighbor status";
}
@@ -76,7 +76,7 @@
*/
show olsr4 mid {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 Multiple Interface database";
}
@@ -87,7 +87,7 @@
*/
show olsr4 topology {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 Topology Control database";
}
@@ -98,7 +98,7 @@
*/
show olsr4 external {
- %command: "contrib/olsr/tools/print_databases $3" %help: HELP;
+ %command: "olsr_print_databases $3" %help: HELP;
%module: olsr4;
%tag: HELP "Show OLSRv1 external routes";
}
Modified: trunk/xorp/etc/templates/olsr4.tp
===================================================================
--- trunk/xorp/etc/templates/olsr4.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/olsr4.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -104,9 +104,7 @@
%modinfo: provides olsr4;
%modinfo: depends rib;
%modinfo: depends policy;
- /* Valgrind debugging wrapper (comment out for production) */
- /*%modinfo: path "contrib/olsr/xorp_olsr4_wrapper.sh";*/
- %modinfo: path "contrib/olsr/xorp_olsr4";
+ %modinfo: path "xorp_olsr4";
%modinfo: default_targetname "olsr4";
%modinfo: status_method xrl "$(olsr4.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: shutdown_method xrl "$(olsr4.targetname)/common/0.1/shutdown";
Modified: trunk/xorp/etc/templates/ospfv2.cmds
===================================================================
--- trunk/xorp/etc/templates/ospfv2.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/ospfv2.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -1,7 +1,7 @@
/* $XORP: xorp/etc/templates/ospfv2.cmds,v 1.10 2006/04/27 20:01:32 pavlin Exp $ */
clear ospf4 database {
- %command: "ospf/tools/clear_database -2" %help: HELP;
+ %command: "clear_database -2" %help: HELP;
%module: ospf4;
%tag: HELP "Clear LSA database";
}
@@ -12,19 +12,19 @@
}
show ospf4 database {
- %command: "ospf/tools/print_lsas -b" %help: HELP;
+ %command: "ospf_print_lsas -b" %help: HELP;
%module: ospf4;
%tag: HELP "Show LSA database";
}
show ospf4 database brief {
- %command: "ospf/tools/print_lsas -b" %help: HELP;
+ %command: "ospf_print_lsas -b" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database detail {
- %command: "ospf/tools/print_lsas -d" %help: HELP;
+ %command: "ospf_print_lsas -d" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -32,19 +32,19 @@
/* Router-LSA */
show ospf4 database router {
- %command: "ospf/tools/print_lsas -b -f 1" %help: HELP;
+ %command: "ospf_print_lsas -b -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Show Router-LSA database";
}
show ospf4 database router brief {
- %command: "ospf/tools/print_lsas -b -f 1" %help: HELP;
+ %command: "ospf_print_lsas -b -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database router detail {
- %command: "ospf/tools/print_lsas -d -f 1" %help: HELP;
+ %command: "ospf_print_lsas -d -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -52,19 +52,19 @@
/* Network-LSA */
show ospf4 database network {
- %command: "ospf/tools/print_lsas -b -f 2" %help: HELP;
+ %command: "ospf_print_lsas -b -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Show Network-LSA database";
}
show ospf4 database network brief {
- %command: "ospf/tools/print_lsas -b -f 2" %help: HELP;
+ %command: "ospf_print_lsas -b -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database network detail {
- %command: "ospf/tools/print_lsas -d -f 2" %help: HELP;
+ %command: "ospf_print_lsas -d -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -72,19 +72,19 @@
/* Summary-LSA (network) */
show ospf4 database netsummary {
- %command: "ospf/tools/print_lsas -b -f 3" %help: HELP;
+ %command: "ospf_print_lsas -b -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf4 database netsummary brief {
- %command: "ospf/tools/print_lsas -b -f 3" %help: HELP;
+ %command: "ospf_print_lsas -b -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database netsummary detail {
- %command: "ospf/tools/print_lsas -d -f 3" %help: HELP;
+ %command: "ospf_print_lsas -d -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -92,19 +92,19 @@
/* Summary-LSA (AS boundary router) */
show ospf4 database asbrsummary {
- %command: "ospf/tools/print_lsas -b -f 4" %help: HELP;
+ %command: "ospf_print_lsas -b -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf4 database asbrsummary brief {
- %command: "ospf/tools/print_lsas -b -f 4" %help: HELP;
+ %command: "ospf_print_lsas -b -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database asbrsummary detail {
- %command: "ospf/tools/print_lsas -d -f 4" %help: HELP;
+ %command: "ospf_print_lsas -d -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -112,19 +112,19 @@
/* AS-External-LSA */
show ospf4 database external {
- %command: "ospf/tools/print_lsas -b -f 5" %help: HELP;
+ %command: "ospf_print_lsas -b -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Show External-LSA database";
}
show ospf4 database external brief {
- %command: "ospf/tools/print_lsas -b -f 5" %help: HELP;
+ %command: "ospf_print_lsas -b -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database external detail {
- %command: "ospf/tools/print_lsas -d -f 5" %help: HELP;
+ %command: "ospf_print_lsas -d -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -132,19 +132,19 @@
/* NSSA-LSA */
show ospf4 database nssa {
- %command: "ospf/tools/print_lsas -b -f 7" %help: HELP;
+ %command: "ospf_print_lsas -b -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Show NSSA-LSA database";
}
show ospf4 database nssa brief {
- %command: "ospf/tools/print_lsas -b -f 7" %help: HELP;
+ %command: "ospf_print_lsas -b -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database nssa detail {
- %command: "ospf/tools/print_lsas -d -f 7" %help: HELP;
+ %command: "ospf_print_lsas -d -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -152,19 +152,19 @@
/* AREA */
show ospf4 database area $(protocols.ospf4.area.*) {
- %command: "ospf/tools/print_lsas -a $5 -b" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b" %help: HELP;
%module: ospf4;
%tag: HELP "Show LSA database";
}
show ospf4 database area $(protocols.ospf4.area.*) brief {
- %command: "ospf/tools/print_lsas -a $5 -b" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) detail {
- %command: "ospf/tools/print_lsas -a $5 -d" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -172,19 +172,19 @@
/* Router-LSA */
show ospf4 database area $(protocols.ospf4.area.*) router {
- %command: "ospf/tools/print_lsas -a $5 -b -f 1" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Show Router-LSA database";
}
show ospf4 database area $(protocols.ospf4.area.*) router brief {
- %command: "ospf/tools/print_lsas -a $5 -b -f 1" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) router detail {
- %command: "ospf/tools/print_lsas -a $5 -d -f 1" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -192,19 +192,19 @@
/* Network-LSA */
show ospf4 database area $(protocols.ospf4.area.*) network {
- %command: "ospf/tools/print_lsas -a $5 -b -f 2" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Show Network-LSA database";
}
show ospf4 database area $(protocols.ospf4.area.*) network brief {
- %command: "ospf/tools/print_lsas -a $5 -b -f 2" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) network detail {
- %command: "ospf/tools/print_lsas -a $5 -d -f 2" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -212,19 +212,19 @@
/* Summary-LSA (network) */
show ospf4 database area $(protocols.ospf4.area.*) netsummary {
- %command: "ospf/tools/print_lsas -a $5 -b -f 3" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf4 database area $(protocols.ospf4.area.*) netsummary brief {
- %command: "ospf/tools/print_lsas -a $5 -b -f 3" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) netsummary detail {
- %command: "ospf/tools/print_lsas -a $5 -d -f 3" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -232,19 +232,19 @@
/* Summary-LSA (AS boundary router) */
show ospf4 database area $(protocols.ospf4.area.*) asbrsummary {
- %command: "ospf/tools/print_lsas -a $5 -b -f 4" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf4 database area $(protocols.ospf4.area.*) asbrsummary brief {
- %command: "ospf/tools/print_lsas -a $5 -b -f 4" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) asbrsummary detail {
- %command: "ospf/tools/print_lsas -a $5 -d -f 4" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -252,19 +252,19 @@
/* AS-External-LSA */
show ospf4 database area $(protocols.ospf4.area.*) external {
- %command: "ospf/tools/print_lsas -a $5 -b -f 5" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Show External-LSA database";
}
show ospf4 database area $(protocols.ospf4.area.*) external brief {
- %command: "ospf/tools/print_lsas -a $5 -b -f 5" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) external detail {
- %command: "ospf/tools/print_lsas -a $5 -d -f 5" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -272,19 +272,19 @@
/* NSSA-LSA */
show ospf4 database area $(protocols.ospf4.area.*) nssa {
- %command: "ospf/tools/print_lsas -a $5 -b -f 7" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Show NSSA-LSA database";
}
show ospf4 database area $(protocols.ospf4.area.*) nssa brief {
- %command: "ospf/tools/print_lsas -a $5 -b -f 7" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -b -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Display brief output (default)";
}
show ospf4 database area $(protocols.ospf4.area.*) nssa detail {
- %command: "ospf/tools/print_lsas -a $5 -d -f 7" %help: HELP;
+ %command: "ospf_print_lsas -a $5 -d -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Display detailed output";
}
@@ -292,85 +292,85 @@
/* SUMMARY */
show ospf4 database summary {
- %command: "ospf/tools/print_lsas -s" %help: HELP;
+ %command: "ospf_print_lsas -s" %help: HELP;
%module: ospf4;
%tag: HELP "Display summary output";
}
show ospf4 database summary router {
- %command: "ospf/tools/print_lsas -s -f 1" %help: HELP;
+ %command: "ospf_print_lsas -s -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Show Router-LSA database";
}
show ospf4 database summary network {
- %command: "ospf/tools/print_lsas -s -f 2" %help: HELP;
+ %command: "ospf_print_lsas -s -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Show Network-LSA database";
}
show ospf4 database summary netsummary {
- %command: "ospf/tools/print_lsas -s -f 3" %help: HELP;
+ %command: "ospf_print_lsas -s -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf4 database summary asbrsummary {
- %command: "ospf/tools/print_lsas -s -f 4" %help: HELP;
+ %command: "ospf_print_lsas -s -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf4 database summary external {
- %command: "ospf/tools/print_lsas -s -f 5" %help: HELP;
+ %command: "ospf_print_lsas -s -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Show External-LSA database";
}
show ospf4 database summary nssa {
- %command: "ospf/tools/print_lsas -s -f 7" %help: HELP;
+ %command: "ospf_print_lsas -s -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Show NSSA-LSA database";
}
show ospf4 database summary area $(protocols.ospf4.area.*) {
- %command: "ospf/tools/print_lsas -a $6 -s" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s" %help: HELP;
%module: ospf4;
%tag: HELP "Display summary output";
}
show ospf4 database summary area $(protocols.ospf4.area.*) router {
- %command: "ospf/tools/print_lsas -a $6 -s -f 1" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s -f 1" %help: HELP;
%module: ospf4;
%tag: HELP "Show Router-LSA database";
}
show ospf4 database summary area $(protocols.ospf4.area.*) network {
- %command: "ospf/tools/print_lsas -a $6 -s -f 2" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s -f 2" %help: HELP;
%module: ospf4;
%tag: HELP "Show Network-LSA database";
}
show ospf4 database summary area $(protocols.ospf4.area.*) netsummary {
- %command: "ospf/tools/print_lsas -a $6 -s -f 3" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s -f 3" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf4 database summary area $(protocols.ospf4.area.*) asbrsummary {
- %command: "ospf/tools/print_lsas -a $6 -s -f 4" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s -f 4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf4 database summary area $(protocols.ospf4.area.*) external {
- %command: "ospf/tools/print_lsas -a $6 -s -f 5" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s -f 5" %help: HELP;
%module: ospf4;
%tag: HELP "Show External-LSA database";
}
show ospf4 database summary area $(protocols.ospf4.area.*) nssa {
- %command: "ospf/tools/print_lsas -a $6 -s -f 7" %help: HELP;
+ %command: "ospf_print_lsas -a $6 -s -f 7" %help: HELP;
%module: ospf4;
%tag: HELP "Show NSSA-LSA database";
}
@@ -378,37 +378,37 @@
/* Neighbor commands */
show ospf4 neighbor {
- %command: "ospf/tools/print_neighbours" %help: HELP;
+ %command: "ospf_print_neighbours" %help: HELP;
%module: ospf4;
%tag: HELP "Show Neighbors";
}
show ospf4 neighbor brief {
- %command: "ospf/tools/print_neighbours -b" %help: HELP;
+ %command: "ospf_print_neighbours -b" %help: HELP;
%module: ospf4;
%tag: HELP "Show Neighbors";
}
show ospf4 neighbor detail {
- %command: "ospf/tools/print_neighbours -d" %help: HELP;
+ %command: "ospf_print_neighbours -d" %help: HELP;
%module: ospf4;
%tag: HELP "Show Neighbors";
}
show ospf4 neighbor <neighbor> {
- %command: "ospf/tools/print_neighbours -f $4" %help: HELP;
+ %command: "ospf_print_neighbours -f $4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Neighbors";
}
show ospf4 neighbor <neighbor> brief {
- %command: "ospf/tools/print_neighbours -b -f $4" %help: HELP;
+ %command: "ospf_print_neighbours -b -f $4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Neighbors";
}
show ospf4 neighbor <neighbor> detail {
- %command: "ospf/tools/print_neighbours -d -f $4" %help: HELP;
+ %command: "ospf_print_neighbours -d -f $4" %help: HELP;
%module: ospf4;
%tag: HELP "Show Neighbors";
}
Modified: trunk/xorp/etc/templates/ospfv2.tp
===================================================================
--- trunk/xorp/etc/templates/ospfv2.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/ospfv2.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -121,7 +121,7 @@
%modinfo: provides ospf4;
%modinfo: depends rib;
%modinfo: depends policy;
- %modinfo: path "ospf/xorp_ospfv2";
+ %modinfo: path "xorp_ospfv2";
%modinfo: default_targetname "ospfv2";
%modinfo: status_method xrl "$(ospf4.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: shutdown_method xrl "$(ospf4.targetname)/common/0.1/shutdown";
Modified: trunk/xorp/etc/templates/ospfv3.cmds
===================================================================
--- trunk/xorp/etc/templates/ospfv3.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/ospfv3.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -1,7 +1,7 @@
/* $XORP: xorp/etc/templates/ospfv3.cmds,v 1.6 2007/02/26 11:08:37 atanu Exp $ */
clear ospf6 database {
- %command: "ospf/tools/clear_database -3" %help: HELP;
+ %command: "clear_database -3" %help: HELP;
%module: ospf6;
%tag: HELP "Clear LSA database";
}
@@ -12,19 +12,19 @@
}
show ospf6 database {
- %command: "ospf/tools/print_lsas -3 -b" %help: HELP;
+ %command: "ospf_print_lsas -3 -b" %help: HELP;
%module: ospf6;
%tag: HELP "Show LSA database";
}
show ospf6 database brief {
- %command: "ospf/tools/print_lsas -3 -b" %help: HELP;
+ %command: "ospf_print_lsas -3 -b" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database detail {
- %command: "ospf/tools/print_lsas -3 -d" %help: HELP;
+ %command: "ospf_print_lsas -3 -d" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -32,19 +32,19 @@
/* Router-LSA */
show ospf6 database router {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Show Router-LSA database";
}
show ospf6 database router brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database router detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -52,19 +52,19 @@
/* Network-LSA */
show ospf6 database network {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Show Network-LSA database";
}
show ospf6 database network brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database network detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -72,19 +72,19 @@
/* Summary-LSA (network) */
show ospf6 database netsummary {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf6 database netsummary brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database netsummary detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -92,19 +92,19 @@
/* Summary-LSA (AS boundary router) */
show ospf6 database asbrsummary {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf6 database asbrsummary brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database asbrsummary detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -112,19 +112,19 @@
/* AS-External-LSA */
show ospf6 database external {
- %command: "ospf/tools/print_lsas -3 -b -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Show External-LSA database";
}
show ospf6 database external brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database external detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -132,19 +132,19 @@
/* NSSA-LSA */
show ospf6 database nssa {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Show NSSA-LSA database";
}
show ospf6 database nssa brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database nssa detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -152,19 +152,19 @@
/* Link-LSA */
show ospf6 database link {
- %command: "ospf/tools/print_lsas -3 -b -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Show Link-LSA database";
}
show ospf6 database link brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database link detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -172,19 +172,19 @@
/* Intra-Area-Prefix-LSA */
show ospf6 database intra-area-prefix {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Show Intra-Area-Prefix-LSA database";
}
show ospf6 database intra-area-prefix brief {
- %command: "ospf/tools/print_lsas -3 -b -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -b -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database intra-area-prefix detail {
- %command: "ospf/tools/print_lsas -3 -d -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -d -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -192,19 +192,19 @@
/* AREA */
show ospf6 database area $(protocols.ospf6.*.area.*) {
- %command: "ospf/tools/print_lsas -3 -a $5 -b" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b" %help: HELP;
%module: ospf6;
%tag: HELP "Show LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -212,19 +212,19 @@
/* Router-LSA */
show ospf6 database area $(protocols.ospf6.*.area.*) router {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Show Router-LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) router brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) router detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -232,19 +232,19 @@
/* Network-LSA */
show ospf6 database area $(protocols.ospf6.*.area.*) network {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Show Network-LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) network brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) network detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -252,19 +252,19 @@
/* Summary-LSA (network) */
show ospf6 database area $(protocols.ospf6.*.area.*) netsummary {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) netsummary brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) netsummary detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -272,19 +272,19 @@
/* Summary-LSA (AS boundary router) */
show ospf6 database area $(protocols.ospf6.*.area.*) asbrsummary {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) asbrsummary brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) asbrsummary detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -292,19 +292,19 @@
/* AS-External-LSA */
show ospf6 database area $(protocols.ospf6.*.area.*) external {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Show External-LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) external brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) external detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -312,19 +312,19 @@
/* NSSA-LSA */
show ospf6 database area $(protocols.ospf6.*.area.*) nssa {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Show NSSA-LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) nssa brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) nssa detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -332,19 +332,19 @@
/* Link-LSA */
show ospf6 database area $(protocols.ospf6.*.area.*) link {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Show Link-LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) link brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) link detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -352,19 +352,19 @@
/* Intra-Area-Prefix-LSA */
show ospf6 database area $(protocols.ospf6.*.area.*) intra-area-prefix {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Show Intra-Area-Prefix-LSA database";
}
show ospf6 database area $(protocols.ospf6.*.area.*) intra-area-prefix brief {
- %command: "ospf/tools/print_lsas -3 -a $5 -b -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -b -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Display brief output (default)";
}
show ospf6 database area $(protocols.ospf6.*.area.*) intra-area-prefix detail {
- %command: "ospf/tools/print_lsas -3 -a $5 -d -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $5 -d -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Display detailed output";
}
@@ -372,109 +372,109 @@
/* SUMMARY */
show ospf6 database summary {
- %command: "ospf/tools/print_lsas -3 -s" %help: HELP;
+ %command: "ospf_print_lsas -3 -s" %help: HELP;
%module: ospf6;
%tag: HELP "Display summary output";
}
show ospf6 database summary router {
- %command: "ospf/tools/print_lsas -3 -s -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Show Router-LSA database";
}
show ospf6 database summary network {
- %command: "ospf/tools/print_lsas -3 -s -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Show Network-LSA database";
}
show ospf6 database summary netsummary {
- %command: "ospf/tools/print_lsas -3 -s -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf6 database summary asbrsummary {
- %command: "ospf/tools/print_lsas -3 -s -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf6 database summary external {
- %command: "ospf/tools/print_lsas -3 -s -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Show External-LSA database";
}
show ospf6 database summary nssa {
- %command: "ospf/tools/print_lsas -3 -s -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Show NSSA-LSA database";
}
show ospf6 database summary link {
- %command: "ospf/tools/print_lsas -3 -s -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Show Link-LSA database";
}
show ospf6 database summary intra-area-prefix {
- %command: "ospf/tools/print_lsas -3 -s -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -s -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Show Intra-Area-Prefix-LSA database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) {
- %command: "ospf/tools/print_lsas -3 -a $6 -s" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s" %help: HELP;
%module: ospf6;
%tag: HELP "Display summary output";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) router {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x2001" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x2001" %help: HELP;
%module: ospf6;
%tag: HELP "Show Router-LSA database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) network {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x2002" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x2002" %help: HELP;
%module: ospf6;
%tag: HELP "Show Network-LSA database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) netsummary {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x2003" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x2003" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (network) database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) asbrsummary {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x2004" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x2004" %help: HELP;
%module: ospf6;
%tag: HELP "Show Summary-LSA (AS boundary router) database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) external {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x4005" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x4005" %help: HELP;
%module: ospf6;
%tag: HELP "Show External-LSA database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) nssa {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x2007" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x2007" %help: HELP;
%module: ospf6;
%tag: HELP "Show NSSA-LSA database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) link {
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x0008" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x0008" %help: HELP;
%module: ospf6;
%tag: HELP "Show Link-LSA database";
}
show ospf6 database summary area $(protocols.ospf6.*.area.*) intra-area-prefix{
- %command: "ospf/tools/print_lsas -3 -a $6 -s -f 0x2009" %help: HELP;
+ %command: "ospf_print_lsas -3 -a $6 -s -f 0x2009" %help: HELP;
%module: ospf6;
%tag: HELP "Show Intra-Area-Prefix-LSA database";
}
@@ -482,37 +482,37 @@
/* Neighbor commands */
show ospf6 neighbor {
- %command: "ospf/tools/print_neighbours -3" %help: HELP;
+ %command: "ospf_print_neighbours -3" %help: HELP;
%module: ospf6;
%tag: HELP "Show Neighbors";
}
show ospf6 neighbor brief {
- %command: "ospf/tools/print_neighbours -3 -b" %help: HELP;
+ %command: "ospf_print_neighbours -3 -b" %help: HELP;
%module: ospf6;
%tag: HELP "Show Neighbors";
}
show ospf6 neighbor detail {
- %command: "ospf/tools/print_neighbours -3 -d" %help: HELP;
+ %command: "ospf_print_neighbours -3 -d" %help: HELP;
%module: ospf6;
%tag: HELP "Show Neighbors";
}
show ospf6 neighbor <neighbor> {
- %command: "ospf/tools/print_neighbours -3 -f $4" %help: HELP;
+ %command: "ospf_print_neighbours -3 -f $4" %help: HELP;
%module: ospf6;
%tag: HELP "Show Neighbors";
}
show ospf6 neighbor <neighbor> brief {
- %command: "ospf/tools/print_neighbours -3 -b -f $4" %help: HELP;
+ %command: "ospf_print_neighbours -3 -b -f $4" %help: HELP;
%module: ospf6;
%tag: HELP "Show Neighbors";
}
show ospf6 neighbor <neighbor> detail {
- %command: "ospf/tools/print_neighbours -3 -d -f $4" %help: HELP;
+ %command: "ospf_print_neighbours -3 -d -f $4" %help: HELP;
%module: ospf6;
%tag: HELP "Show Neighbors";
}
Modified: trunk/xorp/etc/templates/ospfv3.tp
===================================================================
--- trunk/xorp/etc/templates/ospfv3.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/ospfv3.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -93,7 +93,7 @@
%modinfo: provides ospf6;
%modinfo: depends rib;
%modinfo: depends policy;
- %modinfo: path "ospf/xorp_ospfv3";
+ %modinfo: path "xorp_ospfv3";
%modinfo: default_targetname "ospfv3";
%modinfo: status_method xrl "$(ospf6. at .targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: shutdown_method xrl "$(ospf6. at .targetname)/common/0.1/shutdown";
Modified: trunk/xorp/etc/templates/pim.cmds
===================================================================
--- trunk/xorp/etc/templates/pim.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/pim.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,67 +7,67 @@
}
show pim bootstrap {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 bootstrap routers";
}
show pim bootstrap rps {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 bootstrap RPs";
}
show pim interface {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 interfaces";
}
show pim interface address {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about addresses of PIM IPv4 interfaces";
}
show pim join {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 groups";
}
show pim join all {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about all PIM IPv4 groups";
}
show pim mfc {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM Multicast Forwarding Cache";
}
show pim mrib {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display MRIB IPv4 information inside PIM";
}
show pim neighbors {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 neighbors";
}
show pim rps {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 RPs";
}
show pim scope {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_4 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_4 $0" %help: HELP;
%module: pimsm4;
%tag: HELP "Display information about PIM IPv4 scope zones";
}
Modified: trunk/xorp/etc/templates/pim6.cmds
===================================================================
--- trunk/xorp/etc/templates/pim6.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/pim6.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -7,67 +7,67 @@
}
show pim6 bootstrap {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 bootstrap routers";
}
show pim6 bootstrap rps {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 bootstrap RPs";
}
show pim6 interface {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 interfaces";
}
show pim6 interface address {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about addresses of PIM IPv6 interfaces";
}
show pim6 join {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 groups";
}
show pim6 join all {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about all PIM IPv6 groups";
}
show pim6 mfc {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM Multicast Forwarding Cache";
}
show pim6 mrib {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display MRIB IPv6 information inside PIM";
}
show pim6 neighbors {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 neighbors";
}
show pim6 rps {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 RPs";
}
show pim6 scope {
- %command: "cli/tools/send_cli_processor_xrl -t PIMSM_6 $0" %help: HELP;
+ %command: "cli_send_processor_xrl -t PIMSM_6 $0" %help: HELP;
%module: pimsm6;
%tag: HELP "Display information about PIM IPv6 scope zones";
}
Modified: trunk/xorp/etc/templates/pimsm4.tp
===================================================================
--- trunk/xorp/etc/templates/pimsm4.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/pimsm4.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -78,7 +78,7 @@
%modinfo: depends mfea4;
%modinfo: depends igmp;
%modinfo: depends rib;
- %modinfo: path "pim/xorp_pimsm4";
+ %modinfo: path "xorp_pimsm4";
%modinfo: default_targetname "pim";
%modinfo: status_method xrl "$(pimsm4.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: startup_method xrl "$(pimsm4.targetname)/pim/0.1/start_pim";
Modified: trunk/xorp/etc/templates/pimsm6.tp
===================================================================
--- trunk/xorp/etc/templates/pimsm6.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/pimsm6.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -78,7 +78,7 @@
%modinfo: depends mfea6;
%modinfo: depends mld;
%modinfo: depends rib;
- %modinfo: path "pim/xorp_pimsm6";
+ %modinfo: path "xorp_pimsm6";
%modinfo: default_targetname "pim";
%modinfo: status_method xrl "$(pimsm6.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: startup_method xrl "$(pimsm6.targetname)/pim/0.1/start_pim";
Modified: trunk/xorp/etc/templates/policy.cmds
===================================================================
--- trunk/xorp/etc/templates/policy.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/policy.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -23,13 +23,13 @@
}
test policy $(policy.policy-statement.*) <prefix> {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- test $3 $4" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- test $3 $4" %help: HELP;
%module: policy;
%tag: HELP "Test a routing policy on a prefix";
}
test policy $(policy.policy-statement.*) <prefix> <route attributes> {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- test $3 $4 $5" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- test $3 $4 $5" %help: HELP;
%module: policy;
%tag: HELP "Test a routing policy on a prefix and route attribute";
}
@@ -41,61 +41,61 @@
}
show policy network4-list {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_ipv4net" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_ipv4net" %help: HELP;
%module: policy;
%tag: HELP "Show policy network4 lists";
}
show policy network4-list $(policy.network4-list.*) {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_ipv4net $4" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_ipv4net $4" %help: HELP;
%module: policy;
%tag: HELP "Show policy network4 list";
}
show policy network6-list {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_ipv6net" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_ipv6net" %help: HELP;
%module: policy;
%tag: HELP "Show policy network6 lists";
}
show policy network6-list $(policy.network6-list.*) {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_ipv6net $4" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_ipv6net $4" %help: HELP;
%module: policy;
%tag: HELP "Show policy network6 list";
}
show policy community-list {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_com32" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_com32" %help: HELP;
%module: policy;
%tag: HELP "Show policy community lists";
}
show policy community-list $(policy.community-list.*) {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_com32 $4" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_com32 $4" %help: HELP;
%module: policy;
%tag: HELP "Show policy community list";
}
show policy as-path-list {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_str" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_str" %help: HELP;
%module: policy;
%tag: HELP "Show policy AS path lists";
}
show policy as-path-list $(policy.as-path-list.*) {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show set_str $4" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show set_str $4" %help: HELP;
%module: policy;
%tag: HELP "Show policy AS path list";
}
show policy policy-statement {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show policy-statement" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show policy-statement" %help: HELP;
%module: policy;
%tag: HELP "Show policy statements";
}
show policy policy-statement $(policy.policy-statement.*) {
- %command: "cli/tools/send_cli_processor_xrl -t policy -- show policy-statement $4" %help: HELP;
+ %command: "cli_send_processor_xrl -t policy -- show policy-statement $4" %help: HELP;
%module: policy;
%tag: HELP "Show policy statement";
}
Modified: trunk/xorp/etc/templates/policy.tp
===================================================================
--- trunk/xorp/etc/templates/policy.tp 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/policy.tp 2009-12-03 16:48:08 UTC (rev 11649)
@@ -66,7 +66,7 @@
%help: short "Configure routing policies";
%modinfo: provides policy;
%modinfo: depends rib;
- %modinfo: path "policy/xorp_policy";
+ %modinfo: path "xorp_policy";
%modinfo: default_targetname "policy";
%modinfo: status_method xrl "$(policy.targetname)/common/0.1/get_status->status:u32&reason:txt";
%modinfo: shutdown_method xrl "$(policy.targetname)/common/0.1/shutdown";
Modified: trunk/xorp/etc/templates/rib.cmds
===================================================================
--- trunk/xorp/etc/templates/rib.cmds 2009-12-03 16:46:35 UTC (rev 11648)
+++ trunk/xorp/etc/templates/rib.cmds 2009-12-03 16:48:08 UTC (rev 11649)
@@ -86,25 +86,25 @@
}
show route admin distance ipv4 unicast {
- %command: "rib/tools/show_distances ribin $5 $6" %help: HELP;
+ %command: "rib_show_distances ribin $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 unicast protocol administrative distances";
}
show route admin distance ipv6 unicast {
- %command: "rib/tools/show_distances ribin $5 $6" %help: HELP;
+ %command: "rib_show_distances ribin $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 unicast protocol administrative distances";
}
show route admin distance ipv4 multicast {
- %command: "rib/tools/show_distances ribin $5 $6" %help: HELP;
+ %command: "rib_show_distances ribin $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 multicast protocol administrative distances";
}
show route admin distance ipv6 multicast {
- %command: "rib/tools/show_distances ribin $5 $6" %help: HELP;
+ %command: "rib_show_distances ribin $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 multicast protocol administrative distances";
}
@@ -114,49 +114,49 @@
* Connected show route table commands
*/
show route table ipv4 unicast connected {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 routes from connected interfaces";
}
show route table ipv6 unicast connected {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 routes from connected interfaces";
}
show route table ipv4 unicast connected brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 routes from connected interfaces (brief format)";
}
show route table ipv6 unicast connected brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 routes from connected interfaces (brief format)";
}
show route table ipv4 unicast connected detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 routes from connected interfaces (detailed format)";
}
show route table ipv6 unicast connected detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 routes from connected interfaces (detailed format)";
}
show route table ipv4 unicast connected terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 routes from connected interfaces (terse format)";
}
show route table ipv6 unicast connected terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 routes from connected interfaces (terse format)";
}
@@ -167,97 +167,97 @@
* Static show route table commands
*/
show route table ipv4 unicast static {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 static routes";
}
show route table ipv6 unicast static {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 static routes";
}
show route table ipv4 multicast static {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 MRIB static routes";
}
show route table ipv6 multicast static {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 MRIB static routes";
}
show route table ipv4 unicast static brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 static routes (brief format)";
}
show route table ipv6 unicast static brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 static routes (brief format)";
}
show route table ipv4 multicast static brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 MRIB static routes (brief format)";
}
show route table ipv6 multicast static brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 MRIB static routes (brief format)";
}
show route table ipv4 unicast static detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 static routes (detailed format)";
}
show route table ipv6 unicast static detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 static routes (detailed format)";
}
show route table ipv4 multicast static detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 MRIB static routes (detailed format)";
}
show route table ipv6 multicast static detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 MRIB static routes (detailed format)";
}
show route table ipv4 unicast static terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 static routes (terse format)";
}
show route table ipv6 unicast static terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 static routes (terse format)";
}
show route table ipv4 multicast static terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 MRIB static routes (terse format)";
}
show route table ipv6 multicast static terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 MRIB static routes (terse format)";
}
@@ -268,49 +268,49 @@
* fib2mrib
*/
show route table ipv4 multicast fib2mrib {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 unicast routes for multicast extracted from kernel";
}
show route table ipv6 multicast fib2mrib {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 unicast routes for multicast extracted from kernel";
}
show route table ipv4 multicast fib2mrib brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 unicast routes for multicast extracted from kernel (brief format)";
}
show route table ipv6 multicast fib2mrib brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 unicast routes for multicast extracted from kernel (brief format)";
}
show route table ipv4 multicast fib2mrib detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 unicast routes for multicast extracted from kernel (detailed format)";
}
show route table ipv6 multicast fib2mrib detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 unicast routes for multicast extracted from kernel (detailed format)";
}
show route table ipv4 multicast fib2mrib terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 unicast routes for multicast extracted from kernel (terse format)";
}
show route table ipv6 multicast fib2mrib terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 unicast routes for multicast extracted from kernel (terse format)";
}
@@ -321,193 +321,193 @@
* BGP
*/
show route table ipv4 unicast ibgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP routes";
}
show route table ipv4 unicast ebgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP routes";
}
show route table ipv4 multicast ibgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP MBGP routes";
}
show route table ipv4 multicast ebgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP MBGP routes";
}
show route table ipv6 unicast ibgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP routes";
}
show route table ipv6 unicast ebgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP routes";
}
show route table ipv6 multicast ibgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP MBGP routes";
}
show route table ipv6 multicast ebgp {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP MBGP routes";
}
show route table ipv4 unicast ibgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP routes (brief format)";
}
show route table ipv4 unicast ebgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP routes (brief format)";
}
show route table ipv4 multicast ibgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP MBGP routes (brief format)";
}
show route table ipv4 multicast ebgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP MBGP routes (brief format)";
}
show route table ipv6 unicast ibgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP routes (brief format)";
}
show route table ipv6 unicast ebgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP routes (brief format)";
}
show route table ipv6 multicast ibgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP MBGP routes (brief format)";
}
show route table ipv6 multicast ebgp brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP MBGP routes (brief format)";
}
show route table ipv4 unicast ibgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP routes (detailed format)";
}
show route table ipv4 unicast ebgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP routes (detailed format)";
}
show route table ipv4 multicast ibgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP MBGP routes (detailed format)";
}
show route table ipv4 multicast ebgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP MBGP routes (detailed format)";
}
show route table ipv6 unicast ibgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP routes (detailed format)";
}
show route table ipv6 unicast ebgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP routes (detailed format)";
}
show route table ipv6 multicast ibgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP MBGP routes (detailed format)";
}
show route table ipv6 multicast ebgp detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP MBGP routes (detailed format)";
}
show route table ipv4 unicast ibgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP routes (terse format)";
}
show route table ipv4 unicast ebgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP routes (terse format)";
}
show route table ipv4 multicast ibgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 iBGP MBGP routes (terse format)";
}
show route table ipv4 multicast ebgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 eBGP MBGP routes (terse format)";
}
show route table ipv6 unicast ibgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP routes (terse format)";
}
show route table ipv6 unicast ebgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP routes (terse format)";
}
show route table ipv6 multicast ibgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 iBGP MBGP routes (terse format)";
}
show route table ipv6 multicast ebgp terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 eBGP MBGP routes (terse format)";
}
@@ -518,49 +518,49 @@
* RIP show route commands
*/
show route table ipv4 unicast rip {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIP";
}
show route table ipv4 unicast rip winners {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show RIP that reach forwarding engine";
}
show route table ipv4 unicast rip brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIP (brief format)";
}
show route table ipv4 unicast rip winners brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show RIP that reach forwarding engine (brief format)";
}
show route table ipv4 unicast rip detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIP (detailed format)";
}
show route table ipv4 unicast rip winners detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show RIP that reach forwarding engine (detailed format)";
}
show route table ipv4 unicast rip terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIP (terse format)";
}
show route table ipv4 unicast rip winners terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show RIP that reach forwarding engine (terse format)";
}
@@ -571,49 +571,49 @@
* RIPng show route commands
*/
show route table ipv6 unicast ripng {
- %command: "rib/tools/show_routes ribin $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIPng";
}
show route table ipv6 unicast ripng winners {
- %command: "rib/tools/show_routes ribout $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show RIPng that reach forwarding engine";
}
show route table ipv6 unicast ripng brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIPng (brief format)";
}
show route table ipv6 unicast ripng winners brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show RIPng that reach forwarding engine (brief format)";
}
show route table ipv6 unicast ripng detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIPng (detailed format)";
}
show route table ipv6 unicast ripng winners detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show RIPng that reach forwarding engine (detailed format)";
}
show route table ipv6 unicast ripng terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show routes from RIPng (terse format)";
}
show route table ipv6 unicast ripng winners terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 rip" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 rip" %help: HELP;
%module: rib;
%tag: HELP "Show RIPng that reach forwarding engine (terse format)";
}
@@ -624,49 +624,49 @@
* OSPFv2 show route commands
*/
show route table ipv4 unicast ospf {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv2";
}
show route table ipv4 unicast ospf winners {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv2 that reach forwarding engine";
}
show route table ipv4 unicast ospf brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv2 (brief format)";
}
show route table ipv4 unicast ospf winners brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv2 that reach forwarding engine (brief format)";
}
show route table ipv4 unicast ospf detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv2 (detailed format)";
}
show route table ipv4 unicast ospf winners detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv2 that reach forwarding engine (detailed format)";
}
show route table ipv4 unicast ospf terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv2 (terse format)";
}
show route table ipv4 unicast ospf winners terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv2 that reach forwarding engine (terse format)";
}
@@ -675,49 +675,49 @@
* OSPFv3 show route commands
*/
show route table ipv6 unicast ospf {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv3";
}
show route table ipv6 unicast ospf winners {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv3 that reach forwarding engine";
}
show route table ipv6 unicast ospf brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv3 (brief format)";
}
show route table ipv6 unicast ospf winners brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv3 that reach forwarding engine (brief format)";
}
show route table ipv6 unicast ospf detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv3 (detailed format)";
}
show route table ipv6 unicast ospf winners detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv3 that reach forwarding engine (detailed format)";
}
show route table ipv6 unicast ospf terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OSPFv3 (terse format)";
}
show route table ipv6 unicast ospf winners terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OSPFv3 that reach forwarding engine (terse format)";
}
@@ -727,49 +727,49 @@
* OLSRv1 IPv4 show route commands
*/
show route table ipv4 unicast olsr {
- %command: "rib/tools/show_routes ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OLSRv1";
}
show route table ipv4 unicast olsr winners {
- %command: "rib/tools/show_routes ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OLSRv1 that reach forwarding engine";
}
show route table ipv4 unicast olsr brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OLSRv1 (brief format)";
}
show route table ipv4 unicast olsr winners brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OLSRv1 that reach forwarding engine (brief format)";
}
show route table ipv4 unicast olsr detail {
- %command: "rib/tools/show_routes -d ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OLSRv1 (detailed format)";
}
show route table ipv4 unicast olsr winners detail {
- %command: "rib/tools/show_routes -d ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -d ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OLSRv1 that reach forwarding engine (detailed format)";
}
show route table ipv4 unicast olsr terse {
- %command: "rib/tools/show_routes -t ribin $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribin $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show routes from OLSRv1 (terse format)";
}
show route table ipv4 unicast olsr winners terse {
- %command: "rib/tools/show_routes -t ribout $4 $5 $6" %help: HELP;
+ %command: "rib_show_routes -t ribout $4 $5 $6" %help: HELP;
%module: rib;
%tag: HELP "Show OLSRv1 that reach forwarding engine (terse format)";
}
@@ -779,97 +779,97 @@
* Show winning routes (unfiltered output from "all" routing table).
*/
show route table ipv4 unicast final {
- %command: "rib/tools/show_routes ribout $4 $5 all" %help: HELP;
+ %command: "rib_show_routes ribout $4 $5 all" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 winning routes";
}
show route table ipv6 unicast final {
- %command: "rib/tools/show_routes ribin $4 $5 all" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 all" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 winning routes";
}
show route table ipv4 multicast final {
- %command: "rib/tools/show_routes ribin $4 $5 all" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 all" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 MRIB winning routes";
}
show route table ipv6 multicast final {
- %command: "rib/tools/show_routes ribin $4 $5 all" %help: HELP;
+ %command: "rib_show_routes ribin $4 $5 all" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 MRIB winning routes";
}
show route table ipv4 unicast final brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 all" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 all" %help: HELP;
%module: rib;
%tag: HELP "Show IPv4 winning routes (brief format)";
}
show route table ipv6 unicast final brief {
- %command: "rib/tools/show_routes -b ribout $4 $5 all" %help: HELP;
+ %command: "rib_show_routes -b ribout $4 $5 all" %help: HELP;
%module: rib;
%tag: HELP "Show IPv6 winning routes (brief format)";
}
show route table ipv4 multicast final brief {
- %command: "rib/tools/show_routes -b ribin $4 $5 all" %help: HELP;
+ %command: "rib_show_routes -b ribin $4 $5 all" %help: HELP;
%module: rib;
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Xorp-cvs
mailing list